From fda942a13398486e58f60b8897dd168e771ac8dc Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期四, 21 十二月 2023 13:23:14 +0800
Subject: [PATCH] 机构新增和编辑
---
consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java
index 4cf8ab6..8467aa2 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java
@@ -342,26 +342,36 @@
return null;
}
Long warehouseId = inventory.getWarehouseId();
- Integer warehouseType = inventory.getWarehouseType();
formInventoryVO.setBusinessFormCode(inventory.getBusinessFormCode());
formInventoryVO.setBusinessFormName(inventory.getBusinessFormName());
formInventoryVO.setWarehouseId(warehouseId);
formInventoryVO.setWarehouseName(inventory.getWarehouseName());
+ // 缁熻浠撳簱鍐呯殑鐗╁搧
String sql =
- "select bgt.id baseGoodsTemplateId,bgt.GOODS_NAME goodsTemplateName,bgm.MODEL_NAME baseGoodsModelsName,bgt.CLASSIFICATION type,bgm.UNIT "
- + "from base_goods_models bgm left join base_goods_template bgt on bgm.GOODS_TEMPLATES_ID = bgt.id "
- + "where bgt.AGENCY_ID = :agencyId";
+ "SELECT distinct bgt.id baseGoodsTemplateId,bgm.id baseGoodsModelId,bgt.GOODS_NAME goodsTemplateName,bgm.MODEL_NAME baseGoodsModelsName,"
+ + "bgt.CLASSIFICATION TYPE,bgm.UNIT FROM l_wh_goods g "
+ + "LEFT JOIN base_goods_template bgt ON g.BASE_GOODS_TEMPLATE_ID = bgt.ID "
+ + "LEFT JOIN base_goods_models bgm ON bgm.GOODS_TEMPLATES_ID = bgt.id WHERE "
+ + "WAREHOUSE_ID = :warehouseId GROUP BY g.BASE_GOODS_MODELS_ID ";
HashMap<String, Object> param = new HashMap<>();
- param.put("agencyId", inventory.getAgencyId());
+ param.put("warehouseId", warehouseId);
+
+ // String sql =
+ // "select bgt.id baseGoodsTemplateId,bgm.id baseGoodsModelId,bgt.GOODS_NAME goodsTemplateName,bgm.MODEL_NAME
+ // baseGoodsModelsName,bgt.CLASSIFICATION type,bgm.UNIT "
+ // + "from base_goods_models bgm left join base_goods_template bgt on bgm.GOODS_TEMPLATES_ID = bgt.id "
+ // + "where bgt.AGENCY_ID = :agencyId";
+ // HashMap<String, Object> param = new HashMap<>();
+ // param.put("agencyId", inventory.getAgencyId());
List<Map<String, Object>> result = this.select(sql, param, new MapperUtil());
List<FormInventoryGoodsVO> goodsVOList = Lists.newArrayList();
result.forEach(item -> {
FormInventoryGoodsVO baseGoodsModels = MapUtils.convertMapToObj(item, FormInventoryGoodsVO.class);
List<Long> warehouseIds = new ArrayList<>(Arrays.asList(warehouseId));
- int inventoryCount =
- this.lWhGoodsService.queryGoodsModelNum(warehouseType, warehouseIds, baseGoodsModels.getId(), 1, null);
+ int inventoryCount = this.lWhGoodsService.queryGoodsModelNum(null, warehouseIds,
+ baseGoodsModels.getBaseGoodsModelId(), 1, null);
baseGoodsModels.setInventoryCount(inventoryCount);
goodsVOList.add(baseGoodsModels);
});
--
Gitblit v1.9.1