更新

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

@@ -16,6 +16,8 @@ import org.nl.acs.log.LokiLogType;
 import org.nl.acs.log.service.DeviceExecuteLogService;
 import org.nl.acs.opc.DeviceAppService;
 import org.nl.acs.opc.DeviceAppServiceImpl;
+import org.nl.acs.task.service.TaskService;
+import org.nl.acs.task.service.dto.TaskDto;
 import org.nl.modules.system.service.ParamService;
 import org.nl.modules.system.util.CodeUtil;
 import org.nl.modules.wql.util.SpringContextHolder;
@@ -76,20 +78,20 @@ public class NDCAgvServiceImpl implements NDCAgvService {
         if (StrUtil.equals(paramService.findByCode(AcsConfig.FORKAGV).getValue(), "1")) {
             String instcode = inst.getInstruction_code();
 
-            String start_height_str = inst.getStart_height();
-            String next_height_str = inst.getNext_height();
+            TaskService taskService = SpringContextHolder.getBean(TaskService.class);
+            TaskDto task = taskService.findByCodeFromCache(inst.getTask_code());
+            int start_height = Integer.parseInt(task.getStart_height());
+            int next_height = Integer.parseInt(task.getNext_height());
             int type;
-            if (StrUtil.isNotBlank(start_height_str) && StrUtil.isNotBlank(next_height_str)) {
+            if (start_height != 0 && next_height != 0) {
                 type = 1;
-            } else if (StrUtil.isNotBlank(start_height_str)) {
+            } else if (start_height != 0) {
                 type = 2;
-            } else if (StrUtil.isNotBlank(next_height_str)) {
+            } else if (next_height != 0) {
                 type = 3;
             } else {
                 type = 4;
             }
-            int start_height = Integer.parseInt(start_height_str);
-            int next_height = Integer.parseInt(next_height_str);
 
             int priority = Integer.parseInt(inst.getPriority()) + 128;
             DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class);

acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java

@@ -474,8 +474,8 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
                 String task_type = req.getTask_type();
                 String remark = req.getRemark();
                 Map<String, String> params = req.getParams();
-                String start_height = req.getStart_height();
-                String next_height = req.getNext_height();
+                String start_height = StrUtil.isBlank(req.getStart_height()) ? "0" : req.getStart_height();
+                String next_height = StrUtil.isBlank(req.getNext_height()) ? "0" : req.getNext_height();
 
                 String start_point_code = "";
                 String next_point_code = "";

acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/dto/InstructionDto.java

@@ -348,14 +348,4 @@ public class InstructionDto implements Serializable {
      */
     private String agv_system_type;
 
-    /**
-     * 起点高度
-     */
-    private String start_height;
-
-    /**
-     * 终点高度
-     */
-    private String next_height;
-
 }

acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java

@@ -151,10 +151,6 @@ public class AutoCreateInst {
                 instdto.setAgv_system_type(agv_system_type);
                 instdto.setAgv_inst_type("1");
 
-
-                instdto.setStart_height(start_height);
-                instdto.setNext_height(next_height);
-
                 try {
                     instructionService.create(instdto);
                 } catch (Exception e) {