1.新增C2/1F C1/2F 目的地信息

src/main/java/com/neotel/smfcore/custom/lizhen/wcs/LineUtil.java

@@ -38,6 +38,14 @@ public class LineUtil {
     @Value("${lizhen.storage.differenceUrl}")
     @Value("${lizhen.storage.differenceUrl}")
     private String storageDifferenceUrl;
     private String storageDifferenceUrl;
 
 
+    //cg线体
+    @Value("${lizhen.storageC12F.line}")
+    private String storageC12FLine;
+
+    //storage差异料地址
+    @Value("${lizhen.storageC12F.differenceUrl}")
+    private String storageC12FDifferenceUrl;
+
 
 
     public String getDifferentUrl(String gidLineSide) {
     public String getDifferentUrl(String gidLineSide) {
         //从BG线挑
         //从BG线挑
@@ -65,6 +73,12 @@ public class LineUtil {
                 return storageDifferenceUrl;
                 return storageDifferenceUrl;
             }
             }
         }
         }
+        String[] storageC12FLineSpl = storageC12FLine.split(",");
+        for (String line : storageC12FLineSpl) {
+            if (gidLineSide.startsWith(line)) {
+                return storageC12FDifferenceUrl;
+            }
+        }
         return "";
         return "";
     }
     }
 
 

src/main/java/com/neotel/smfcore/custom/lizhen/wcs/LizhenController.java

@@ -91,6 +91,12 @@ public class LizhenController {
     @Value("${lizhen.storage.url}")
     @Value("${lizhen.storage.url}")
     private String storageUrl;
     private String storageUrl;
 
 
+    @Value("${lizhen.storageC12F.line}")
+    private String storageC12FLine;
+
+    @Value("${lizhen.storageC12F.url}")
+    private String storageC12FUrl;
+
     @Value("${lizhen.manual.url}")
     @Value("${lizhen.manual.url}")
     private String manualTowerUrl;
     private String manualTowerUrl;
 
 
@@ -114,6 +120,7 @@ public class LizhenController {
         lineUrlMap.put(F3Line, F3Url);
         lineUrlMap.put(F3Line, F3Url);
         lineUrlMap.put(F5Line, F5Url);
         lineUrlMap.put(F5Line, F5Url);
         lineUrlMap.put(storageLine, storageUrl);
         lineUrlMap.put(storageLine, storageUrl);
+        lineUrlMap.put(storageC12FLine, storageC12FUrl);
     }
     }
 
 
 
 

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

@@ -348,6 +348,7 @@ public class CDeviceController {
                     generatePutInTask(barcode, boxBarcode, OP_STATUS.FINISHED.name(), currentLoc);
                     generatePutInTask(barcode, boxBarcode, OP_STATUS.FINISHED.name(), currentLoc);
                     boxBarcode.updateSubCodes(barcode);
                     boxBarcode.updateSubCodes(barcode);
                     boxBarcode.setAmount(boxBarcode.getAmount() + barcode.getAmount());
                     boxBarcode.setAmount(boxBarcode.getAmount() + barcode.getAmount());
+                    boxBarcode.setWarehouseCode(warhouseCode);
                     barcodeManager.save(boxBarcode);
                     barcodeManager.save(boxBarcode);
                     if (inPos != null) {
                     if (inPos != null) {
                         //流程异常时,为保证数据一致性, pos中的box barcode也需要更新
                         //流程异常时,为保证数据一致性, pos中的box barcode也需要更新
@@ -704,6 +705,12 @@ public class CDeviceController {
                         } else if (targetLoc.endsWith("CG")){
                         } else if (targetLoc.endsWith("CG")){
                             log.info("自动绑定料串["+materialStr+"]目的地:C2-3F-CG");
                             log.info("自动绑定料串["+materialStr+"]目的地:C2-3F-CG");
                             MaterialLocUtil.updateStackerLoc(materialStr,"", "C2-3F-CG",1,orderItem.getOrderNo(),barcode);
                             MaterialLocUtil.updateStackerLoc(materialStr,"", "C2-3F-CG",1,orderItem.getOrderNo(),barcode);
+                        } else if (targetLoc.endsWith("2F")){
+                            log.info("自动绑定料串["+materialStr+"]目的地:C1-2F");
+                            MaterialLocUtil.updateStackerLoc(materialStr,"", "C1-2F",1,orderItem.getOrderNo(),barcode);
+                        } else if (targetLoc.endsWith("1F")){
+                            log.info("自动绑定料串["+materialStr+"]目的地:C2-1F");
+                            MaterialLocUtil.updateStackerLoc(materialStr,"", "C2-1F",1,orderItem.getOrderNo(),barcode);
                         }
                         }
                     }
                     }
 
 

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

