更新bug处理

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

@@ -1302,7 +1302,7 @@ public class TaskNodeServiceImpl extends SuperServiceImpl<TaskNodeMapper, TaskNo
         BaseContextHandler.setTenant("0000");
         //取出参数
         String code = bean.getCode();
-        String msg = bean.getMsg();
+        String msg = bean.getMsg()!=null? bean.getMsg() : "指令操作失败";
         String taskNodeId = bean.getTaskNodeId() == null ? "" : bean.getTaskNodeId().toString();
 
         // begin add by yejian on 20220503 for yj on 如果排产中先等待排产完成后继续执行
@@ -1369,8 +1369,7 @@ public class TaskNodeServiceImpl extends SuperServiceImpl<TaskNodeMapper, TaskNo
             taskNodeCallbackBiz(taskNode, task, taskNodeList, lg, bizCallBackData);
         } else {
             //插入执行日志
-            lg.setExeResult("0");
-            lg.setFeedback(msg);
+            lg.setExeResult("0").setManual("1").setFeedback(msg);
             autoNodeLogMapper.updateAllById(lg);
         }
         return R.success();

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/dispatchRecord/DispatchExceptionController.java

@@ -185,8 +185,12 @@ public class DispatchExceptionController extends SuperSimpleController<AAutoNode
 
         TaskNode taskNode = taskNodeService.getById(taskNodeId);
         //清除资源锁定
-        taskNodeService.freeLock(taskNode.getCompleteBatchNo());
+        if(taskNode.getInterfaceType().equals("3")){
+            //AGV资源释放
 
+        }else{
+            taskNodeService.freeLock(taskNode.getCompleteBatchNo());
+        }
         ZZoneProductionresource zoneProductionresource = zZoneProductionresourceMapper.selectOne(Wraps.<ZZoneProductionresource>lbQ().eq(ZZoneProductionresource::getResourceId,taskNode.getResourceId()));
         ZZone zZone = zoneService.getById(zoneProductionresource.getZoneId());
         // 判断该节点使用那条线的plc

imcs-admin-boot/imcs-common/src/main/java/com/github/zuihou/common/constant/DictionaryKey.java

@@ -16,7 +16,7 @@ public interface DictionaryKey {
     //线边库最大库位数
     final Integer RESOURCE_MAX_NUM = 20;
     //指定接口URL地址
-    final String INSTRUCTION_URL = "http://106.15.38.8:8090/";
+    final String INSTRUCTION_URL = "http://192.168.170.248:8081/";
     //PLC
     String INTERFACETYPE_PLC = "01";
     //生产加工接口