From 8fc8b4788ed8be27ff6aae1cdd3fe9a584972ae3 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期三, 22 十一月 2023 18:41:05 +0800
Subject: [PATCH] feat: 物品统计；库存预警模板下载、上传、下载异常文件
---
consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 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 c5e617f..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
@@ -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;
}
@@ -181,9 +182,9 @@
long lWarehouseFlowBusinessId = outWarehouseFormId;
// 鐗╁搧鐘舵�侊紙0=鍦ㄩ�旇皟鎷紱1=鍏ュ簱鏈垎鍙戯紱2=宸蹭笅鍙戯紱3=鎶ュ簾锛�
- short queryModelStatusT = 1;
+ Integer queryModelStatusT = 1;
//閲囪喘鏂瑰紡锛�1锛氶泦閲囷紱2=鑷噰锛�
- Short buyTypeT = null;
+ Integer buyTypeT = null;
Integer modGoodsTransferingStatusT = null;
String outputCode = lWhFormOutput.getOutputCode();
if ((BaseWarehouseParam1.In_OutPutTypeEnum.Transfer_Output.getValue() + "").equals(outputCode)) {
@@ -201,8 +202,8 @@
buyTypeT = null;
modGoodsTransferingStatusT = 4;
}
- short queryModelStatus = queryModelStatusT;
- Short buyType = buyTypeT;
+ Integer queryModelStatus = queryModelStatusT;
+ Integer buyType = buyTypeT;
Integer modGoodsTransferingStatus = modGoodsTransferingStatusT;
goodsModelNumList.forEach(itemModelInfo -> {
@@ -242,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);
@@ -255,20 +257,25 @@
whGoodsRecord.setEndCount(goodsModelNum - counts);
//鍑哄簱鏃跺�欙紝鎸� 鍏堝叆搴撶殑鍏堝嚭搴擄紝鍚屾椂鍏ュ簱鐨勶紝鎸変环鏍奸珮鐨勫厛鍑哄簱
- List<Long> outGoodsId = lWhGoodsService.queryOutGoodsId(outWarehouseType, outWarehouseId, baseGoodsModelsId, queryModelStatus, buyType,
- goodsModelNum);
+ 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);
--
Gitblit v1.9.1