From b650280c14fc646c195745b9aebf63b56c1414ac Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Sun, 5 Feb 2023 20:29:46 +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

---
 .../acs/hand/amb/service/impl/AMHandServiceImpl.java  | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/hand/amb/service/impl/AMHandServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/hand/amb/service/impl/AMHandServiceImpl.java
index 3e2f1fe..ee8ea77 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/hand/amb/service/impl/AMHandServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/hand/amb/service/impl/AMHandServiceImpl.java
@@ -117,15 +117,16 @@ public class AMHandServiceImpl implements AMHandService {
                 standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device_driver.getDeviceDriver();
                 int move = standardInspectSiteDeviceDriver.getMove();
                 TaskDto taskDto = taskService.findByStartAndNextCode(device_code);
-                if (move != 0 && ObjectUtil.isNotEmpty(taskDto)) {
+                if (ObjectUtil.isNotEmpty(taskDto)) {
                     status = "2";
                     status_name = "有任务";
                     material_type = "1";
-                } else if (move != 0) {
-                    status = "1";
-                    status_name = "有货";
-                    material_type = "1";
                 }
+//                } else if (move != 0) {
+//                    status = "1";
+//                    status_name = "有货";
+//                    material_type = "1";
+//                }
             }
             JSONObject map = new JSONObject();
             map.put("device_id", device_id);