From 3a1f0805c7125212ae0adc53c2d623fb075f2714 Mon Sep 17 00:00:00 2001
From: "USER-20220102CG\\noblelift" <546428999@qq.com>
Date: Wed, 15 Feb 2023 15:23:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SlitTwoManipulatorDeviceDriver.java       |  2 +-
 .../wms/service/impl/WmsToAcsServiceImpl.java | 46 ++++++++++---------
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java
index 810ed1f88..329dfc7f2 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java
@@ -527,7 +527,7 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
                             this.setNow_steps_type3(9);
                         }
                     } else {
-                        log.warn("后工位放货位有货,放货位:{},mode:{},move:{}", next_device_code, mode, move);
+//                        log.warn("后工位放货位有货,放货位:{},mode:{},move:{}", next_device_code, mode, move);
                         if (this.getNow_steps_type1() == 4 || this.getNow_steps_type3() == 8) {
                             feedMessage = "前工位未放货原因-->";
                             if (mode != 2) {
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
index d3a0193e7..840ed5c5e 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
@@ -586,31 +586,35 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
                 if (StrUtil.isEmpty(route_plan_code)) {
                     route_plan_code = "normal";
                 }
-                Device device = deviceAppService.findDeviceByCode(next_device_code);
-                SiemensConveyorDeviceDriver siemensConveyorDeviceDriver;
-                if(device.getDeviceDriver() instanceof  SiemensConveyorDeviceDriver) {
-                    siemensConveyorDeviceDriver = (SiemensConveyorDeviceDriver) device.getDeviceDriver();
-                    if (ObjectUtil.equal("true", siemensConveyorDeviceDriver.getExtraValue().get("inspect_in_stock"))) {
-                        if(siemensConveyorDeviceDriver.getMove() == 1)
-                        {
-                            JSONObject json = new JSONObject();
-                            json.put("task_code", task_code);
-                            json.put("ext_task_id", ext_task_id);
-                            json.put("message", "终点有货无法生成任务");
-                            errArr.add(json);
-                            continue;
+
+                if(StrUtil.equals(task_type,"5")){
+                    Device device = deviceAppService.findDeviceByCode(next_device_code);
+                    SiemensConveyorDeviceDriver siemensConveyorDeviceDriver;
+                    if(device.getDeviceDriver() instanceof  SiemensConveyorDeviceDriver) {
+                        siemensConveyorDeviceDriver = (SiemensConveyorDeviceDriver) device.getDeviceDriver();
+                        if (ObjectUtil.equal("true", siemensConveyorDeviceDriver.getExtraValue().get("inspect_in_stock"))) {
+                            if(siemensConveyorDeviceDriver.getMove() == 1)
+                            {
+                                JSONObject json = new JSONObject();
+                                json.put("task_code", task_code);
+                                json.put("ext_task_id", ext_task_id);
+                                json.put("message", "终点有货无法生成任务");
+                                errArr.add(json);
+                                continue;
+                            }
                         }
                     }
+
+                    if( taskService.querySameDeviceReadyTask(start_device_code,next_device_code,"0") > 1){
+                        JSONObject json = new JSONObject();
+                        json.put("task_code", task_code);
+                        json.put("ext_task_id", ext_task_id);
+                        json.put("message", "已存在相同的起点终点未执行的输送任务");
+                        errArr.add(json);
+                        continue;
+                    }
                 }
 
-                if( StrUtil.equals(task_type,"5") &&  taskService.querySameDeviceReadyTask(start_device_code,next_device_code,"0") > 1){
-                    JSONObject json = new JSONObject();
-                    json.put("task_code", task_code);
-                    json.put("ext_task_id", ext_task_id);
-                    json.put("message", "已存在相同的起点终点未执行的输送任务");
-                    errArr.add(json);
-                    continue;
-                }
                 TaskDto taskDto = taskService.findByCodeFromCache(task_code);
                 if (taskDto != null) {
                     JSONObject json = new JSONObject();