功能优化

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/CDeviceController.java

@@ -237,7 +237,7 @@ public class CDeviceController {
                         Date grDate = DateUtil.getNoTimeDate(binMoveResult.getGR_DATE());
                         Date grDate = DateUtil.getNoTimeDate(binMoveResult.getGR_DATE());
                         barcode.setProduceDate(grDate);
                         barcode.setProduceDate(grDate);
                     }
                     }
-                    //barcode.setLabelId(binMoveResult.getLABEL_ID());
+                    barcode.setLabelId(binMoveResult.getLABEL_ID());
                 }
                 }
 
 
                 //311单据转库
                 //311单据转库
@@ -277,7 +277,8 @@ public class CDeviceController {
                     request.setPLANT_CODE(CommonUtil.plantCode);
                     request.setPLANT_CODE(CommonUtil.plantCode);
                     request.setRETURN_TYPE("return");
                     request.setRETURN_TYPE("return");
                     request.setREEL_LIST(Arrays.asList(barcode.getBarcode()));
                     request.setREEL_LIST(Arrays.asList(barcode.getBarcode()));
-                    LuxsanApi.backToWarehouse(request);
+                    BackToWarehouseResult result = LuxsanApi.backToWarehouse(request);
+                    barcode.setLabelId(result.getLABEL_ID());
                 }
                 }
 
 
                 barcode.setPosName(binCodeStr);
                 barcode.setPosName(binCodeStr);
@@ -842,6 +843,8 @@ public class CDeviceController {
             return ResultBean.newErrorResult(-1, "smfcore.valueCanotNull", "{0}不能为空", new String[]{"物料信息"});
             return ResultBean.newErrorResult(-1, "smfcore.valueCanotNull", "{0}不能为空", new String[]{"物料信息"});
         }
         }
 
 
+        codeStr = codeStr.toUpperCase(Locale.ROOT);
+
         if (StringUtils.isEmpty(materialStr)) {
         if (StringUtils.isEmpty(materialStr)) {
             return ResultBean.newErrorResult(-1, "smfcore.valueCanotNull", "{0}不能为空", new String[]{"料串信息"});
             return ResultBean.newErrorResult(-1, "smfcore.valueCanotNull", "{0}不能为空", new String[]{"料串信息"});
         }
         }

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/manual/ManualStorTransferController.java

+package com.neotel.smfcore.custom.luxsan.factory_c.rawstor.controller.manual;
+
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@ApiOperation("手动储位移转")
+@RestController
+@RequestMapping("/manualStorTransfer")
+public class ManualStorTransferController {
+
+
+
+}

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/wipstor/controller/LineController.java

@@ -468,7 +468,8 @@ public class LineController {
         }
         }
 
 
         if (dataLog == null){
         if (dataLog == null){
-            return ResultBean.newErrorResult(-1,"",boxId+"未找到对应的料箱任务");
+            log.info(boxId+"未找到对应的料箱任务,默认任务已经完成");
+            return ResultBean.newOkResult("");
         }
         }
 
 
         if (!dataLog.isFinished()){
         if (!dataLog.isFinished()){