1.工单出库,判断对应的库位是否正确

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

@@ -1000,6 +1000,15 @@ public class LiteOrderCache {
 
 
         for (LiteOrderItem orderItem : liteOrder.getOrderItems()){
         for (LiteOrderItem orderItem : liteOrder.getOrderItems()){
 
 
+            //判断库位是否正确
+            String warehouseCode1 = orderItem.getWarehouseCode();
+            if (StringUtils.isEmpty(warehouseCode1)){
+                warehouseCode1 = "";
+            }
+
+            if (!"W10B".equals(warehouseCode1) && !"W10C".equals(warehouseCode1) && !"W107".equals(warehouseCode1)){
+                continue;
+            }
             //List<StoragePos> allStoragePosList = new ArrayList();
             //List<StoragePos> allStoragePosList = new ArrayList();
 
 
             //6.排除的仓位信息
             //6.排除的仓位信息

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

@@ -1834,7 +1834,7 @@ public class CDeviceController {
         int checkType = -1;
         int checkType = -1;
         LiteOrder order = null;
         LiteOrder order = null;
         LiteOrderItem orderItem = null;
         LiteOrderItem orderItem = null;
-        if (StringUtils.isEmpty(orderItemId)) {
+        if (StringUtils.isNotEmpty(orderItemId)) {
             orderItem = liteOrderItemManager.get(orderItemId);
             orderItem = liteOrderItemManager.get(orderItemId);
             if (orderItem != null) {
             if (orderItem != null) {
                 order = liteOrderManager.get(orderItem.getOrderId());
                 order = liteOrderManager.get(orderItem.getOrderId());

src/main/resources/config/application.yml

@@ -49,7 +49,7 @@ lizhen:
     differenceUrl: http://10.68.27.104/smf-core/api/Mes/differenceReel
     differenceUrl: http://10.68.27.104/smf-core/api/Mes/differenceReel
   storageC12F:
   storageC12F:
     name: storageC12F
     name: storageC12F
-    line: BG02T,BG02B,CG20B1,CG02B2,CG02T1,CG02T2,AS02T1,AS02T2,AS02T3,AS02B1,AS02B2,BG03T1,BG03T2,BG03B1,BG03B2,BG04B,BG04T,CG03T1,CG03T2,CG03B,CG04T,CG04B,BG05T,BG05B,CG03B1,CG03B2
+    line: BG02T,BG02B,CG02B1,CG02B2,CG02T1,CG02T2,AS02T1,AS02T2,AS02T3,AS02B1,AS02B2,BG03T1,BG03T2,BG03B1,BG03B2,BG04B,BG04T,CG03T1,CG03T2,CG03B,CG04T,CG04B,BG05T,BG05B,CG03B1,CG03B2
     url: http://10.68.27.105/smf-core/api/Mes/machineCallMaterial
     url: http://10.68.27.105/smf-core/api/Mes/machineCallMaterial
     differenceUrl: http://10.68.27.105/smf-core/api/Mes/differenceReel
     differenceUrl: http://10.68.27.105/smf-core/api/Mes/differenceReel