恒轮逻辑优化

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/mq/TaskWorkNode.java

@@ -479,6 +479,7 @@ public class TaskWorkNode {
                                        JSONObject ret = new JSONObject();
                                        ret.put("result","true");
                                        returnData = ret.toJSONString();
+                                       specialCallBackMyselfFlag = true;
                                     }else{
                                            try {
                                                Thread.sleep(1000);
@@ -577,7 +578,7 @@ public class TaskWorkNode {
             }
             logger.info("specialCallBackMyselfFlag={}",specialCallBackMyselfFlag);
             if(specialCallBackMyselfFlag){
-                // 打标机特殊处理
+                // 打标机或恒轮上传程序特殊处理
                 JSONObject callBackData = new JSONObject();
                 callBackData.put("code","1");
                 callBackData.put("msg","操作成功");

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

@@ -306,6 +306,7 @@ public class MachineNodeServiceImpl implements NodeOperationService {
                     }
                 }
                 else if ("2".equals(functionType)) {
+                    map.remove("HELLER");
                     //执行加工程序，分多次执行
                     //String zoneNo = msgUtil.redis_get(DemoCacheKey.DEMOLINE_WORKOP_ZONE + task.getCompleteBatchNo()) == null ? ""
                      //       : msgUtil.redis_get(DemoCacheKey.DEMOLINE_WORKOP_ZONE + task.getCompleteBatchNo()).toString();