From 7e5b6e8497a4575395aaa44a175dacdefaa5c166 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期二, 19 十二月 2023 09:19:02 +0800
Subject: [PATCH] 过滤仓库管理员角色显示

---
 consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 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..1753600 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
@@ -350,7 +350,7 @@
         formInventoryVO.setWarehouseName(inventory.getWarehouseName());
 
         String sql =
-            "select bgt.id baseGoodsTemplateId,bgt.GOODS_NAME goodsTemplateName,bgm.MODEL_NAME baseGoodsModelsName,bgt.CLASSIFICATION type,bgm.UNIT "
+            "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<>();
@@ -360,8 +360,8 @@
         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(warehouseType, warehouseIds,
+                baseGoodsModels.getBaseGoodsModelId(), 1, null);
             baseGoodsModels.setInventoryCount(inventoryCount);
             goodsVOList.add(baseGoodsModels);
         });

--
Gitblit v1.9.1