@@ -73,9 +73,11 @@ public class PkCheckOutController {
     //@AnonymousAccess
     //@AnonymousAccess
     public ResultBean checkOutLoc() {
     public ResultBean checkOutLoc() {
         Map<String, String> resultMap = new HashMap<>();
         Map<String, String> resultMap = new HashMap<>();
-        resultMap.put(CheckOutUtil.loc_1F,CheckOutUtil.loc_1F);
-        resultMap.put(CheckOutUtil.loc_C2,CheckOutUtil.loc_C2);
-        resultMap.put(CheckOutUtil.loc_3F,CheckOutUtil.loc_3F);
+        resultMap.put(CheckOutUtil.loc_1F, CheckOutUtil.loc_1F);
+        resultMap.put(CheckOutUtil.loc_C2, CheckOutUtil.loc_C2);
+        resultMap.put(CheckOutUtil.loc_3F, CheckOutUtil.loc_3F);
+        resultMap.put(CheckOutUtil.loc_C12F, CheckOutUtil.loc_C12F);
+        resultMap.put(CheckOutUtil.loc_C21F, CheckOutUtil.loc_C21F);
         return ResultBean.newOkResult(resultMap);
         return ResultBean.newOkResult(resultMap);
     }
     }
 
 

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

@@ -332,6 +332,7 @@ public class ManualGrPutInController {
                 barcode = barcodeManager.save(barcode);
                 barcode = barcodeManager.save(barcode);
                 generatePutInTask(barcode, boxBarcode, OP_STATUS.FINISHED.name());
                 generatePutInTask(barcode, boxBarcode, OP_STATUS.FINISHED.name());
                 boxBarcode.updateSubCodes(barcode);
                 boxBarcode.updateSubCodes(barcode);
+                boxBarcode.setWarehouseCode(warhouseCode);
                 boxBarcode.setAmount(boxBarcode.getAmount()+barcode.getAmount());
                 boxBarcode.setAmount(boxBarcode.getAmount()+barcode.getAmount());
                 barcodeManager.save(boxBarcode);
                 barcodeManager.save(boxBarcode);
                 if(inPos != null){
                 if(inPos != null){

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/util/CheckOutUtil.java

@@ -5,5 +5,6 @@ public class CheckOutUtil {
     public static final String loc_C2 = "C2/3F/BG";
     public static final String loc_C2 = "C2/3F/BG";
     public static final String loc_3F = "C2/3F/CG";
     public static final String loc_3F = "C2/3F/CG";
     public static final String loc_1F = "W2/1F";
     public static final String loc_1F = "W2/1F";
-
+    public static final String loc_C12F = "C1/2F";
+    public static final String loc_C21F = "C2/1F";
 }
 }

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/third/util/RawInLineUtil.java

@@ -38,6 +38,8 @@ public class RawInLineUtil {
     public static final String rawInLine04 = "rawInLine04";//4号入库分拣机,
     public static final String rawInLine04 = "rawInLine04";//4号入库分拣机,
     public static final String rawInLine05 = "rawInLine05";//5号入库分拣机,
     public static final String rawInLine05 = "rawInLine05";//5号入库分拣机,
     public static final String rawInLine06 = "rawInLine06";//6号入库分拣机
     public static final String rawInLine06 = "rawInLine06";//6号入库分拣机
+    public static final String rawInLine07 = "rawInLine07";//6号入库分拣机
+    public static final String rawInLine08 = "rawInLine08";//6号入库分拣机
 
 
 
 
     public static synchronized void updateDestinationMap(String material, String loc, String destination) {
     public static synchronized void updateDestinationMap(String material, String loc, String destination) {
@@ -116,6 +118,10 @@ public class RawInLineUtil {
             } else if (rawInLine05.equals(loc)) {
             } else if (rawInLine05.equals(loc)) {
                 nextLoc = rawInLine06;
                 nextLoc = rawInLine06;
             } else if (rawInLine06.equals(loc)) {
             } else if (rawInLine06.equals(loc)) {
+                nextLoc = rawInLine07;
+            } else if (rawInLine07.equals(loc)) {
+                nextLoc = rawInLine08;
+            } else if (rawInLine08.equals(loc)) {
                 nextLoc = rawInLine01;
                 nextLoc = rawInLine01;
             }
             }
             updateDestinationMap(material, loc + "_to_" + nextLoc, nextLoc);
             updateDestinationMap(material, loc + "_to_" + nextLoc, nextLoc);

src/main/resources/config/application.yml

@@ -47,6 +47,13 @@ lizhen:
     line: CG01T,CG01B,BG01T,BG01B,AS01T,AS01B,AS04T,AS04B,RS01T,RS01B
     line: CG01T,CG01B,BG01T,BG01B,AS01T,AS01B,AS04T,AS04B,RS01T,RS01B
     url: http://10.68.27.104/smf-core/api/Mes/machineCallMaterial
     url: http://10.68.27.104/smf-core/api/Mes/machineCallMaterial
     differenceUrl: http://10.68.27.104/smf-core/api/Mes/differenceReel
     differenceUrl: http://10.68.27.104/smf-core/api/Mes/differenceReel
+  storageC12F:
+    name: storageC12F
+    line: BG02T,BG02B
+    url: http://10.68.27.105/smf-core/api/Mes/machineCallMaterial
+    differenceUrl: http://10.68.27.105/smf-core/api/Mes/differenceReel
+
+
 
 
   manual:
   manual:
     url: http://10.68.27.85/smf-core/wcs/manualTower
     url: http://10.68.27.85/smf-core/wcs/manualTower