From f6a90bd5eeca2688e6a48f194f723ab91e8e7fec Mon Sep 17 00:00:00 2001
From: "USER-20220102CG\\noblelift" <546428999@qq.com>
Date: Tue, 9 Aug 2022 16:41:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=9F=B3=E9=A3=9E=E7=82=B9?=
 =?UTF-8?q?=E4=BD=8D=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/NjyfHandServiceImpl.java     | 38 ++++++++++---------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/hd/nladmin-system/src/main/java/org/nl/hand/anjyf/service/impl/NjyfHandServiceImpl.java b/hd/nladmin-system/src/main/java/org/nl/hand/anjyf/service/impl/NjyfHandServiceImpl.java
index 1ba3e45..79d424b 100644
--- a/hd/nladmin-system/src/main/java/org/nl/hand/anjyf/service/impl/NjyfHandServiceImpl.java
+++ b/hd/nladmin-system/src/main/java/org/nl/hand/anjyf/service/impl/NjyfHandServiceImpl.java
@@ -109,6 +109,8 @@ public class NjyfHandServiceImpl implements NjyfHandService {
             StandardStorageDeviceDriver standardStorageDeviceDriver;
 
             jo.put("device_code",device_code);
+            jo.put("device_name",device_code);
+            jo.put("status","1");
             jo.put("allow_update", "1");
             jo.put("input_material", "1");
             resultArr.add(jo);
@@ -247,24 +249,24 @@ public class NjyfHandServiceImpl implements NjyfHandService {
 //            return resultJson;
 //        }
         //判断起点有货，终点为空
-        if (ObjectUtil.isEmpty(startDevice.getMaterial_type()) || Integer.parseInt(startDevice.getMaterial_type()) == 0) {
-            resultJson.put("code", "0");
-            resultJson.put("desc", "起点必须有货");
-            resultJson.put("result", "");
-            return resultJson;
-        }
-        if (!ObjectUtil.isEmpty(nextDevice.getMaterial_type()) && !StrUtil.equals(nextDevice.getMaterial_type(), "0")) {
-            resultJson.put("code", "0");
-            resultJson.put("desc", "终点必须为空");
-            resultJson.put("result", "");
-            return resultJson;
-        }
-        if(Boolean.parseBoolean(startDevice.getIslock()) || Boolean.parseBoolean(nextDevice.getIslock())){
-            resultJson.put("code", "0");
-            resultJson.put("desc", "起点或终点设备已被锁定");
-            resultJson.put("result", "");
-            return resultJson;
-        }
+//        if (ObjectUtil.isEmpty(startDevice.getMaterial_type()) || Integer.parseInt(startDevice.getMaterial_type()) == 0) {
+//            resultJson.put("code", "0");
+//            resultJson.put("desc", "起点必须有货");
+//            resultJson.put("result", "");
+//            return resultJson;
+//        }
+//        if (!ObjectUtil.isEmpty(nextDevice.getMaterial_type()) && !StrUtil.equals(nextDevice.getMaterial_type(), "0")) {
+//            resultJson.put("code", "0");
+//            resultJson.put("desc", "终点必须为空");
+//            resultJson.put("result", "");
+//            return resultJson;
+//        }
+//        if(Boolean.parseBoolean(startDevice.getIslock()) || Boolean.parseBoolean(nextDevice.getIslock())){
+//            resultJson.put("code", "0");
+//            resultJson.put("desc", "起点或终点设备已被锁定");
+//            resultJson.put("result", "");
+//            return resultJson;
+//        }
         if (StrUtil.isEmpty(priority)) {
             priority = "1";
         }