From 52e9cadce90449394ea9c20d6edbbac4c4d7ab6c Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Tue, 11 Mar 2025 19:46:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=9C=A8=E7=AE=B1=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E6=97=B6=E5=AD=98=E5=9C=A8=E7=A7=BB=E5=BA=93=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=B0=86=E5=87=BA=E5=BA=93=E9=94=81=E9=87=8A=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/nl/b_lms/sch/tasks/TwoMoveBoxTask.java   | 11 +++++++++--
 .../wms/ext/szls/rest/LmsToBigScreenController.java   |  2 +-
 .../java/org/nl/wms/sch/manage/AbstractAcsTask.java   |  6 ++++++
 .../src/main/resources/config/application.yml         |  3 ++-
 .../src/main/resources/logback-spring.xml             |  3 +--
 5 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoMoveBoxTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoMoveBoxTask.java
index 8b3495a41..f9186eb9b 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoMoveBoxTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoMoveBoxTask.java
@@ -98,10 +98,17 @@ public class TwoMoveBoxTask extends AbstractAcsTask {
             JSONObject jsonAttrStar = attrTab.query("struct_code = '" + taskObj.getString("point_code1") + "'").uniqueResult(0);
             jsonAttrStar.put("lock_type",IOSEnum.LOCK_TYPE.code("未锁定"));
             jsonAttrStar.put("storagevehicle_code","");
-            attrTab.update(jsonAttrStar);
 
-            // 更新终点
+
             JSONObject jsonAttrEnd = attrTab.query("struct_code = '" + taskObj.getString("point_code2") + "'").uniqueResult(0);
+            //如果是木箱出库锁的话：移库锁保持
+            attrTab.update(jsonAttrStar);
+            if (IOSEnum.LOCK_TYPE.code("木箱出库锁").equals(jsonAttrStar.getString("lock_type"))){
+                jsonAttrEnd.put("lock_type",IOSEnum.LOCK_TYPE.code("木箱出库锁"));
+            }else {
+                jsonAttrEnd.put("lock_type",IOSEnum.LOCK_TYPE.code("未锁定"));
+            }
+            // 更新终点
             jsonAttrEnd.put("lock_type",IOSEnum.LOCK_TYPE.code("未锁定"));
             jsonAttrEnd.put("storagevehicle_code",taskObj.getString("vehicle_code"));
             attrTab.update(jsonAttrEnd);
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/rest/LmsToBigScreenController.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/rest/LmsToBigScreenController.java
index 0fffe1a46..1d8e557d7 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/rest/LmsToBigScreenController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/rest/LmsToBigScreenController.java
@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequiredArgsConstructor
 
-@RequestMapping("/api/szls/getStructInfo")
+@RequestMapping("/api/szls")
 @Slf4j
 public class LmsToBigScreenController {
     private final LmsToBigScreenService LmsToBigScreenService;
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java
index 4ca915c56..b12012588 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java
@@ -111,6 +111,12 @@ public abstract class AbstractAcsTask {
      *
      */
     public JSONObject immediateNotifyAcs(String task_id) {
+        try {
+            Thread.sleep(1000);
+        }catch (Exception ex){
+
+        }
+
                     List<AcsTaskDto> taskList = this.schedule();
                     if (ObjectUtil.isNotEmpty(taskList)) {
                         JSONArray arr = JSONArray.parseArray(JSON.toJSONString(taskList));
diff --git a/lms/nladmin-system/src/main/resources/config/application.yml b/lms/nladmin-system/src/main/resources/config/application.yml
index 68bbaf335..a435e1108 100644
--- a/lms/nladmin-system/src/main/resources/config/application.yml
+++ b/lms/nladmin-system/src/main/resources/config/application.yml
@@ -6,7 +6,7 @@ spring:
   freemarker:
     check-template-location: false
   profiles:
-    active: prod
+    active: dev
   jackson:
     time-zone: GMT+8
   data:
@@ -126,6 +126,7 @@ security:
     - /api/param/getValueByCode
     - /plumelog/**
     - /api/esLog/**
+    - /api/s/**
     - /api/codeDetail/getNewCode
     - /api/in/rawAssist/updateStructSect
 # Sa-Token配置
diff --git a/lms/nladmin-system/src/main/resources/logback-spring.xml b/lms/nladmin-system/src/main/resources/logback-spring.xml
index b40123c95..d840c16f1 100644
--- a/lms/nladmin-system/src/main/resources/logback-spring.xml
+++ b/lms/nladmin-system/src/main/resources/logback-spring.xml
@@ -132,9 +132,8 @@ https://juejin.cn/post/6844903775631572999
     <!--生产环境:打印控制台和输出到文件-->
     <springProfile name="prod">
         <root level="info">
-            <appender-ref ref="asyncLuceneAppender"/>
             <appender-ref ref="asyncFileAppender"/>
-            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="asyncLuceneAppender"/>
         </root>
         <logger name="jdbc" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>