From 209d9c6f60d96fc29fad0bd2f9dad8fe8424f91f Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期五, 17 十一月 2023 18:10:47 +0800
Subject: [PATCH] 调拨管理
---
consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java | 64 +++++++++++++++++---------------
1 files changed, 34 insertions(+), 30 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java
index 4c670d9..62796d9 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java
@@ -4,9 +4,21 @@
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.core.WhBusinessEnum;
import com.consum.base.core.utils.IdUtil;
-import com.consum.model.po.*;
+import com.consum.model.po.BaseWarehouse;
+import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.po.LWhFormInventory;
+import com.consum.model.po.LWhFormInventoryGoods;
+import com.consum.model.po.LWhFormOutput;
+import com.consum.model.po.LWhFormProcure;
+import com.consum.model.po.LWhFormProcureGoods;
+import com.consum.model.po.LWhProcureModel;
import com.iplatform.model.po.S_user_core;
import com.walker.infrastructure.utils.NumberGenerator;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -14,15 +26,8 @@
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.util.CollectionUtils;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
/**
* @ClassName LWhFormInventoryCoreService
-
* @Date 2023/11/1
* @Description
* @Version 1.0
@@ -30,6 +35,7 @@
@Slf4j
@Service
public class LWhFormInventoryCoreService {
+
private LWhFormInventoryGoodsServiceImpl lWhFormInventoryGoods;
private LWhFormOutputCoreService lWhFormOutputCoreService;
private CodeGeneratorService codeGeneratorService;
@@ -45,17 +51,17 @@
@Autowired
public LWhFormInventoryCoreService(LWhFormInventoryGoodsServiceImpl lWhFormInventoryGoods,
- LWhFormOutputCoreService lWhFormOutputCoreService,
- CodeGeneratorService codeGeneratorService,
- LWhFormProcureService lWhFormProcureService,
- BaseWarehouseServiceImpl baseWarehouseService,
- LWhFormProcureGoodsService lWhFormProcureGoodsService,
- LWhProcureModelService lWhProcureModelService,
- BaseGoodsTemplateServiceImpl baseGoodsTemplateService,
- LWhGoodsService lWhGoodsService,
- LWhFormInventoryServiceImpl lWhFormInventoryService,
- LWhFormProcureCoreService lWhFormProcureCoreService,
- LWhFormOutputServiceImpl lWhFormOutputService
+ LWhFormOutputCoreService lWhFormOutputCoreService,
+ CodeGeneratorService codeGeneratorService,
+ LWhFormProcureService lWhFormProcureService,
+ BaseWarehouseServiceImpl baseWarehouseService,
+ LWhFormProcureGoodsService lWhFormProcureGoodsService,
+ LWhProcureModelService lWhProcureModelService,
+ BaseGoodsTemplateServiceImpl baseGoodsTemplateService,
+ LWhGoodsService lWhGoodsService,
+ LWhFormInventoryServiceImpl lWhFormInventoryService,
+ LWhFormProcureCoreService lWhFormProcureCoreService,
+ LWhFormOutputServiceImpl lWhFormOutputService
) {
this.lWhFormInventoryGoods = lWhFormInventoryGoods;
@@ -73,12 +79,10 @@
}
/**
- * 鏍规嵁 鐩樼偣鍗� 鐢熸垚 鍑哄簱鍗� 鍜� 鍏ュ簱鍗�
- * 鐩樼偣鍗曚腑 鐩樼泩鐗╁搧鐢熸垚鍏ュ簱鍗曪紝鐩樹簭鐢熸垚鍑哄簱鍗�
+ * 鏍规嵁 鐩樼偣鍗� 鐢熸垚 鍑哄簱鍗� 鍜� 鍏ュ簱鍗� 鐩樼偣鍗曚腑 鐩樼泩鐗╁搧鐢熸垚鍏ュ簱鍗曪紝鐩樹簭鐢熸垚鍑哄簱鍗�
*
* @param whformInventoryId 鐩樼偣鍗昳d
- * @return status true/false
- * errMsg 閿欒娑堟伅
+ * @return status true/false errMsg 閿欒娑堟伅
*/
@Transactional(rollbackFor = Exception.class)
public String createInOutFormByInventoryId(Long whformInventoryId, S_user_core currentUser, FinSysTenantUser sysInfo) {
@@ -100,8 +104,8 @@
return "娌℃湁鎵惧埌鐩樼偣鍗曠粨鏋滅墿鍝�";
}
Map<Integer, List<LWhFormInventoryGoods>> inventoryGoodsMap = lWhFormInventoryGoods.stream()
- .filter(goods -> goods.getInventoryResult() == 2 || goods.getInventoryResult() == 3)
- .collect(Collectors.groupingBy(LWhFormInventoryGoods::getInventoryResult));
+ .filter(goods -> goods.getInventoryResult() == 2 || goods.getInventoryResult() == 3)
+ .collect(Collectors.groupingBy(LWhFormInventoryGoods::getInventoryResult));
if (CollectionUtils.isEmpty(lWhFormInventoryGoods)) {
// rtnMap.put("status", true);
return null;
@@ -152,7 +156,7 @@
inOutMap.putAll(ckMap);
Long lWhFormOutputId = (Long) inOutMap.get("outId");
//2.鏍规嵁鍑哄簱鍗曞嚭搴�
- Long lWarehouseFlowId = lWhFormOutputCoreService.outFormByTransId(lWhFormOutputId,WhBusinessEnum.CAIGOU, currentUser, stopTime);
+ Long lWarehouseFlowId = lWhFormOutputCoreService.outFormByTransId(lWhFormOutputId, WhBusinessEnum.CAIGOU, currentUser, stopTime);
if (lWarehouseFlowId == null) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
// throw new RuntimeException("鍒涘缓鍑哄簱鍗曞け璐�");
@@ -183,7 +187,7 @@
* @param currentUser
*/
private Map<String, Object> createInFormByInventoryId(Long warehouseId, Long procureTime, List<LWhFormInventoryGoods> inventoryGoodsList,
- S_user_core currentUser) {
+ S_user_core currentUser) {
if (CollectionUtils.isEmpty(inventoryGoodsList)) {
return null;
}
@@ -233,7 +237,7 @@
continue;
}
// 鏌ヨ鍨嬪彿搴撳瓨
- int goodsModelNum = lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, (short) 1, null);
+ int goodsModelNum = lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, 1, null);
LWhProcureModel model = new LWhProcureModel();
model.setId(NumberGenerator.getLongSequenceNumber());
model.setFromProcureGoodsId(fromProcureGoodsId);
@@ -264,7 +268,7 @@
* @param currentUser
*/
private Map<String, Object> createOutFormByInventoryId(Long warehouseId, Long procureTime, List<LWhFormInventoryGoods> inventoryGoodsList,
- S_user_core currentUser, FinSysTenantUser sysInfo) {
+ S_user_core currentUser, FinSysTenantUser sysInfo) {
if (CollectionUtils.isEmpty(inventoryGoodsList)) {
return null;
}
@@ -304,7 +308,7 @@
continue;
}
//鏍规嵁鐗╁搧鍨嬪彿鏌ヨ鐗╁搧搴撳瓨
- int goodsNum = lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, (short) 1, null);
+ int goodsNum = lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, 1, null);
//鏂板L_WH_PROCURE_MODEL璁板綍
LWhProcureModel lWhProcureModel = new LWhProcureModel();
lWhProcureModel.setId(IdUtil.generateId());
--
Gitblit v1.9.1