增加loading类

src/main/java/com/neotel/smfcore/custom/micron1053/controller/MicronDeviceController.java

@@ -317,4 +317,27 @@ public class MicronDeviceController {
 //        }
 //        }
 //        return ResultBean.newOkResult("");
 //        return ResultBean.newOkResult("");
 //    }
 //    }
+
+
+    @ApiOperation("X-Ray点料完成，更新数量 ")
+    @PostMapping(value = "/xRayUpdateQty")
+    @ResponseBody
+    @AnonymousAccess
+    public ResultBean xRayUpdateQty(@RequestBody Map<String,Object> param, HttpServletRequest request) {
+        String barcode=param.get("barcode").toString();
+        Integer qty=Integer.parseInt(param.get("qty").toString()) ;
+        //TODO 更新数量
+        return ResultBean.newOkResult("ok");
+    }
+
+    @ApiOperation("RFID入库完成")
+    @PostMapping(value = "/rfidPutInEnd")
+    @ResponseBody
+    @AnonymousAccess
+    public ResultBean rfidPutInEnd(HttpServletRequest request) {
+        String rfid = request.getParameter("rfid");
+
+        //TODO  rfid入库完成
+        return ResultBean.newOkResult("");
+    }
 }
 }

src/main/java/com/neotel/smfcore/custom/micron1053/loading/LoadingController.java

 package com.neotel.smfcore.custom.micron1053.loading;
 package com.neotel.smfcore.custom.micron1053.loading;
 
 
 import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.common.bean.ResultBean;
+import com.neotel.smfcore.common.utils.Constants;
+import com.neotel.smfcore.core.device.util.DataCache;
+import com.neotel.smfcore.custom.micron1053.loading.Bean.LoadingInfo;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
@@ -19,12 +23,21 @@ import javax.servlet.http.HttpServletRequest;
 @RequiredArgsConstructor
 @RequiredArgsConstructor
 public class LoadingController {
 public class LoadingController {
 
 
+    @Autowired
+    DataCache dataCache;
 
 
     @ApiOperation("lOADING页面数据获取")
     @ApiOperation("lOADING页面数据获取")
     @GetMapping("/status")
     @GetMapping("/status")
     @AnonymousAccess
     @AnonymousAccess
     public ResultBean loading(HttpServletRequest servletRequest ) {
     public ResultBean loading(HttpServletRequest servletRequest ) {
+
+        LoadingInfo loadingInfo = dataCache.getCache(Constants.CACHE_LOADING);
+        if (loadingInfo == null) {
+
             return ResultBean.newOkResult("");
             return ResultBean.newOkResult("");
+        } else {
+            return ResultBean.newOkResult(loadingInfo);
+        }
     }
     }
 
 
 
 

src/main/java/com/neotel/smfcore/custom/micron1053/loading/service/dao/ILoadingItemDao.java

+package com.neotel.smfcore.custom.micron1053.loading.service.dao;
+
+import com.neotel.smfcore.common.base.IBaseDao;
+
+public interface ILoadingItemDao extends IBaseDao {
+}

src/main/java/com/neotel/smfcore/custom/micron1053/loading/service/dao/impl/LoadingItemDaoImpl.java

+package com.neotel.smfcore.custom.micron1053.loading.service.dao.impl;
+
+import com.neotel.smfcore.common.base.AbstractBaseDao;
+import com.neotel.smfcore.custom.micron1053.loading.service.dao.ILoadingItemDao;
+import com.neotel.smfcore.custom.micron1053.loading.service.po.LoadingItem;
+
+public class LoadingItemDaoImpl extends AbstractBaseDao implements ILoadingItemDao {
+    @Override
+    public Class getEntityClass() {
+        return LoadingItem.class;
+    }
+}

src/main/java/com/neotel/smfcore/custom/micron1053/loading/service/manager/ILoadingItemManager.java

+package com.neotel.smfcore.custom.micron1053.loading.service.manager;
+
+import com.neotel.smfcore.common.base.IBaseManager;
+import com.neotel.smfcore.custom.micron1053.loading.service.po.LoadingItem;
+
+public interface ILoadingItemManager extends IBaseManager<LoadingItem> {
+}

src/main/java/com/neotel/smfcore/custom/micron1053/loading/service/manager/impl/LoadingItemManagerImpl.java

+package com.neotel.smfcore.custom.micron1053.loading.service.manager.impl;
+
+import com.neotel.smfcore.common.bean.PageData;
+import com.neotel.smfcore.common.exception.ValidateException;
+import com.neotel.smfcore.custom.micron1053.loading.service.manager.ILoadingItemManager;
+import com.neotel.smfcore.custom.micron1053.loading.service.po.LoadingItem;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+@Slf4j
+@Service
+public class LoadingItemManagerImpl implements ILoadingItemManager {
+    @Override
+    public LoadingItem get(String id) {
+        return null;
+    }
+
+    @Override
+    public LoadingItem save(LoadingItem object) throws ValidateException {
+        return null;
+    }
+
+    @Override
+    public void delete(LoadingItem object) throws ValidateException {
+
+    }
+
+    @Override
+    public PageData<LoadingItem> findByPage(Query query, Pageable pageable) {
+        return null;
+    }
+
+    @Override
+    public List<LoadingItem> findByQuery(Query query) {
+        return null;
+    }
+}

src/main/java/com/neotel/smfcore/custom/micron1053/loading/service/po/LoadingItem.java

+package com.neotel.smfcore.custom.micron1053.loading.service.po;
+
+import com.neotel.smfcore.common.base.BasePo;
+import com.neotel.smfcore.core.barcode.service.po.Barcode;
+import lombok.Data;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+import java.io.Serializable;
+@Data
+@Document
+public class LoadingItem extends BasePo implements Serializable {
+
+    private Barcode barcode;
+}