rev 取消指令下发调度

acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java

@@ -63,7 +63,7 @@ public class NDCAgvServiceImpl implements NDCAgvService {
             };
             log.info("下发删除AGV指令--{}", Bytes2HexString(b));
 
-//                NDCSocketConnectionAutoRun.write(b);
+            OneNDCSocketConnectionAutoRun.write(b);
             System.out.println("下发删除agv指令数据:" + Bytes2HexString(b));
         }
 
@@ -214,9 +214,9 @@ public class NDCAgvServiceImpl implements NDCAgvService {
         };
         log.info("下发AGV充电任务--{}", str1);
 
-        try{
+        try {
             OneNDCSocketConnectionAutoRun.write(b);
-        } catch (Exception e){
+        } catch (Exception e) {
             e.getMessage();
             return false;
         }

acs/nladmin-system/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java

@@ -154,6 +154,7 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
                             inst.setAgv_jobno(String.valueOf(index));
                             inst.setSend_status("1");
                             instructionService.update(inst);
+                            log.info("开始上报执行中,指令号:{}", ikey);
                         }
                         data = NDCAgvService.sendAgvOneModeInst(phase, index, 0);
                     }
@@ -163,10 +164,10 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
                         if (!ObjectUtil.isEmpty(inst)) {
                             instructionService.finish(inst.getInstruction_id());
                         } else {
-                            log.warn("指令号:{},未反馈wms任务完成，因为agv上报指令号查询指令为空!");
+                            log.warn("指令号:{},未反馈wms任务完成，因为agv上报指令号查询指令为空!", ikey);
                         }
                         data = NDCAgvService.sendAgvOneModeInst(phase, index, 0);
-                        log.info("指令号:{},已反馈agv任务完成!");
+                        log.info("指令号:{},已反馈agv任务完成!", ikey);
                     }
                     //请求删除任务
                     //(需要WCS反馈)

acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java

@@ -366,6 +366,7 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
                 NDCAgvService ndcAgvService = SpringContextHolder.getBean(NDCAgvService.class);
                 ndcAgvService.sendAgvInstToNDC(task.getAgv_system_type(), dto);
             }
+            dto.setSend_status("1");
         } catch (Exception e) {
             dto.setSend_status("2");
             e.printStackTrace();