更新

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

@@ -154,25 +154,11 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
                 jo.put("remark", remark);
                 jo.put("params", params);
                 jo.put("task_type", StrUtil.isEmpty(task_type) ? 1 : Integer.parseInt(task_type));
+
                 if (!StrUtil.isEmpty(task_uuid)) {
                     jo.put("ext_task_id", task_uuid);
                 }
-                // 如果是无光电的设备 指令完成变更起点、终点状态
+             
-                JSONObject startjo = new JSONObject();
-                startjo.put("device_code", start_device_code);
-                startjo.put("hasGoodStatus", "2");
-                startjo.put("material_type", "");
-                startjo.put("batch", "");
-                startjo.put("islock", "false");
-                DeviceService.changeDeviceStatus(startjo);
-
-                JSONObject nextjo = new JSONObject();
-                nextjo.put("device_code", next_device_code);
-                nextjo.put("hasGoodStatus", "0");
-                nextjo.put("material_type", "");
-                nextjo.put("batch", "");
-                nextjo.put("islock", "false");
-                DeviceService.changeDeviceStatus(nextjo);
                 TaskDto task_dto = jo.toJavaObject(TaskDto.class);
                 try {
                     TaskService.create(task_dto);

wcs/hd/nladmin-system/src/main/java/org/nl/acs/task/service/dto/TaskFeedbackDto.java

@@ -136,4 +136,10 @@ public class TaskFeedbackDto implements Serializable {
      * 修改时间
      */
     private String update_time;
+
+
+    /**
+     * AGV系统类型
+     */
+    private String agv_system_type;
 }

wcs/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java

@@ -535,6 +535,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
                     feefbackdto.setNext_device_code(entity.getNext_device_code());
                     feefbackdto.setNext_point_code(entity.getNext_point_code());
                     feefbackdto.setError_code("400");
+                    feefbackdto.setAgv_system_type(entity.getAgv_system_type());
                     feefbackdto.setIs_finished("0");
                     feefbackdto.setRemark(message);
                     taskFeedbackService.create(feefbackdto);