Merge remote-tracking branch 'origin/xuankuang' into xuankuang

warewms-ams/src/main/java/com/ruoyi/ams/agv/ndc/AciService.java

@@ -144,7 +144,8 @@ public class AciService {
                             String order = amsHexdefineDetailService.concatOrder(t, basTask);
                             log.info("writeOrder:" + order);
                             if (t.getBusinessType().equals("m") ||
-                                    t.getBusinessType().equals("01")
+                                    t.getBusinessType().equals("01") ||
+                                    t.getBusinessType().equals("164")
                             ) {
 
                                 buffer.put(ByteUtil.hexString2ByteArray(order));

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

@@ -200,23 +200,23 @@ public class StatusUpdateServiceImpl implements StatusUpdateService {
     public void feedbackTS(AmsNdcEvent event) {
         AmsTask addTaskForm = new AmsTask();
         addTaskForm.setTaskNo(SnowflakeIdWorker.generateId().toString());
-        //吴老板说这个方法有bug
         addTaskForm.setIkey((long) BusinessServiceImpl.geniKey(addTaskForm.getTaskNo()));
-        addTaskForm.setBusinessType(Constant.TASK_BUSINESS_TYPE.TASK_164.getValue());
         addTaskForm.setStFrom(998);
         addTaskForm.setStTo(999);
         addTaskForm.setPriority(1);
-        // 固定写法
-        //TODO 这里传什么是个问题
-        addTaskForm.setExt2(event.getLp1());
-        addTaskForm.setExt3("0000");
+        addTaskForm.setBusinessType(Constant.TASK_BUSINESS_TYPE.TASK_164.getValue());
+        addTaskForm.setExt1(event.getLp1());
+        addTaskForm.setExt2(event.getLp2());
+        addTaskForm.setExt3(event.getLp3());
 
         // 如果ams_task已经有此任务的待接收消息，则不生成新的消息
         AmsTask amsTaskQuery = new AmsTask();
         amsTaskQuery.setAciAccept(0);
         amsTaskQuery.setIsDelete(0);
         amsTaskQuery.setBusinessType(Constant.TASK_BUSINESS_TYPE.TASK_164.getValue());
-        amsTaskQuery.setExt2(addTaskForm.getExt2());
+        amsTaskQuery.setExt1(event.getLp1());
+        amsTaskQuery.setExt2(event.getLp2());
+        amsTaskQuery.setExt3(event.getLp3());
         List<AmsTask> undoneList = amsTaskService.selectAmsTaskList(amsTaskQuery);
         if (undoneList.size() > 0) {
             return;