1.入料机构,料串获取目的地,13寸料串改成和7寸一样

2.更新任务状态,任务不存在时,创建一个新的任务,改库存状态
3.增加入库分拣机上空闲的料箱接口

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/enums/TaskCurrentLoc.java

@@ -8,6 +8,8 @@ public class TaskCurrentLoc {
     public static final String In2_FeedingInlet = "In2_FeedingInlet";
     public static final String In2_FeedingInlet = "In2_FeedingInlet";
     public static final String In3_FeedingInlet = "In3_FeedingInlet";
     public static final String In3_FeedingInlet = "In3_FeedingInlet";
     public static final String In4_FeedingInlet = "In4_FeedingInlet";
     public static final String In4_FeedingInlet = "In4_FeedingInlet";
+    public static final String In5_FeedingInlet = "In5_FeedingInlet";
+    public static final String In6_FeedingInlet = "In6_FeedingInlet";
     public static final String In_FeedingInlet = "In_FeedingInlet";
     public static final String In_FeedingInlet = "In_FeedingInlet";
 
 
     public static final String Out1_FeedingInlet = "Out1_FeedingInlet";
     public static final String Out1_FeedingInlet = "Out1_FeedingInlet";
@@ -18,10 +20,19 @@ public class TaskCurrentLoc {
     public static final String Out6_FeedingInlet = "Out6_FeedingInlet";
     public static final String Out6_FeedingInlet = "Out6_FeedingInlet";
     public static final String Out_FeedingInlet = "Out_FeedingInlet";
     public static final String Out_FeedingInlet = "Out_FeedingInlet";
 
 
+    public static final String OutLine01_In = "outLine01_in";
+    public static final String OutLine02_In = "outLine02_in";
+    public static final String OutLine03_In = "outLine03_in";
+    public static final String OutLine04_In = "outLine04_in";
+    public static final String OutLine05_In = "outLine05_in";
+    public static final String OutLine06_In = "outLine06_in";
+
     public static final String In1_DischargeHole = "In1_DischargeHole";
     public static final String In1_DischargeHole = "In1_DischargeHole";
     public static final String In2_DischargeHole = "In2_DischargeHole";
     public static final String In2_DischargeHole = "In2_DischargeHole";
     public static final String In3_DischargeHole = "In3_DischargeHole";
     public static final String In3_DischargeHole = "In3_DischargeHole";
     public static final String In4_DischargeHole = "In4_DischargeHole";
     public static final String In4_DischargeHole = "In4_DischargeHole";
+    public static final String In5_DischargeHole = "In5_DischargeHole";
+    public static final String In6_DischargeHole = "In6_DischargeHole";
 
 
     public static final String Out1_DischargeHole = "Out1_DischargeHole";
     public static final String Out1_DischargeHole = "Out1_DischargeHole";
     public static final String Out2_DischargeHole = "Out2_DischargeHole";
     public static final String Out2_DischargeHole = "Out2_DischargeHole";

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

@@ -89,45 +89,12 @@ public class RawInLineUtil {
     }
     }
 
 
     private static String getNextLoc(String material, String loc) {
     private static String getNextLoc(String material, String loc) {
-
-        String materialSize = MaterialUtil.getMaterialSize(material);
-
-        //Map<String, RawInLineMaterialLoc> destinationMap = dataCache.getCache(CacheNameUtil.CHCHE_RAWIN_LINE_MATERIAL_DESTINATION);
-
         String nextLoc = "";
         String nextLoc = "";
-        if ("13".equals(materialSize) || "15".equals(materialSize)) {
-            log.info(material + "的尺寸为:" + material + "直接分配到1号工位");
-            //判断1号是否要料串
-            EquipStatusBean statusBean = EquipStatusUtil.getStatusBean(rawInLine01);
-            if (statusBean != null) {
-                int status = statusBean.getStatus();
-                log.info(loc + "的状态为:" + status);
-                if (10 == status) {
-                    nextLoc = rawInLine01;
-                    if (loc.equals(rawInLine01)) {
-                        updateDestinationMap(material, loc, nextLoc);
-                    } else {
-                        updateDestinationMap(material, loc + "_to_" + nextLoc, nextLoc);
-                    }
-                    return nextLoc;
-                }
-            }
-            if (!loc.equals(rawInLine01)) {
-                nextLoc = rawInLine01;
-            } else {
-                nextLoc = rawInLine02;
-            }
-            updateDestinationMap(material, loc + "_to_" + nextLoc, nextLoc);
-        } else {
         if (loc.equals(forkLoc) || loc.equals(emptyForkLoc)) {
         if (loc.equals(forkLoc) || loc.equals(emptyForkLoc)) {
             nextLoc = rawInLine02;
             nextLoc = rawInLine02;
             updateDestinationMap(material, loc, nextLoc);
             updateDestinationMap(material, loc, nextLoc);
         } else {
         } else {
             //7寸料串,直接到2号分拣机
             //7寸料串,直接到2号分拣机
-                if (loc.equals(rawInLine01)){
-                    nextLoc = rawInLine02;
-                    updateDestinationMap(material, loc + "_to_" + nextLoc, nextLoc);
-                } else {
             EquipStatusBean statusBean = EquipStatusUtil.getStatusBean(loc);
             EquipStatusBean statusBean = EquipStatusUtil.getStatusBean(loc);
             if (statusBean != null) {
             if (statusBean != null) {
                 int status = statusBean.getStatus();
                 int status = statusBean.getStatus();
@@ -138,7 +105,9 @@ public class RawInLineUtil {
                     return nextLoc;
                     return nextLoc;
                 }
                 }
             }
             }
-                    if (rawInLine02.equals(loc)) {
+            if (rawInLine01.equals(loc)) {
+                nextLoc = rawInLine02;
+            } else if (rawInLine02.equals(loc)) {
                 nextLoc = rawInLine03;
                 nextLoc = rawInLine03;
             } else if (rawInLine03.equals(loc)) {
             } else if (rawInLine03.equals(loc)) {
                 nextLoc = rawInLine04;
                 nextLoc = rawInLine04;
@@ -147,12 +116,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 = rawInLine02;
-                    }
+                nextLoc = rawInLine01;
             }
             }
             updateDestinationMap(material, loc + "_to_" + nextLoc, nextLoc);
             updateDestinationMap(material, loc + "_to_" + nextLoc, nextLoc);
         }
         }
-        }
         return nextLoc;
         return nextLoc;
     }
     }