From 3836720e3b0fc9ab884d178e0ac27e942b175da2 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期二, 05 十二月 2023 15:23:01 +0800
Subject: [PATCH] 报废单添加金额字段
---
consum-base/src/main/java/com/consum/base/service/LWhFormInventoryCoreService.java | 110 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 64 insertions(+), 46 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 149c587..f0b40e6 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
@@ -1,69 +1,80 @@
package com.consum.base.service;
-import com.consum.base.core.CodeGeneratorEnum;
-import com.consum.base.core.CodeGeneratorService;
-import com.consum.base.core.WhBusinessEnum;
-import com.consum.base.util.IdUtil;
-import com.consum.model.po.*;
-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 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;
+
+import com.consum.base.core.CodeGeneratorEnum;
+import com.consum.base.core.CodeGeneratorService;
+import com.consum.base.core.WhBusinessEnum;
+import com.consum.base.core.utils.IdUtil;
+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;
+
/**
* @ClassName LWhFormInventoryCoreService
- * @Author cy
* @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 LWhFormProcureGoodsService lWhFormProcureGoodsService;
+ private LWhFormProcureService lWhFormProcureServiceImpl;
+ private BaseWarehouseService baseWarehouseService;
+ private LWhFormProcureGoodsService lWhFormProcureGoodsServiceImpl;
private LWhProcureModelService lWhProcureModelService;
- private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;
+ private BaseGoodsTemplateService baseGoodsTemplateService;
private LWhGoodsService lWhGoodsService;
- private LWhFormInventoryServiceImpl lWhFormInventoryService;
+ private LWhFormInventoryService lWhFormInventoryService;
private LWhFormProcureCoreService lWhFormProcureCoreService;
- private LWhFormOutputServiceImpl lWhFormOutputService;
+ private LWhFormOutputService lWhFormOutputService;
@Autowired
public LWhFormInventoryCoreService(LWhFormInventoryGoodsServiceImpl lWhFormInventoryGoods,
LWhFormOutputCoreService lWhFormOutputCoreService,
CodeGeneratorService codeGeneratorService,
- LWhFormProcureService lWhFormProcureService,
- BaseWarehouseServiceImpl baseWarehouseService,
- LWhFormProcureGoodsService lWhFormProcureGoodsService,
+ LWhFormProcureService lWhFormProcureServiceImpl,
+ BaseWarehouseService baseWarehouseService,
+ LWhFormProcureGoodsService lWhFormProcureGoodsServiceImpl,
LWhProcureModelService lWhProcureModelService,
- BaseGoodsTemplateServiceImpl baseGoodsTemplateService,
+ BaseGoodsTemplateService baseGoodsTemplateService,
LWhGoodsService lWhGoodsService,
- LWhFormInventoryServiceImpl lWhFormInventoryService,
+ LWhFormInventoryService lWhFormInventoryService,
LWhFormProcureCoreService lWhFormProcureCoreService,
- LWhFormOutputServiceImpl lWhFormOutputService
+ LWhFormOutputService lWhFormOutputService
) {
this.lWhFormInventoryGoods = lWhFormInventoryGoods;
this.lWhFormOutputCoreService = lWhFormOutputCoreService;
this.codeGeneratorService = codeGeneratorService;
- this.lWhFormProcureService = lWhFormProcureService;
+ this.lWhFormProcureServiceImpl = lWhFormProcureServiceImpl;
this.baseWarehouseService = baseWarehouseService;
- this.lWhFormProcureGoodsService = lWhFormProcureGoodsService;
+ this.lWhFormProcureGoodsServiceImpl = lWhFormProcureGoodsServiceImpl;
this.lWhProcureModelService = lWhProcureModelService;
this.baseGoodsTemplateService = baseGoodsTemplateService;
this.lWhGoodsService = lWhGoodsService;
@@ -73,12 +84,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 +136,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 +161,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("鍒涘缓鍑哄簱鍗曞け璐�");
@@ -191,7 +200,7 @@
BaseWarehouse baseWarehouse = baseWarehouseService.getById(warehouseId);
LWhFormProcure lWhFormProcure = new LWhFormProcure();
lWhFormProcure.setId(whFormProcureId);
- String inCode = codeGeneratorService.createCodeByPrefix(CodeGeneratorEnum.Procure_Warehouse.getValue(), 10);
+ String inCode = codeGeneratorService.createBusinessFormCode(CodeGeneratorEnum.Procure_Warehouse);
lWhFormProcure.setBusinessFormCode(inCode);
lWhFormProcure.setWarehouseId(warehouseId);
lWhFormProcure.setWarehouseName(baseWarehouse.getWarehouseName());
@@ -203,7 +212,7 @@
lWhFormProcure.setStates(1);
lWhFormProcure.setAgencyId(baseWarehouse.getAgencyId());
lWhFormProcure.setAgencyName(baseWarehouse.getAgencyName());
- int result = lWhFormProcureService.insert(lWhFormProcure);
+ int result = lWhFormProcureServiceImpl.insert(lWhFormProcure);
if (result == 0) {
return null;
}
@@ -233,9 +242,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);
@@ -247,7 +256,7 @@
whProcureModeLlist.add(model);
procureGoodList.add(procureGood);
}
- lWhFormProcureGoodsService.insertBatch(procureGoodList);
+ lWhFormProcureGoodsServiceImpl.insertBatch(procureGoodList);
lWhProcureModelService.insertBatch(whProcureModeLlist);
HashMap<String, Object> rtnMap = new HashMap<>();
@@ -273,6 +282,7 @@
//鍑哄叆搴搃d
long lWhFormOutputId = IdUtil.generateId();
lWhFormOutput.setId(lWhFormOutputId);
+ lWhFormOutput.setOutWarehouseType(0);
lWhFormOutput.setWarehouseId(warehouseId);
//鏍规嵁浠撳簱id鏌ヨ浠撳簱
BaseWarehouse warehouse = this.baseWarehouseService.getById(warehouseId);
@@ -281,11 +291,13 @@
return null;
}
lWhFormOutput.setWarehouseName(warehouse.getWarehouseName());
- String outCode = codeGeneratorService.createCodeByPrefix(CodeGeneratorEnum.OutPut_Warehouse.getValue(), 10);
+ String outCode = codeGeneratorService.createBusinessFormCode(CodeGeneratorEnum.OutPut_Warehouse);
lWhFormOutput.setOutputCode(outCode);
lWhFormOutput.setOutputName("鐩樼偣鍑哄簱");
- lWhFormOutput.setAgencyId(Long.valueOf(sysInfo.getTenantId()));
- lWhFormOutput.setAgencyName(sysInfo.getTenantName());
+// lWhFormOutput.setAgencyId(Long.valueOf(sysInfo.getTenantId()));
+ lWhFormOutput.setAgencyId(null);
+// lWhFormOutput.setAgencyName(sysInfo.getTenantName());
+ lWhFormOutput.setAgencyName(null);
lWhFormOutput.setOperatorId(sysInfo.getId());
lWhFormOutput.setOperatorName(sysInfo.getUserName());
@@ -295,6 +307,7 @@
if (flag1 != 1) {
return null;
}
+ ArrayList<LWhProcureModel> lWhProcureModels = new ArrayList<>();
for (LWhFormInventoryGoods inventoryGoods : inventoryGoodsList) {
Long baseGoodsModelsId = inventoryGoods.getBaseGoodsModelsId();
Integer counts = inventoryGoods.getErrorCounts();
@@ -302,15 +315,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