1.工单分配出料口,站位信息修改

src/main/java/com/neotel/smfcore/custom/Jkem21481/util/StorageExportUtil.java

@@ -44,6 +44,7 @@ public class StorageExportUtil {
     private void initExport() {
     private void initExport() {
         initExportMap();
         initExportMap();
         initExportFeederMap();
         initExportFeederMap();
+        log.info("加载完成");
     }
     }
 
 
 
 
@@ -190,7 +191,7 @@ public class StorageExportUtil {
                     }
                     }
                 }
                 }
             }
             }
-        } else if (originalFeeder.startsWith("4") || originalFeeder.startsWith("8")) {
+        } else if (originalFeeder.startsWith("4")) {
             if (left) {
             if (left) {
                 if (currentLoc >= 1 && currentLoc <= 15) {
                 if (currentLoc >= 1 && currentLoc <= 15) {
                     if (secondReel) {
                     if (secondReel) {
@@ -220,6 +221,44 @@ public class StorageExportUtil {
                     }
                     }
                 }
                 }
             }
             }
+        } else if (originalFeeder.startsWith("8")) {
+            if (originalFeeder.endsWith("F")) {
+                if (left) {
+                    if (currentLoc >= 1 && currentLoc <= 30) {
+                        if (secondReel) {
+                            export = "UM4_1";
+                        } else {
+                            export = "UM4_3";
+                        }
+                    }
+                } else {
+                    if (currentLoc >= 1 && currentLoc <= 30) {
+                        if (secondReel) {
+                            export = "UM8_1";
+                        } else {
+                            export = "UM8_3";
+                        }
+                    }
+                }
+            } else if (originalFeeder.endsWith("L") || originalFeeder.endsWith("R")) {
+                if (left) {
+                    if (currentLoc >= 18 && currentLoc <= 34) {
+                        if (secondReel) {
+                            export = "UM4_1";
+                        } else {
+                            export = "UM4_2";
+                        }
+                    }
+                } else {
+                    if (currentLoc >= 18 && currentLoc <= 34) {
+                        if (secondReel) {
+                            export = "UM8_1";
+                        } else {
+                            export = "UM8_2";
+                        }
+                    }
+                }
+            }
         }
         }
         return export;
         return export;
     }
     }
@@ -494,9 +533,26 @@ public class StorageExportUtil {
     }
     }
 
 
     private void initExportFeederMap(){
     private void initExportFeederMap(){
+
         List<String> endList = Arrays.asList("L", "R");
         List<String> endList = Arrays.asList("L", "R");
+
+        //8是特殊的单独处理
+        for (int i = 81001; i <= 81030; i++) {
+            String feeder = i + "F";
+            addFeederMap("UM4_3", feeder);
+            addFeederMap("UM8_3", feeder);
+        }
+
+        for (String end : endList) {
+            for (int i = 80018; i <= 80034 ; i++) {
+                String feeder = i + end;
+                addFeederMap("UM4_2",feeder);
+                addFeederMap("UM8_2",feeder);
+            }
+        }
+
         for (String end : endList) {
         for (String end : endList) {
-            for (int feederStart = 1; feederStart <= 8; feederStart++) {
+            for (int feederStart = 1; feederStart <= 7; feederStart++) {
                 for (int feederEnd = 1; feederEnd <= 30; feederEnd++) {
                 for (int feederEnd = 1; feederEnd <= 30; feederEnd++) {
                     String feeder = "";
                     String feeder = "";
                     if (1 <= feederEnd && feederEnd < 10) {
                     if (1 <= feederEnd && feederEnd < 10) {
@@ -541,8 +597,8 @@ public class StorageExportUtil {
                         }
                         }
                     }
                     }
 
 
-                    //feeder为40001L-40015L/40001L-40015L只可以放4_3或者8_3
-                    if (feederStart == 4 || feederStart == 8) {
+                    //如果feederStart为4的话feeder为40001L-40015L放4_3或者8_3
+                    if(feederStart == 4){
                         if (1 <= feederEnd && feederEnd <= 15) {
                         if (1 <= feederEnd && feederEnd <= 15) {
                             addFeederMap("UM4_3",feeder);
                             addFeederMap("UM4_3",feeder);
                             addFeederMap("UM8_3",feeder);
                             addFeederMap("UM8_3",feeder);