From 58a518f8bc23ed382f4da2a86b09024b063a620c Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期一, 13 五月 2024 15:40:47 +0800
Subject: [PATCH] 20240511修改: 分发单优化， 分类，物品，分发单明细，采购单明细数据导入
---
consum-base/src/main/java/com/consum/base/service/impl/LWhGoodsServiceImpl.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 57 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 cab1558..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
@@ -5,6 +5,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.stream.Collectors;
import org.apache.commons.compress.utils.Lists;
@@ -13,6 +14,7 @@
import com.consum.base.core.utils.MapUtils;
import com.consum.base.core.utils.MapperUtil;
+import com.consum.base.pojo.dto.GoodsInfoDTO;
import com.consum.base.pojo.dto.GoodsModelCountDTO;
import com.consum.base.service.LWhGoodsService;
import com.walker.infrastructure.utils.CollectionUtils;
@@ -38,7 +40,7 @@
private static String query_Goods_Model_Num = "SELECT COUNT(1) from L_WH_GOODS where 1=1";
@Override
- public int queryGoodsModelNum(Integer warehouseType, Long warehouseId, Long baseGoodsModelsId, Integer states,
+ public int queryGoodsModelNum(Integer warehouseType, List<Long> warehouseId, Long baseGoodsModelsId, Integer states,
Integer buyType) {
StringBuilder sql = new StringBuilder(query_Goods_Model_Num);
Map<String, Object> paramts = new HashMap<>();
@@ -48,7 +50,36 @@
paramts.put("warehouseType", warehouseType);
}
if (warehouseId != null) {
- sql.append(" and WAREHOUSE_ID=:warehouseId");
+ sql.append(" and WAREHOUSE_ID in (:warehouseId)");
+ paramts.put("warehouseId", warehouseId);
+ }
+ if (baseGoodsModelsId != null) {
+ sql.append(" and BASE_GOODS_MODELS_ID=:baseGoodsModelsId");
+ paramts.put("baseGoodsModelsId", baseGoodsModelsId);
+ }
+ if (states != null) {
+ sql.append(" and STATES=:states");
+ paramts.put("states", states);
+ }
+ if (buyType != null) {
+ sql.append(" and BUY_TYPE=:buyType");
+ paramts.put("buyType", buyType);
+ }
+ return queryForInt(sql.toString(), paramts);
+ }
+
+ @Override
+ public int queryGoodsModelInWareHouseNum(Integer warehouseType, List<Long> warehouseId, Long baseGoodsModelsId,
+ Integer states, Integer buyType) {
+ StringBuilder sql = new StringBuilder(query_Goods_Model_Num);
+ Map<String, Object> paramts = new HashMap<>();
+
+ if (warehouseType != null) {
+ sql.append(" and WAREHOUSE_TYPE=:warehouseType");
+ paramts.put("warehouseType", warehouseType);
+ }
+ if (warehouseId != null) {
+ sql.append(" and WAREHOUSE_ID in (:warehouseId)");
paramts.put("warehouseId", warehouseId);
}
if (baseGoodsModelsId != null) {
@@ -321,4 +352,28 @@
return null;
}
+
+ @Override
+ 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 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 -> {
+ GoodsInfoDTO goodsInfoDTO = MapUtils.convertMapToObj(item, GoodsInfoDTO.class);
+ goodsInfoDTOS.add(goodsInfoDTO);
+ });
+ return goodsInfoDTOS;
+ }
}
--
Gitblit v1.9.1