测试修改

warewms-ams/src/main/java/com/ruoyi/ams/agv/ndc/service/impl/SocketBufferServiceImpl.java

@@ -126,13 +126,16 @@ public class SocketBufferServiceImpl implements SocketBufferService {
                     log.info("任务回调执行取消:" + JSON.toJSONString(event));
                     taskBean.setAciIndex(Integer.parseInt(event.getLp1()));
                     taskBean = amsTaskService.selectAmsTaskByModel(taskBean);
-                    taskBean.setEvent(eventId);
-                    taskBean.setServerAck(0);
-                    taskBean.setAciAccept(1);
-                    taskBean.setRoadway("任务回调执行取消");
-                    taskBean.setSystemStatus(null);
-                    taskBean.setIsDelete(null);
-                    amsTaskService.updateAmsTask(taskBean);
+
+                    AmsTask taskBeanUpdate = new AmsTask();
+                    taskBeanUpdate.setId(taskBean.getId());
+                    taskBeanUpdate.setEvent(eventId);
+                    taskBeanUpdate.setServerAck(0);
+                    taskBeanUpdate.setAciAccept(1);
+                    taskBeanUpdate.setRoadway("任务回调执行取消");
+                    taskBeanUpdate.setSystemStatus(null);
+                    taskBeanUpdate.setIsDelete(null);
+                    amsTaskService.updateAmsTask(taskBeanUpdate);
                     //任务状态回调
                     statusUpdateService.updateStatus(taskBean.getId().longValue(), icarNo);
                     break;
@@ -151,11 +154,13 @@ public class SocketBufferServiceImpl implements SocketBufferService {
                     taskBean.setAciIndex(Integer.parseInt(event.getLp1()));
                     taskBean = amsTaskService.selectAmsTaskByModel(taskBean);
 
-                    taskBean.setEvent(eventId);
-                    taskBean.setServerAck(0);
-                    taskBean.setSystemStatus(null);
-                    taskBean.setIsDelete(null);
-                    amsTaskService.updateAmsTask(taskBean);
+                    AmsTask taskBeanUpdate01 = new AmsTask();
+                    taskBeanUpdate01.setId(taskBean.getId());
+                    taskBeanUpdate01.setEvent(eventId);
+                    taskBeanUpdate01.setServerAck(0);
+                    taskBeanUpdate01.setSystemStatus(null);
+                    taskBeanUpdate01.setIsDelete(null);
+                    amsTaskService.updateAmsTask(taskBeanUpdate01);
 
                     statusUpdateService.updateStatus(taskBean.getId().longValue(), icarNo);
                     break;

warewms-ams/src/main/java/com/ruoyi/ams/agv/ndc/service/impl/StatusUpdateServiceImpl.java

@@ -39,10 +39,11 @@ public class StatusUpdateServiceImpl implements StatusUpdateService {
             result.setCarNo(carNo);
             result.setTaskNo(amsTask.getTaskNo());
             //判断状态
-            if (null != amsTask.getSystemStatus() && amsTask.getSystemStatus() == 3) {
-                result.setState(2);
-            } else if (null != amsTask.getSystemStatus() && amsTask.getSystemStatus() == 4) {
-                result.setState(7);
+            if(false){
+//            if (null != amsTask.getSystemStatus() && amsTask.getSystemStatus() == 3) {
+//                result.setState(2);
+//            } else if (null != amsTask.getSystemStatus() && amsTask.getSystemStatus() == 4) {
+//                result.setState(7);
             } else {
                 switch (amsTask.getEvent().intValue()) {
                     case 86:

warewms-ams/src/main/java/com/ruoyi/ams/task/service/impl/WcsTaskServiceImpl.java

@@ -247,8 +247,7 @@ public class WcsTaskServiceImpl implements IWcsTaskService {
             amsTaskUpdate.setId(amsTask.getId());
             amsTaskUpdate.setIsDelete(1);
             amsTaskUpdate.setAciAccept(0);
-            //  todo 这里修改竟然有问题，修改不了。
-            iAmsTaskService.updateAmsTask(amsTask);
+            iAmsTaskService.updateAmsTask(amsTaskUpdate);
         }
         return AjaxResult.success("取消任务指令已下发！");
     }