From 98d88ac8caf7f0991d741079474c262f1e252927 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期五, 06 三月 2026 08:14:54 +0800
Subject: [PATCH] 拣货过程中的出库库存匹配
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java | 20 +++++---------------
1 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java
index ac3d112..d4b8a60 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java
@@ -100,13 +100,8 @@
if (StringUtils.isNotBlank(splrBatch)) {
locItemQueryWrapper.and(w -> w.eq(LocItem::getBatch, splrBatch).or().isNull(LocItem::getBatch));
}
- String applySql = String.format(
- "EXISTS (SELECT 1 FROM man_loc ml " +
- "WHERE ml.use_status = '%s'" +
- "AND ml.id = man_loc_item.loc_id " +
- ")",
- LocStsType.LOC_STS_TYPE_F.type
- );
+ // 鍚� F.鍦ㄥ簱 涓� R.鍑哄簱棰勭害锛堟嫞鏂欏嚭搴撴湭纭鍓嶅彲鍐嶄笅鍙戯紝浣跨敤鍓╀綑鍙敤锛�
+ String applySql = "EXISTS (SELECT 1 FROM man_loc ml WHERE ml.use_status IN ('" + LocStsType.LOC_STS_TYPE_F.type + "','" + LocStsType.LOC_STS_TYPE_R.type + "') AND ml.id = man_loc_item.loc_id)";
locItemQueryWrapper.apply(applySql);
LocItemService locItemService = SpringUtils.getBean(LocItemService.class);
List<LocItem> locItems = locItemService.list(locItemQueryWrapper);
@@ -140,14 +135,9 @@
} else {
locItemQueryWrapper.orderByAsc(LocItem::getCreateTime);
}
- String applySql = String.format(
- "EXISTS (SELECT 1 FROM man_loc ml " +
- "WHERE ml.use_status = '%s'" +
- "AND ml.id = man_loc_item.loc_id " +
- ")",
- LocStsType.LOC_STS_TYPE_F.type
- );
- locItemQueryWrapper.apply(applySql);
+ // 鍚� F.鍦ㄥ簱 涓� R.鍑哄簱棰勭害锛堟嫞鏂欏嚭搴撴湭纭鍓嶅彲鍐嶄笅鍙戯紝浣跨敤鍓╀綑鍙敤锛�
+ String applySqlR = "EXISTS (SELECT 1 FROM man_loc ml WHERE ml.use_status IN ('" + LocStsType.LOC_STS_TYPE_F.type + "','" + LocStsType.LOC_STS_TYPE_R.type + "') AND ml.id = man_loc_item.loc_id)";
+ locItemQueryWrapper.apply(applySqlR);
LocItemService locItemService = SpringUtils.getBean(LocItemService.class);
List<LocItem> locItems = locItemService.list(locItemQueryWrapper);
return locItems;
--
Gitblit v1.9.1