From 69e7d6d5f7fee94497ce8995e349f2f8d7503ae4 Mon Sep 17 00:00:00 2001
From: "USER-20220102CG\\noblelift" <546428999@qq.com>
Date: Mon, 4 Jul 2022 09:04:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/nl/acs/device/wql/task_inst.xls  | Bin 189440 -> 189440 bytes
 .../wms/service/impl/WmsToAcsServiceImpl.java |  18 ++----------------
 .../acs/task/service/dto/TaskFeedbackDto.java |   6 ++++++
 .../task/service/impl/TaskServiceImpl.java    |   1 +
 4 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/device/wql/task_inst.xls b/wcs/hd/nladmin-system/src/main/java/org/nl/acs/device/wql/task_inst.xls
index 2c352f86d34234b3bee75dcdd68575639e4288c4..aebc15e620a56f5da4a9ab7fa97624a3af1870fe 100644
GIT binary patch
delta 4468
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
M?NsT%(sb_s0`4=_+5i9m

delta 4687
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

diff --git a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/wcs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
index 8a0d80e3..5495b0a3 100644
--- a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
+++ b/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);
diff --git a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/task/service/dto/TaskFeedbackDto.java b/wcs/hd/nladmin-system/src/main/java/org/nl/acs/task/service/dto/TaskFeedbackDto.java
index 83cbd16c..848422a8 100644
--- a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/task/service/dto/TaskFeedbackDto.java
+++ b/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;
 }
diff --git a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/wcs/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
index a637f9b4..a75da711 100644
--- a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
+++ b/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);