From 33032d320cb75854def7391026b0401f1bfb8360 Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期六, 11 五月 2024 17:26:02 +0800
Subject: [PATCH] 20240511修改: 分发单优化， 分类，物品，分发单明细，采购单明细数据导入
---
consum-base/src/main/java/com/consum/base/service/impl/LWhGoodsServiceImpl.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhGoodsServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhGoodsServiceImpl.java
index ca7e7f4..6c21f27 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhGoodsServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhGoodsServiceImpl.java
@@ -354,14 +354,21 @@
}
@Override
- public List<GoodsInfoDTO> queryGoodsInfo(Set<Long> baseModelIds) {
+ public List<GoodsInfoDTO> queryGoodsInfo(Set<Long> baseModelIds, Set<Long> wareHouseIds,Integer buyType) {
List<GoodsInfoDTO> goodsInfoDTOS = Lists.newArrayList();
StringBuilder sql = new StringBuilder(
"SELECT distinct WAREHOUSE_ID,WAREHOUSE_NAME from L_WH_GOODS where base_goods_models_id in (:baseGoodsModelsIds) "
- + "and WAREHOUSE_TYPE =0 and BUY_TYPE =1 and states =1");
+ + "and WAREHOUSE_TYPE =0 and states =1 and WAREHOUSE_ID in (:wareHouseIds) ");
Map<String, Object> param = new HashMap<>();
- param.put("baseGoodsModelsIds", baseModelIds);
+ if (!CollectionUtils.isEmpty(baseModelIds)) {
+ param.put("baseGoodsModelsIds", baseModelIds);
+ }
+ if (buyType != null) {
+ sql.append("and BUY_TYPE =:buyType ");
+ param.put("buyType", buyType);
+ }
+ param.put("wareHouseIds", wareHouseIds);
List<Map<String, Object>> result = this.select(sql.toString(), param, new MapperUtil());
result.forEach(item -> {
GoodsInfoDTO goodsInfoDTO = MapUtils.convertMapToObj(item, GoodsInfoDTO.class);
--
Gitblit v1.9.1