From 2c1f61d1493214ea3878f6fe19dd738bcd136f0f Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Tue, 4 Jun 2024 13:28:14 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E5=85=A5=E5=BA=93=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E5=AE=8C=E6=88=90=E6=97=B6=E6=9B=B4=E6=96=B0=E5=8D=95?=
 =?UTF-8?q?=E6=9D=A1=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/st/core/service/impl/InbillServiceImpl.java   | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/InbillServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/InbillServiceImpl.java
index f5fca613..c2472927 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/InbillServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/InbillServiceImpl.java
@@ -9,6 +9,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.nl.exception.BadRequestException;
 import org.nl.utils.SecurityUtils;
 import org.nl.wms.pcs.Enum.ProcStatusEnum;
@@ -221,6 +222,7 @@ public class InbillServiceImpl {
             if (dtl_rows.size() == 0) {
                 JSONObject data = new JSONObject();
                 data.put("iostorinv_id", dtl_row.getString("iostorinv_id"));
+                data.put("iostorinvdis_id", dis_row.getString("iostorinvdis_id"));
                 this.confirmMst(data);
             }
         }
@@ -237,6 +239,7 @@ public class InbillServiceImpl {
         WQLObject ivtTab = WQLObject.getWQLObject("ST_IVT_StructIvt"); //库存表
         WQLObject redTab = WQLObject.getWQLObject("MD_PB_BucketRecord"); //桶记录表
         String iostorinv_id = from.getString("iostorinv_id");
+        String iostorinvdis_id = from.getString("iostorinvdis_id");
 
         Long currentUserId = SecurityUtils.getCurrentUserId();
         String nickName = SecurityUtils.getNickName();
@@ -252,9 +255,13 @@ public class InbillServiceImpl {
         if (dtl_rows.size() > 0) {
             throw new BadRequestException("主表下存在未完成的明细！");
         }
-
+        JSONArray dis_rows;
         //更新目的点位，仓位、加库存
-        JSONArray dis_rows = dis_table.query("iostorinv_id = '" + iostorinv_id + "'").getResultJSONArray(0);
+        if (StringUtils.isNotEmpty(iostorinvdis_id)){
+             dis_rows = dis_table.query("iostorinvdis_id = '" + iostorinvdis_id + "'").getResultJSONArray(0);
+        }else {
+             dis_rows = dis_table.query("iostorinv_id = '" + iostorinv_id + "'").getResultJSONArray(0);
+        }
         for (int i = 0; i < dis_rows.size(); i++) {
             JSONObject dis_row = dis_rows.getJSONObject(i);
             JSONObject point_form = new JSONObject();