From db943c2bb6994c0fe5258af5f82dfb5b61104a0c Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期二, 19 十二月 2023 09:45:15 +0800
Subject: [PATCH] 1.每个机构只能创建一个仓库 2.去除默认机构默认仓库
---
consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java | 9 ++++++---
1 files changed, 6 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 d04ee57..3cf6f64 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
@@ -1,5 +1,7 @@
package com.consum.base.service.impl;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -348,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<>();
@@ -357,8 +359,9 @@
List<FormInventoryGoodsVO> goodsVOList = Lists.newArrayList();
result.forEach(item -> {
FormInventoryGoodsVO baseGoodsModels = MapUtils.convertMapToObj(item, FormInventoryGoodsVO.class);
- int inventoryCount =
- this.lWhGoodsService.queryGoodsModelNum(warehouseType, warehouseId, baseGoodsModels.getId(), 1, null);
+ List<Long> warehouseIds = new ArrayList<>(Arrays.asList(warehouseId));
+ int inventoryCount = this.lWhGoodsService.queryGoodsModelNum(null, warehouseIds,
+ baseGoodsModels.getBaseGoodsModelId(), 1, null);
baseGoodsModels.setInventoryCount(inventoryCount);
goodsVOList.add(baseGoodsModels);
});
--
Gitblit v1.9.1