From 4325565ac6a3028f1071602e067b41e5932faa79 Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期二, 02 一月 2024 16:05:52 +0800
Subject: [PATCH] 1、增加登录系统日志 2、修改上传文件，名称判断错误问题 3、修改单据新增时，仓库判断问题
---
consum-base/src/main/java/com/consum/base/service/impl/LWhGoodsServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 7155ab3..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,16 +354,20 @@
}
@Override
- public List<GoodsInfoDTO> queryGoodsInfo(Set<Long> baseModelIds, Set<Long> wareHouseIds) {
+ 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_ID in (:wareHouseIds)");
+ + "and WAREHOUSE_TYPE =0 and states =1 and WAREHOUSE_ID in (:wareHouseIds) ");
Map<String, Object> param = new HashMap<>();
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 -> {
--
Gitblit v1.9.1