1.手动退料,料箱设置库别

2.工单出库,增加L10B库位卡控

src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java

@@ -1018,7 +1018,7 @@ public class LiteOrderCache {
                 warehouseCode1 = "";
                 warehouseCode1 = "";
             }
             }
 
 
-            if (!"W10B".equals(warehouseCode1) && !"W10C".equals(warehouseCode1) && !"W107".equals(warehouseCode1)){
+            if (!"W10B".equals(warehouseCode1) && !"W10C".equals(warehouseCode1) && !"W107".equals(warehouseCode1) && !"L10B".equals(warehouseCode1)){
                 continue;
                 continue;
             }
             }
             //List<StoragePos> allStoragePosList = new ArrayList();
             //List<StoragePos> allStoragePosList = new ArrayList();

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

@@ -998,6 +998,7 @@ public class CDeviceController {
 
 
         //获取库别
         //获取库别
         String warhouseCode = MaterialUtil.getWarhouseCode(materialStr);
         String warhouseCode = MaterialUtil.getWarhouseCode(materialStr);
+        barcode.setWarehouseCode(warhouseCode);
 
 
         //判断料格是否正常
         //判断料格是否正常
         Barcode boxBarcode = null;
         Barcode boxBarcode = null;
@@ -1697,12 +1698,12 @@ public class CDeviceController {
         //判断是不是有效的条码信息
         //判断是不是有效的条码信息
         if (StringUtils.isEmpty(code)) {
         if (StringUtils.isEmpty(code)) {
             saveMessage(MessageType.ERROR.name(), currentLoc, "未扫到条码信息");
             saveMessage(MessageType.ERROR.name(), currentLoc, "未扫到条码信息");
-            return ResultBean.newErrorResult(-1, "", "未扫到条码信息");
+            return ResultBean.newErrorResult(-1, "", "未扫到条码信息,请重新扫码");
         }
         }
         CodeBean codeBean = codeResolve.resolveSingleCode(code);
         CodeBean codeBean = codeResolve.resolveSingleCode(code);
         if (!codeBean.isValid()) {
         if (!codeBean.isValid()) {
             saveMessage(MessageType.ERROR.name(), currentLoc, code + "不是有效的条码");
             saveMessage(MessageType.ERROR.name(), currentLoc, code + "不是有效的条码");
-            return ResultBean.newErrorResult(-1, "", code + "不是有效的条码");
+            return ResultBean.newErrorResult(-1, "", code + "不是有效的条码,请重新扫码");
         }
         }
         //判断是否在库位中
         //判断是否在库位中
         Barcode barcode = codeBean.getBarcode();
         Barcode barcode = codeBean.getBarcode();
@@ -1741,10 +1742,10 @@ public class CDeviceController {
                 barcode = clearCurrentBarcodeInfo(barcode);
                 barcode = clearCurrentBarcodeInfo(barcode);
                 barcodeManager.save(barcode);
                 barcodeManager.save(barcode);
                 if (StringUtils.isNotEmpty(errorMsg)) {
                 if (StringUtils.isNotEmpty(errorMsg)) {
-                    return ResultBean.newErrorResult(-1, "", barcode.getBarcode() + "通知WMS报错:" + errorMsg + ",库存已经清空,请确认");
+                    return ResultBean.newErrorResult(-1, "", barcode.getBarcode() + "通知WMS报错:" + errorMsg + ",SMF库存已经清空,请手动拿走,重新入库,不要放到料串上");
                 }
                 }
                 //返回给客户端信息
                 //返回给客户端信息
-                return ResultBean.newErrorResult(-1, "", barcode.getBarcode() + "不在当前隔口:" + boxPar + "中,库存已经清空,请确认");
+                return ResultBean.newErrorResult(-1, "", barcode.getBarcode() + "不在当前隔口:" + boxPar + "中,SMF库存已经清空,请手动拿走,重新入库,不要放到料串上");
             } else {
             } else {
                 //如果是相同的隔口,判断是否是当前要出库的物料
                 //如果是相同的隔口,判断是否是当前要出库的物料
                 String currentBoxStr = BoxHandleUtil.getBoxStr(boxPar, true);
                 String currentBoxStr = BoxHandleUtil.getBoxStr(boxPar, true);
@@ -1816,7 +1817,7 @@ public class CDeviceController {
                 barcodeManager.save(barcode);
                 barcodeManager.save(barcode);
 
 
                 if (StringUtils.isNotEmpty(errorMsg)) {
                 if (StringUtils.isNotEmpty(errorMsg)) {
-                    return ResultBean.newErrorResult(-1, "", barcode.getBarcode() + "通知WMS报错:" + errorMsg + ",库存已经清空,请确认");
+                    return ResultBean.newErrorResult(-1, "", barcode.getBarcode() + "通知WMS报错:" + errorMsg + ",SMF库存已经清空,请手动拿走,重新入库,不要放到料串上");
                 }
                 }
 
 
                 Map<String, String> resultMap = new HashMap<>();
                 Map<String, String> resultMap = new HashMap<>();

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

@@ -223,6 +223,7 @@ public class ManualReturnTowerController {
                     barcode = barcodeManager.save(barcode);
                     barcode = barcodeManager.save(barcode);
 
 
                     generatePutInTask(barcode, boxBarcode, OP_STATUS.FINISHED.name());
                     generatePutInTask(barcode, boxBarcode, OP_STATUS.FINISHED.name());
+                    boxBarcode.setWarehouseCode(barcode.getWarehouseCode());
                     boxBarcode.updateSubCodes(barcode);
                     boxBarcode.updateSubCodes(barcode);
                     boxBarcode.setAmount(boxBarcode.getAmount() + barcode.getAmount());
                     boxBarcode.setAmount(boxBarcode.getAmount() + barcode.getAmount());
                     barcodeManager.save(boxBarcode);
                     barcodeManager.save(boxBarcode);