更新

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

@@ -363,20 +363,8 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
                 throw new BadRequestException("未查询到相关路由！");
             }
             if (StrUtil.equals(shortPathsList.get(0).getType(), "1")) {
-                // 0为输送、立库任务  1 1楼叉车系统  2 2楼1区域AGV系统 3 2楼2区域AGV系统
+                NDCAgvService ndcAgvService = SpringContextHolder.getBean(NDCAgvService.class);
-                if (!StrUtil.equals(task.getAgv_system_type(), "0")
+                ndcAgvService.sendAgvInstToNDC(task.getAgv_system_type(), dto);
-                        && ObjectUtil.isNotEmpty(task.getAgv_system_type())) {
-                    NDCAgvService ndcAgvService = SpringContextHolder.getBean(NDCAgvService.class);
-                    ndcAgvService.sendAgvInstToNDC(task.getAgv_system_type(), dto);
-                } else {
-                    // Boolean result =  createLkInst(task.getStorage_task_type(),dto);
-                    Resp resp = acsToLiKuService.sendInst(task.getStorage_task_type(), dto);
-                    if (StrUtil.equals(resp.result, "true")) {
-                        dto.setSend_status("1");
-                    } else {
-                        dto.setSend_status("2");
-                    }
-                }
             }
         } catch (Exception e) {
             dto.setSend_status("2");
@@ -479,14 +467,8 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
                 throw new BadRequestException("未查询到相关路由！");
             }
             if (StrUtil.equals(shortPathsList.get(0).getType(), "1")) {
-                // 0为输送、立库任务  1 1楼叉车系统  2 2楼1区域AGV系统 3 2楼2区域AGV系统
+                NDCAgvService ndcAgvService = SpringContextHolder.getBean(NDCAgvService.class);
-                if (!StrUtil.equals(task.getAgv_system_type(), "0")
+                ndcAgvService.sendAgvInstToNDC(task.getAgv_system_type(), dto);
-                        && ObjectUtil.isNotEmpty(task.getAgv_system_type())) {
-                    NDCAgvService ndcAgvService = SpringContextHolder.getBean(NDCAgvService.class);
-                    ndcAgvService.sendAgvInstToNDC(task.getAgv_system_type(), dto);
-                } else {
-                    //                    Boolean result =  createLkInst(task.getStorage_task_type(),dto);
-                }
             }
         } catch (Exception e) {
             dto.setSend_status("2");