From 67938e18ff1183ee789794d1f0e6a3abfa3f96d5 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期二, 21 十一月 2023 15:18:36 +0800
Subject: [PATCH] 列表搜索项支持级联
---
consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java | 79 +++++++++++++++++++++++----------------
1 files changed, 46 insertions(+), 33 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java
index 9494cc6..c74b9a0 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java
@@ -4,36 +4,38 @@
import com.consum.base.core.CodeGeneratorService;
import com.consum.base.core.WhBusinessEnum;
import com.consum.base.core.param.BaseWarehouseParam1;
-import com.consum.base.core.util.LockManage;
-import com.consum.model.po.*;
+import com.consum.base.core.utils.LockManage;
+import com.consum.model.po.LWarehouseFlow;
+import com.consum.model.po.LWhFormOutput;
+import com.consum.model.po.LWhFormTransfer;
+import com.consum.model.po.LWhGoodsRecord;
+import com.consum.model.po.LWhProcureModel;
import com.iplatform.model.po.S_user_core;
import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.infrastructure.utils.NumberGenerator;
+import java.util.List;
+import java.util.Map;
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 java.util.List;
-import java.util.Map;
-
/**
* @ClassName WhFormOutputCoreService
- * @Author cy
* @Date 2023/10/26
* @Description
* @Version 1.0
**/
@Slf4j
@Service
+@Transactional(rollbackFor = Exception.class)
public class LWhFormOutputCoreService {
private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;
private LWhGoodsService lWhGoodsService;
private CodeGeneratorService codeGeneratorService;
private LWhProcureModelService lWhProcureModelService;
- private LWhFormTransferService lWhFormTransferService;
private LWhFormOutputService lWhFormOutputService;
private LWarehouseFlowService lWarehouseFlowService;
private LWhGoodsRecordDetailsService lWhGoodsRecordDetailsService;
@@ -41,19 +43,17 @@
@Autowired
public LWhFormOutputCoreService(BaseGoodsTemplateServiceImpl baseGoodsTemplateService,
- LWhGoodsService lWhGoodsService,
- CodeGeneratorService codeGeneratorService,
- LWhProcureModelService lWhProcureModelService,
- LWhFormTransferService lWhFormTransferService,
- LWhFormOutputService lWhFormOutputService,
- LWarehouseFlowService lWarehouseFlowService,
- LWhGoodsRecordDetailsService lWhGoodsRecordDetailsService,
- LWhGoodsRecordService lWhGoodsRecordService) {
+ LWhGoodsService lWhGoodsService,
+ CodeGeneratorService codeGeneratorService,
+ LWhProcureModelService lWhProcureModelService,
+ LWhFormOutputService lWhFormOutputService,
+ LWarehouseFlowService lWarehouseFlowService,
+ LWhGoodsRecordDetailsService lWhGoodsRecordDetailsService,
+ LWhGoodsRecordService lWhGoodsRecordService) {
this.baseGoodsTemplateService = baseGoodsTemplateService;
this.lWhGoodsService = lWhGoodsService;
this.codeGeneratorService = codeGeneratorService;
this.lWhProcureModelService = lWhProcureModelService;
- this.lWhFormTransferService = lWhFormTransferService;
this.lWhFormOutputService = lWhFormOutputService;
this.lWarehouseFlowService = lWarehouseFlowService;
this.lWhGoodsRecordDetailsService = lWhGoodsRecordDetailsService;
@@ -73,7 +73,7 @@
return null;
}
LWhFormTransfer lWhFormTransfer = new LWhFormTransfer(whFormTransferId);
- lWhFormTransfer = lWhFormTransferService.get(lWhFormTransfer);
+ lWhFormTransfer = lWhFormOutputService.get(lWhFormTransfer);
if (lWhFormTransfer == null || lWhFormTransfer.getStates() != 0) {
log.error("璋冩嫧澶辫触锛佽妫�鏌ヨ皟鎷ㄥ崟鐘舵��");
return null;
@@ -115,7 +115,7 @@
whFormOutput.setId(outWarehouseFormId);
// 姝ゆ椂骞舵病鏈夊嚭搴�
whFormOutput.setWarehouseFlowId(null);
- whFormOutput.setBusinessFormCode(codeGeneratorService.createCodeByPrefix(CodeGeneratorEnum.OutPut_Warehouse.getValue(), 4));
+ whFormOutput.setBusinessFormCode(codeGeneratorService.createBusinessFormCode(CodeGeneratorEnum.OutPut_Warehouse));
//杩涘嚭搴撴祦姘存�昏〃 鍏ュ簱鍗旾D
whFormOutput.setInWarehouseFlowId(null);
// 璋冩嫧鍗旾D(璋冩嫧鏃堕渶瑕�)
@@ -124,6 +124,7 @@
whFormOutput.setOutputName("璋冩嫧鍑哄簱");
whFormOutput.setWarehouseId(outWarehouseId);
whFormOutput.setWarehouseName(outWarehouseName);
+ // 杩欐牱灏辨煡璇笉鍒拌鏉¤褰�
whFormOutput.setAgencyId(null);
whFormOutput.setAgencyName(null);
whFormOutput.setOperatorId(currentUser.getId());
@@ -148,7 +149,7 @@
* @return 娴佹按璁板綍鎬昏〃ID
*/
@Transactional(rollbackFor = Exception.class)
- public Long outFormByTransId(Long outWarehouseFormId, S_user_core currentUser, Long dealTime) {
+ public Long outFormByTransId(Long outWarehouseFormId, WhBusinessEnum businessType, S_user_core currentUser, Long dealTime) {
if (outWarehouseFormId == null) {
return null;
}
@@ -168,6 +169,9 @@
Integer outWarehouseType = lWhFormOutput.getOutWarehouseType();
Long outWarehouseId = lWhFormOutput.getWarehouseId();
String warehouseName = lWhFormOutput.getWarehouseName();
+ Integer inWarehouseType = lWhFormOutput.getInWarehouseType();
+ Long inWarehouseId = lWhFormOutput.getInWarehouseId();
+ String inWarehouseName = lWhFormOutput.getInWarehouseName();
Long userId = currentUser.getId();
String nickName = currentUser.getNick_name();
@@ -178,10 +182,10 @@
long lWarehouseFlowBusinessId = outWarehouseFormId;
// 鐗╁搧鐘舵�侊紙0=鍦ㄩ�旇皟鎷紱1=鍏ュ簱鏈垎鍙戯紱2=宸蹭笅鍙戯紱3=鎶ュ簾锛�
- short queryModelStatusT = 1;
+ Integer queryModelStatusT = 1;
//閲囪喘鏂瑰紡锛�1锛氶泦閲囷紱2=鑷噰锛�
- Short buyTypeT = null;
- Short modGoodsTransferingStatusT = null;
+ Integer buyTypeT = null;
+ Integer modGoodsTransferingStatusT = null;
String outputCode = lWhFormOutput.getOutputCode();
if ((BaseWarehouseParam1.In_OutPutTypeEnum.Transfer_Output.getValue() + "").equals(outputCode)) {
//璋冩嫧鍑哄簱
@@ -198,13 +202,9 @@
buyTypeT = null;
modGoodsTransferingStatusT = 4;
}
- short queryModelStatus = queryModelStatusT;
- Short buyType = buyTypeT;
- Short modGoodsTransferingStatus = modGoodsTransferingStatusT;
-
- // 鎺ユ敹鏂逛粨搴撲俊鎭�
- Long inWarehouseId = lWhFormOutput.getInWarehouseId();
- String inWarehouseName = lWhFormOutput.getInWarehouseName();
+ Integer queryModelStatus = queryModelStatusT;
+ Integer buyType = buyTypeT;
+ Integer modGoodsTransferingStatus = modGoodsTransferingStatusT;
goodsModelNumList.forEach(itemModelInfo -> {
// 闇�瑕佽皟鎷ㄧ殑鐗╁搧鐨勬煇涓瀷鍙�
@@ -243,6 +243,7 @@
//閫氳繃LockManage鑾峰緱閿�
Object warehouseModelLockObj = LockManage.acquireLock(outWarehouseType, outWarehouseId, baseGoodsModelsId);
+ List<Long> outGoodsId = null;
synchronized (warehouseModelLockObj) {
// 鑾峰緱閿佸悗鏌ヨ璇ュ瀷鍙风殑鏈熷垵鏁伴噺
int goodsModelNum = lWhGoodsService.queryGoodsModelNum(outWarehouseType, outWarehouseId, baseGoodsModelsId, queryModelStatus, buyType);
@@ -256,19 +257,25 @@
whGoodsRecord.setEndCount(goodsModelNum - counts);
//鍑哄簱鏃跺�欙紝鎸� 鍏堝叆搴撶殑鍏堝嚭搴擄紝鍚屾椂鍏ュ簱鐨勶紝鎸変环鏍奸珮鐨勫厛鍑哄簱
- List<Long> outGoodsId = lWhGoodsService.queryOutGoodsId(outWarehouseType, outWarehouseId, baseGoodsModelsId, queryModelStatus, buyType, goodsModelNum);
- lWhGoodsService.modGoodsTransfering(outGoodsId, outWarehouseType, inWarehouseId, inWarehouseName, modGoodsTransferingStatus);
+ outGoodsId = lWhGoodsService.queryOutGoodsId(outWarehouseType, outWarehouseId, baseGoodsModelsId, queryModelStatus, buyType,
+ counts);
+ lWhGoodsService.modGoodsTransfering(outGoodsId, inWarehouseType, inWarehouseId, inWarehouseName, modGoodsTransferingStatus);
// 鎵归噺鎻掑叆 杩涘嚭搴撴祦姘存槑缁哰L_WH_GOODS_RECORD_DETAILS]
lWhGoodsRecordDetailsService.sameGoodsInsertMore(outGoodsId, whGoodsRecordId, (short) 0);
- lWhGoodsRecordService.insert(whGoodsRecord);
}
+ long totalAmount = lWhGoodsService.queryGoodsPriceById(outGoodsId);
+ LWhProcureModel lWhProcureModel = new LWhProcureModel(itemModelInfo.getId());
+ whGoodsRecord.setTotalPrice(totalAmount);
+ lWhGoodsRecordService.insert(whGoodsRecord);
+ lWhProcureModel.setTotalAmount(totalAmount);
+ lWhProcureModelService.update(lWhProcureModel);
});
LWarehouseFlow warehouseFlow = new LWarehouseFlow();
warehouseFlow.setId(lWarehouseFlowId);
warehouseFlow.setWarehouseId(outWarehouseId);
warehouseFlow.setWarehouseName(warehouseName);
warehouseFlow.setThisType(2);
- warehouseFlow.setBusinessType(WhBusinessEnum.DIAOBO.getValue() + 0);
+ warehouseFlow.setBusinessType(businessType.getValue() + 0);
warehouseFlow.setBusinessFormId(lWarehouseFlowBusinessId);
warehouseFlow.setOperatorId(userId);
@@ -279,6 +286,12 @@
if (flowInsertFlag == 0) {
return null;
}
+ // 鍚戝嚭搴撳崟 鎻掑叆 杩涘嚭搴撴祦姘存�昏〃ID
+ lWhFormOutput = new LWhFormOutput(outWarehouseFormId);
+ lWhFormOutput.setStates(2);
+ lWhFormOutput.setWarehouseFlowId(lWarehouseFlowId);
+ lWhFormOutputService.update(lWhFormOutput);
+
return lWarehouseFlowId;
}
--
Gitblit v1.9.1