1.工单出库数量为0的 自动执行

2.对接接料机修改

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

@@ -179,9 +179,16 @@ public class LiteOrderCache {
             }
             }
 
 
             if (order.isNew() || order.isTaskFinished()) {
             if (order.isNew() || order.isTaskFinished()) {
-                if (order.isTaskFinished()/* && order.isMaiZheng()*/){
+                if (order.isTaskFinished() && order.isMaiZheng()){
 
 
                 } else {
                 } else {
+                    //如果是尾料已完成已出数量大于0,则不进行自动出库
+                    if(order.isTaskFinished()){
+                        int totalFinishedReelCount = order.getTotalFinishedReelCount();
+                        if (totalFinishedReelCount > 0){
+                            continue;
+                        }
+                    }
                     //判断是否到达时间
                     //判断是否到达时间
                     Date curr = new Date();
                     Date curr = new Date();
                     if (order.getSDate().before(curr)) {
                     if (order.getSDate().before(curr)) {
@@ -510,7 +517,8 @@ public class LiteOrderCache {
             return "没有空闲的出料口";
             return "没有空闲的出料口";
         }
         }
 
 
-        if (cacheOrder.isMaiZheng()){
+        String line = cacheOrder.getLine();
+        if (cacheOrder.isMaiZheng() && !line.contains("_")){
             //迈征的工单,通知迈征准备出库
             //迈征的工单,通知迈征准备出库
             maiZhengApi.prepareReelBox(cacheOrder.getOrderNo(), "ok",cacheOrder.getStartTime());
             maiZhengApi.prepareReelBox(cacheOrder.getOrderNo(), "ok",cacheOrder.getStartTime());
         }
         }

src/main/java/com/neotel/smfcore/core/order/service/po/LiteOrder.java

@@ -171,6 +171,7 @@ public class LiteOrder extends BasePo implements Serializable {
     private String reelBoxID;
     private String reelBoxID;
     private String count;
     private String count;
     private String startTime;
     private String startTime;
+    private String serverId;
 
 
     private boolean differenceReq = false;
     private boolean differenceReq = false;
 
 

src/main/java/com/neotel/smfcore/custom/lizhen/LizhenApi.java

@@ -622,9 +622,16 @@ public class LizhenApi extends DefaultSmfApiListener {
         }
         }
     }
     }
 
 
+
     private void reelReturnTower(DataLog oldTask) {
     private void reelReturnTower(DataLog oldTask) {
         Map<String, Object> dataMap = new HashMap<>();
         Map<String, Object> dataMap = new HashMap<>();
-        dataMap.put("line", oldTask.getLine());
+        String line = oldTask.getLine();
+        if (StringUtils.isNotEmpty(line)){
+            if (line.contains("_")){
+                line = line.substring(0,line.indexOf("_"));
+            }
+        }
+        dataMap.put("line", line);
         dataMap.put("reel_id", oldTask.getBarcode());
         dataMap.put("reel_id", oldTask.getBarcode());
         dataMap.put("ipn", oldTask.getPartNumber());
         dataMap.put("ipn", oldTask.getPartNumber());
         dataMap.put("rm_type", 2);
         dataMap.put("rm_type", 2);
@@ -663,10 +670,15 @@ public class LizhenApi extends DefaultSmfApiListener {
 
 
     private void reelOutFromTower(DataLog task) {
     private void reelOutFromTower(DataLog task) {
         List<Map<String, Object>> paramList = new ArrayList<>();
         List<Map<String, Object>> paramList = new ArrayList<>();
-
         Storage storage = dataCache.getStorage(task.getCid());
         Storage storage = dataCache.getStorage(task.getCid());
         Map<String, Object> paramMap = new HashMap<>();
         Map<String, Object> paramMap = new HashMap<>();
-        paramMap.put("line",task.getLine());
+        String line = task.getLine();
+        if (StringUtils.isNotEmpty(line)){
+            if (line.contains("_")){
+                line = line.substring(0,line.indexOf("_"));
+            }
+        }
+        paramMap.put("line",line);
         paramMap.put("mc_id",storage.getMachineId());
         paramMap.put("mc_id",storage.getMachineId());
         paramMap.put("reel_id",task.getBarcode());
         paramMap.put("reel_id",task.getBarcode());
         paramMap.put("ipn",task.getPartNumber());
         paramMap.put("ipn",task.getPartNumber());

src/main/java/com/neotel/smfcore/custom/lizhen/third/maicheng/bean/AskReelBox.java

@@ -12,4 +12,5 @@ public class AskReelBox {
     private String Count;
     private String Count;
     private String StartTime;
     private String StartTime;
     private List<AskReelBoxList> List;
     private List<AskReelBoxList> List;
+    private String serverId;
 }
 }

src/main/java/com/neotel/smfcore/custom/lizhen/third/maicheng/controller/MaiZhengDeviceController.java

@@ -113,6 +113,7 @@ public class MaiZhengDeviceController {
         paramMap.put("CacheID",liteOrder.getCacheID());
         paramMap.put("CacheID",liteOrder.getCacheID());
         paramMap.put("ReelBoxID",reelBoxId);
         paramMap.put("ReelBoxID",reelBoxId);
         paramMap.put("StartTime", DateUtil.toDateString(new Date(),"yyyy-MM-dd HH:mm:ss"));
         paramMap.put("StartTime", DateUtil.toDateString(new Date(),"yyyy-MM-dd HH:mm:ss"));
+        paramMap.put("ServerId",liteOrder.getServerId());
 
 
         List<Map<String, Object>> list = new ArrayList<>();
         List<Map<String, Object>> list = new ArrayList<>();
         List<LiteOrderItem> orderItemList = liteOrder.getOrderItems();
         List<LiteOrderItem> orderItemList = liteOrder.getOrderItems();