From a827200a0f5b21f8cfa95379425b2efb9167c378 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期六, 02 十二月 2023 21:24:33 +0800
Subject: [PATCH] feat: 台账查询增加部门报废、部门退回
---
consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java | 65 +++++++++++++++++++-------------
1 files changed, 39 insertions(+), 26 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 8fbc1ba..718a4fb 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,42 +4,50 @@
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 lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-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;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.util.CollectionUtils;
/**
* @ClassName LWhFormInventoryCoreService
-
* @Date 2023/11/1
* @Description
* @Version 1.0
**/
@Slf4j
@Service
+@Transactional(propagation = Propagation.REQUIRED)
public class LWhFormInventoryCoreService {
+
private LWhFormInventoryGoodsServiceImpl lWhFormInventoryGoods;
private LWhFormOutputCoreService lWhFormOutputCoreService;
private CodeGeneratorService codeGeneratorService;
private LWhFormProcureService lWhFormProcureService;
- private BaseWarehouseServiceImpl baseWarehouseService;
+ private BaseWarehouseService baseWarehouseService;
private LWhFormProcureGoodsService lWhFormProcureGoodsService;
private LWhProcureModelService lWhProcureModelService;
- private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;
+ private BaseGoodsTemplateService baseGoodsTemplateService;
private LWhGoodsService lWhGoodsService;
- private LWhFormInventoryServiceImpl lWhFormInventoryService;
+ private LWhFormInventoryService lWhFormInventoryService;
private LWhFormProcureCoreService lWhFormProcureCoreService;
private LWhFormOutputServiceImpl lWhFormOutputService;
@@ -48,12 +56,12 @@
LWhFormOutputCoreService lWhFormOutputCoreService,
CodeGeneratorService codeGeneratorService,
LWhFormProcureService lWhFormProcureService,
- BaseWarehouseServiceImpl baseWarehouseService,
+ BaseWarehouseService baseWarehouseService,
LWhFormProcureGoodsService lWhFormProcureGoodsService,
LWhProcureModelService lWhProcureModelService,
- BaseGoodsTemplateServiceImpl baseGoodsTemplateService,
+ BaseGoodsTemplateService baseGoodsTemplateService,
LWhGoodsService lWhGoodsService,
- LWhFormInventoryServiceImpl lWhFormInventoryService,
+ LWhFormInventoryService lWhFormInventoryService,
LWhFormProcureCoreService lWhFormProcureCoreService,
LWhFormOutputServiceImpl lWhFormOutputService
@@ -73,12 +81,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) {
@@ -127,8 +133,8 @@
// rtnMap.put("errMsg", "鍒涘缓鍏ュ簱鍗曞け璐�");
return "鍒涘缓鍏ュ簱鍗曞け璐�";
}
- Long inFormByInventoryId = (Long) inOutMap.get("inId");
inOutMap.putAll(rkMap);
+ Long inFormByInventoryId = (Long) inOutMap.get("inId");
String errMsg = lWhFormProcureCoreService.doProcure(inFormByInventoryId, currentUser);
if (errMsg != null) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -152,7 +158,7 @@
inOutMap.putAll(ckMap);
Long lWhFormOutputId = (Long) inOutMap.get("outId");
//2.鏍规嵁鍑哄簱鍗曞嚭搴�
- Long lWarehouseFlowId = lWhFormOutputCoreService.outFormByTransId(lWhFormOutputId, currentUser, stopTime);
+ Long lWarehouseFlowId = lWhFormOutputCoreService.outFormByTransId(lWhFormOutputId, WhBusinessEnum.PANDIAN, currentUser, stopTime,null);
if (lWarehouseFlowId == null) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
// throw new RuntimeException("鍒涘缓鍑哄簱鍗曞け璐�");
@@ -233,9 +239,9 @@
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.setId(IdUtil.generateId());
model.setFromProcureGoodsId(fromProcureGoodsId);
model.setBusinessType(WhBusinessEnum.CAIGOU.getValue() + 0);
model.setBusinessId(whFormProcureId);
@@ -273,6 +279,7 @@
//鍑哄叆搴搃d
long lWhFormOutputId = IdUtil.generateId();
lWhFormOutput.setId(lWhFormOutputId);
+ lWhFormOutput.setOutWarehouseType(0);
lWhFormOutput.setWarehouseId(warehouseId);
//鏍规嵁浠撳簱id鏌ヨ浠撳簱
BaseWarehouse warehouse = this.baseWarehouseService.getById(warehouseId);
@@ -297,6 +304,7 @@
if (flag1 != 1) {
return null;
}
+ ArrayList<LWhProcureModel> lWhProcureModels = new ArrayList<>();
for (LWhFormInventoryGoods inventoryGoods : inventoryGoodsList) {
Long baseGoodsModelsId = inventoryGoods.getBaseGoodsModelsId();
Integer counts = inventoryGoods.getErrorCounts();
@@ -304,15 +312,20 @@
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());
- lWhProcureModel.setBusinessType(3);
+ lWhProcureModel.setBusinessType(WhBusinessEnum.CHUKU.getValue() + 0);
+ lWhProcureModel.setBusinessId(lWhFormOutputId);
lWhProcureModel.setBaseGoodsModelsId(baseGoodsModelsId);
lWhProcureModel.setCounts(counts);
lWhProcureModel.setWorehouseCount(goodsNum);
- lWhProcureModelService.insert(lWhProcureModel);
+// lWhProcureModelService.insert(lWhProcureModel);
+ lWhProcureModels.add(lWhProcureModel);
+ }
+ if (!CollectionUtils.isEmpty(lWhProcureModels)) {
+ lWhProcureModelService.insertBatch(lWhProcureModels);
}
HashMap<String, Object> rtnMap = new HashMap<>();
rtnMap.put("outId", lWhFormOutputId);
--
Gitblit v1.9.1