From 8010947ce6bffa04fc23f5d23326ff34933a6aa9 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Thu, 22 Aug 2024 14:20:58 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E5=BC=82=E5=B8=B8=E8=B4=A7?=
 =?UTF-8?q?=E4=BD=8D=E5=A4=84=E7=90=86=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java | 9 +++++++++
 .../iostorInv/impl/StIvtIostorinvOutServiceImpl.java     | 1 +
 2 files changed, 10 insertions(+)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java
index 709377549..55ef645b7 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java
@@ -160,6 +160,7 @@ public class TwoOutTask extends AbstractAcsTask {
     public void updateTaskStatus(JSONObject taskObj, String status) {
         WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); // 任务表
         WQLObject disTab = WQLObject.getWQLObject("st_ivt_iostorinvdis"); // 出入库分配表
+        WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr"); // 仓位表
 
         String task_id = taskObj.getString("task_id");
         JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "' and task_status < '07'").uniqueResult(0);
@@ -198,6 +199,14 @@ public class TwoOutTask extends AbstractAcsTask {
                 StIvtIostorinvOutServiceImpl bean = SpringContextHolder.getBean(StIvtIostorinvOutServiceImpl.class);
                 bean.finishTask(jsonTask);
 
+                // 判断是否有异常货位的需要更新
+                JSONObject jsonExt = attrTab.query("inv_code = '" + jsonTask.getString("vehicle_code") + "' AND lock_type = '"+IOSEnum.LOCK_TYPE.code("出库异常锁")+"'").uniqueResult(0);
+                if (ObjectUtil.isNotEmpty(jsonExt)) {
+                    jsonExt.put("lock_type", IOSEnum.LOCK_TYPE.code("未锁定"));
+                    jsonExt.put("inv_code", "");
+                    attrTab.update(jsonExt);
+                }
+
                 // 判断此任务组是否全部完成
                 JSONArray resultJSONArray = taskTab.query("task_group_id = '" + jsonTask.getString("task_group_id") + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "' and handle_class = '"+THIS_CLASS+"'")
                         .getResultJSONArray(0);
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
index 9a99e62a6..6d424acc3 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
@@ -1508,6 +1508,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
 
                     // 更新移入货位为出库异常货位
                     jsonMove.put("lock_type",IOSEnum.LOCK_TYPE.code("出库异常锁"));
+                    jsonMove.put("inv_code", jsonLow.getString("storagevehicle_code"));
                     jsonLow.put("task_code", task_id);
                     attrTab.update(jsonMove);
                 }