修改bug

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

@@ -270,20 +270,22 @@ public class TaskWorkNode {
         }
         logger.info("===============================接口返回" + returnData);
         JSONObject retJson = JSONObject.parseObject(returnData);
-        String code = retJson.getString("result").trim();
-        if(code == "true") {
-            //回调处理
-            taskNode.setExeStatus("3").setEndTime(new Date()).setExeResult("1");
-            taskNodeService.updateAllById(taskNode);
-            log.setExeStatus("3").setEndTime(new Date()).setExeResult("1").setFeedback("");
-            msgUtil.redis_del(CacheKey.TASK_CURRENT_NODE_CONDITION + "_" + taskNode.getId());
-            msgUtil.redis_del(CacheKey.TASK_CURRENT_NODE_PARAMS + "_" + taskNode.getId());
-        }else if(code == "0"){
-            //需要人工处理解决警报异常
-            log.setExeResult("0").setManual("1").setFeedback(retJson.getString("msg"));
-        }else if(code == "2"){
-            //执行异常处理（无须人工处理和警报提示)
-            log.setExeResult("0").setManual("0").setFeedback(retJson.getString("msg"));
+        if(retJson!=null){
+            String code = retJson.getString("result").trim();
+            if(code == "true") {
+                //回调处理
+                taskNode.setExeStatus("3").setEndTime(new Date()).setExeResult("1");
+                taskNodeService.updateAllById(taskNode);
+                log.setExeStatus("3").setEndTime(new Date()).setExeResult("1").setFeedback("");
+                msgUtil.redis_del(CacheKey.TASK_CURRENT_NODE_CONDITION + "_" + taskNode.getId());
+                msgUtil.redis_del(CacheKey.TASK_CURRENT_NODE_PARAMS + "_" + taskNode.getId());
+            }else if(code == "0"){
+                //需要人工处理解决警报异常
+                log.setExeResult("0").setManual("1").setFeedback(retJson.getString("msg"));
+            }else if(code == "2"){
+                //执行异常处理（无须人工处理和警报提示)
+                log.setExeResult("0").setManual("0").setFeedback(retJson.getString("msg"));
+            }
         }
         if(log.getId()==null){
             autoNodeLogService.save(log);

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

@@ -1090,6 +1090,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
 
             Storge currstorge = workpieceService.getWorkPieceStock(taskNode.getCompleteBatchNo(), false);
             jsonObject.put("targetPostion", currstorge.getId());
+            jsonObject.put("srcPosition", "");
             //入库
             jsonObject.put(DemoLineConstant.DEMOLINE_STOCK_TYPE, DemoLineConstant.DEMOLINE_STOCK_TYPE_METERIAL_RK);
             //节点完成业务