ndc通讯修改

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

@@ -21,6 +21,8 @@ import java.util.concurrent.*;
 
 import static com.ruoyi.ams.agv.ndc.service.ChargerButtService.*;
 import static com.ruoyi.ams.agv.ndc.service.ChargerButtProxy.CHARGER_BUTT_REQUEST.*;
+import static com.ruoyi.ams.agv.ndc.service.impl.StatusUpdateServiceImpl.AGV_ACTION.*;
+
 
 /**
  * Created by IntelliJ IDEA.
@@ -208,7 +210,9 @@ public class SocketBufferServiceImpl implements SocketBufferService {
                         log.info("aciIndex：" + aciIndex + "查询不到对应的60任务");
                     } else {
                         //解析卸货确认状态
-                        // agvUnloadingConfirmService.confirmAnalysis(task60.getTaskNo(), aciIndex, "unload", icarNo);
+                        executorService.execute(() -> {
+                            statusUpdateService.confirmAnalysis(task60.getTaskNo(), aciIndex, PICKUP.getValue(), icarNo);
+                        });
                     }
                     break;
                 case 115:
@@ -223,8 +227,10 @@ public class SocketBufferServiceImpl implements SocketBufferService {
                     if (task60Pick == null) {
                         log.info("aciIndex：" + aciIndexPick + "查询不到对应的60任务");
                     } else {
-                        //解析取货确认状态
-                        // agvUnloadingConfirmService.confirmAnalysis(task60Pick.getTaskNo(), aciIndexPick, "pickup", icarNo);
+                        //解析卸货确认状态
+                        executorService.execute(() -> {
+                            statusUpdateService.confirmAnalysis(task60Pick.getTaskNo(), aciIndexPick, UNLOAD.getValue(), icarNo);
+                        });
                     }
                     break;
                 case 122:
@@ -243,28 +249,28 @@ public class SocketBufferServiceImpl implements SocketBufferService {
                     }
                     break;
                 case 123:
-                    //空托盘堆叠层数申请
-                    log.info("空托盘堆叠层数申请");
-                    Integer index130 = Integer.parseInt(event.getLp1());
-                    AmsTask task130 = new AmsTask();
-                    task130.setAciIndex(index130);
-                    task130 = amsTaskService.selectAmsTaskByModel(task130);
-                    if (task130 != null) {
-                        // agvUnloadingConfirmService.confirmEmptyPlate(task130.getTaskNo());
+                    log.info("申请空托！" + "-" + JSON.toJSONString(event));
+                    Integer index123 = Integer.parseInt(event.getLp1());
+                    AmsTask task123 = amsTaskService.selectAmsTaskByModel(index123);
+                    if (task123 != null) {
+                        executorService.execute(() -> {
+                            statusUpdateService.confirmAnalysis(task123.getTaskNo(), index123, icarNo
+                                    , "09", "0001");
+                        });
                     }
                     break;
                 case 126: //600 中间卷帘门请求开启 定时请求
                     log.info("快速门-请求开启！" + "-" + JSON.toJSONString(event));
-                    String lp3_126 = event.getLp3();
+                    String lp1_126 = event.getLp1();
                     executorService.execute(() -> {
-                        statusUpdateService.openDoor(Integer.valueOf(lp3_126));
+                        statusUpdateService.openDoor(Integer.valueOf(lp1_126));
                     });
                     break;
                 case 127: //601 中间卷帘门请求关闭 只请求一次
                     log.info("快速门-请求关闭！" + "-" + JSON.toJSONString(event));
-                    String lp3_127 = event.getLp3();
+                    String lp1_127 = event.getLp1();
                     executorService.execute(() -> {
-                        statusUpdateService.closeDoor(Integer.valueOf(lp3_127));
+                        statusUpdateService.closeDoor(Integer.valueOf(lp1_127));
                     });
                     break;
                 case 134: