From 2654b00d0b0d29ed92ce455d3a2fae6380e6186e Mon Sep 17 00:00:00 2001
From: "USER-20220102CG\\noblelift" <546428999@qq.com>
Date: Mon, 15 May 2023 17:01:45 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=88=9B=E5=BB=BA=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../alx/service/impl/LXHandServicelmpl.java   | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/hd/nladmin-system/src/main/java/org/nl/hand/alx/service/impl/LXHandServicelmpl.java b/hd/nladmin-system/src/main/java/org/nl/hand/alx/service/impl/LXHandServicelmpl.java
index 351744b..e46538e 100644
--- a/hd/nladmin-system/src/main/java/org/nl/hand/alx/service/impl/LXHandServicelmpl.java
+++ b/hd/nladmin-system/src/main/java/org/nl/hand/alx/service/impl/LXHandServicelmpl.java
@@ -207,24 +207,24 @@ public class LXHandServicelmpl implements LXHandService{
         }
 
         //判断起点有货，终点为空
-        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";
         }