From 4301ec528bdfe63074e95ceaf7667949f08ff9d2 Mon Sep 17 00:00:00 2001
From: "ZHOUZ\\Noble'lift" <1014987728@qq.com>
Date: Fri, 16 Sep 2022 16:52:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hd/nladmin-system/pom.xml                                  | 7 +++++++
 .../instruction/service/impl/InstructionServiceImpl.java   | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/hd/nladmin-system/pom.xml b/hd/nladmin-system/pom.xml
index 828bb20..fe24ac0 100644
--- a/hd/nladmin-system/pom.xml
+++ b/hd/nladmin-system/pom.xml
@@ -95,6 +95,13 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>net.sf.json-lib</groupId>
+            <artifactId>json-lib</artifactId>
+            <version>2.4</version>
+            <classifier>jdk15</classifier>
+        </dependency>
+
 
         <!--   https://www.jianshu.com/p/e40d111c7bfc?utm_source=oschina-app     热部署 https://zhuanlan.zhihu.com/p/63381268-->
 
diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
index 7eefe4f..adf3012 100644
--- a/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
+++ b/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
@@ -418,7 +418,7 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
         }
 
 
-        try {
+        /*try {
             // != 0 为agv任务
             if (!StrUtil.equals(type, "0")) {
                 if (StrUtil.equals(acsConfigService.findConfigFromCache().get(AcsConfig.AGVTYPE).toString(), "1")) {
@@ -455,7 +455,7 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
         } catch (Exception e) {
             dto.setSend_status("2");
             e.printStackTrace();
-        }
+        }*/
 
         WQLObject wo = WQLObject.getWQLObject("acs_instruction");
         JSONObject json = JSONObject.fromObject(dto);