回库交换功能处理

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/TaskNodeServiceImpl.java

@@ -1798,8 +1798,7 @@ public class TaskNodeServiceImpl extends SuperServiceImpl<TaskNodeMapper, TaskNo
             }
         }else{
             log.warn("【处理出库入库】");
-            R<String> r =
-        demoLineStock(taskNode, task, callBackJson, currWorkpiece);
+            R<String> r = demoLineStock(taskNode, task, callBackJson, currWorkpiece);
         log.warn("【更新节点状态】");
         updateBizStatus(taskNode, task, taskNodeList, lg, callBackJson, r, currWorkpiece);
     }
@@ -2009,9 +2008,14 @@ public class TaskNodeServiceImpl extends SuperServiceImpl<TaskNodeMapper, TaskNo
             if (count < 1) {//
                 return false;
             }
+        } else if (callBackJson.containsKey("YUNJIAN_XBKFLAG") && callBackJson.containsKey("YUNJIAN_ROBORT_CACHE_FLAG")){
+            int count = callBackJson.getString(taskNode.getId().toString() + "count") == null ? 0 :
+                    Integer.parseInt(callBackJson.getString(taskNode.getId().toString() + "count"));
+            if (count < 1) {
+                return false;
+            }
         }
         return true;
-
     }
 
 
@@ -2664,7 +2668,8 @@ public class TaskNodeServiceImpl extends SuperServiceImpl<TaskNodeMapper, TaskNo
 
         // 最后一个工序最后一个节点
         TaskNode nextTaskNode = this.getNextNTaskNode(taskNode, 1);
-        if (null == nextTaskNode) {
+        boolean condition = callBackJson.containsKey(taskNode.getId()+"count") && callBackJson.getString(taskNode.getId()+"count").equals("1");
+        if (null == nextTaskNode && condition) {
             List<TaskNode> operationTaskNodes = baseMapper.selectList(Wraps.<TaskNode>lbQ().eq(TaskNode::getTaskId,
                     taskNode.getTaskId()));
             List<Long> operationTaskNodeIds =