From ced8a5bc91e8bd8b54107821d13040d075d2f724 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Fri, 1 Dec 2023 14:53:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E8=8D=90=E6=96=B9=E6=B3=95=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20=E8=BF=94=E5=9B=9E=E5=BA=93=E5=AD=98=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/win/module/wms/util/JobUtils.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/util/JobUtils.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/util/JobUtils.java
index 637a7756..2d15f4a6 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/util/JobUtils.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/util/JobUtils.java
@@ -760,7 +760,7 @@ public class JobUtils {
         JSONObject jsonObjectOffShelf = JSONUtil.parseObj(ruleRespVOOffShelf.getConfiguration());
         // 查询库存余额
         QueryWrapper queryWrapper = new QueryWrapper();
-        queryWrapper.select("item_code", "batch", "SUM(qty) as qty", "warehouse_code", "area_code", "location_group_code", "location_code", "produce_date", "arrive_date");
+        queryWrapper.select("item_code", "batch", "SUM(qty) as qty", "inventory_status","warehouse_code", "area_code", "location_group_code", "location_code", "produce_date", "arrive_date");
         if (itemCode != null && !itemCode.equals("")) {
             queryWrapper.eq("item_code", itemCode);
         } else {
@@ -806,7 +806,7 @@ public class JobUtils {
         }
         // 发料包装类型——按 单件
         if (jsonObjectOffShelf.get("IssueStorageType") != null && jsonObjectOffShelf.get("IssueStorageType").equals("3")) {
-            queryWrapper.groupBy("item_code", "batch", "qty", "warehouse_code", "area_code", "location_group_code", "location_code", "expire_date", "produce_date", "arrive_date");
+            queryWrapper.groupBy("item_code", "batch", "qty","inventory_status", "warehouse_code", "area_code", "location_group_code", "location_code", "expire_date", "produce_date", "arrive_date");
         }
         // 根据批次策略 作为查询库存余额排序
         // 批次类型——按 生产时间