From 8cbe2b4e7c708fb6fef901915b8081a19c49213b Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期四, 21 十二月 2023 14:33:35 +0800
Subject: [PATCH] 仓库增加机构显示
---
consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryCoreService.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryCoreService.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryCoreService.java
index 16d53b6..0088cce 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryCoreService.java
@@ -1,6 +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;
@@ -19,7 +20,7 @@
import com.consum.base.core.utils.IdUtil;
import com.consum.base.service.BaseGoodsTemplateService;
import com.consum.base.service.BaseWarehouseService;
-import com.consum.base.service.LWhFormInventoryGoodsServiceImpl;
+import com.consum.base.service.LWhFormInventoryGoodsService;
import com.consum.base.service.LWhFormInventoryService;
import com.consum.base.service.LWhFormOutputService;
import com.consum.base.service.LWhFormProcureGoodsService;
@@ -50,7 +51,7 @@
@Transactional(propagation = Propagation.REQUIRED)
public class LWhFormInventoryCoreService {
- private LWhFormInventoryGoodsServiceImpl lWhFormInventoryGoods;
+ private LWhFormInventoryGoodsService lWhFormInventoryGoods;
private LWhFormOutputCoreService lWhFormOutputCoreService;
private CodeGeneratorService codeGeneratorService;
private LWhFormProcureService lWhFormProcureServiceImpl;
@@ -64,7 +65,7 @@
private LWhFormOutputService lWhFormOutputService;
@Autowired
- public LWhFormInventoryCoreService(LWhFormInventoryGoodsServiceImpl lWhFormInventoryGoods,
+ public LWhFormInventoryCoreService(LWhFormInventoryGoodsService lWhFormInventoryGoods,
LWhFormOutputCoreService lWhFormOutputCoreService,
CodeGeneratorService codeGeneratorService,
LWhFormProcureService lWhFormProcureServiceImpl,
@@ -251,14 +252,15 @@
continue;
}
// 鏌ヨ鍨嬪彿搴撳瓨
- int goodsModelNum = lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, 1, null);
+ List<Long> warehouseIds = new ArrayList<>(Arrays.asList(warehouseId));
+ int goodsModelNum = lWhGoodsService.queryGoodsModelNum(0, warehouseIds, baseGoodsModelsId, 1, null);
LWhProcureModel model = new LWhProcureModel();
model.setId(IdUtil.generateId());
model.setFromProcureGoodsId(fromProcureGoodsId);
model.setBusinessType(WhBusinessEnum.CAIGOU.getValue() + 0);
model.setBusinessId(whFormProcureId);
model.setBaseGoodsModelsId(baseGoodsModelsId);
- model.setPrice(0l);
+ model.setPrice(0L);
model.setCounts(counts);
model.setWorehouseCount(goodsModelNum);
model.setSupplier(null);
@@ -324,11 +326,12 @@
continue;
}
//鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
- int goodsNum = lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, 1, null);
+ List<Long> warehouseIds = new ArrayList<>(Arrays.asList(warehouseId));
+ int goodsNum = lWhGoodsService.queryGoodsModelNum(0, warehouseIds, baseGoodsModelsId, 1, null);
//鏂板L_WH_PROCURE_MODEL璁板綍
LWhProcureModel lWhProcureModel = new LWhProcureModel();
lWhProcureModel.setId(IdUtil.generateId());
- lWhProcureModel.setBusinessType(WhBusinessEnum.CHUKU.getValue() + 0);
+ lWhProcureModel.setBusinessType(WhBusinessEnum.CHUKU.getValue());
lWhProcureModel.setBusinessId(lWhFormOutputId);
lWhProcureModel.setBaseGoodsModelsId(baseGoodsModelsId);
lWhProcureModel.setCounts(counts);
--
Gitblit v1.9.1