From 6843b10472482b305b5580cc2f5cdbb97fb9a203 Mon Sep 17 00:00:00 2001
From: haoyahui <2032914783@qq.com>
Date: 星期一, 13 十一月 2023 17:31:43 +0800
Subject: [PATCH] 调拨，库存盘点，报废管理，台账管理
---
consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 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 3e32a02..c5e617f 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,19 +4,22 @@
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
@@ -40,13 +43,13 @@
@Autowired
public LWhFormOutputCoreService(BaseGoodsTemplateServiceImpl baseGoodsTemplateService,
- LWhGoodsService lWhGoodsService,
- CodeGeneratorService codeGeneratorService,
- LWhProcureModelService lWhProcureModelService,
- 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;
@@ -181,7 +184,7 @@
short queryModelStatusT = 1;
//閲囪喘鏂瑰紡锛�1锛氶泦閲囷紱2=鑷噰锛�
Short buyTypeT = null;
- Short modGoodsTransferingStatusT = null;
+ Integer modGoodsTransferingStatusT = null;
String outputCode = lWhFormOutput.getOutputCode();
if ((BaseWarehouseParam1.In_OutPutTypeEnum.Transfer_Output.getValue() + "").equals(outputCode)) {
//璋冩嫧鍑哄簱
@@ -200,7 +203,7 @@
}
short queryModelStatus = queryModelStatusT;
Short buyType = buyTypeT;
- Short modGoodsTransferingStatus = modGoodsTransferingStatusT;
+ Integer modGoodsTransferingStatus = modGoodsTransferingStatusT;
goodsModelNumList.forEach(itemModelInfo -> {
// 闇�瑕佽皟鎷ㄧ殑鐗╁搧鐨勬煇涓瀷鍙�
@@ -252,7 +255,8 @@
whGoodsRecord.setEndCount(goodsModelNum - counts);
//鍑哄簱鏃跺�欙紝鎸� 鍏堝叆搴撶殑鍏堝嚭搴擄紝鍚屾椂鍏ュ簱鐨勶紝鎸変环鏍奸珮鐨勫厛鍑哄簱
- List<Long> outGoodsId = lWhGoodsService.queryOutGoodsId(outWarehouseType, outWarehouseId, baseGoodsModelsId, queryModelStatus, buyType, goodsModelNum);
+ List<Long> outGoodsId = lWhGoodsService.queryOutGoodsId(outWarehouseType, outWarehouseId, baseGoodsModelsId, queryModelStatus, buyType,
+ goodsModelNum);
lWhGoodsService.modGoodsTransfering(outGoodsId, inWarehouseType, inWarehouseId, inWarehouseName, modGoodsTransferingStatus);
// 鎵归噺鎻掑叆 杩涘嚭搴撴祦姘存槑缁哰L_WH_GOODS_RECORD_DETAILS]
lWhGoodsRecordDetailsService.sameGoodsInsertMore(outGoodsId, whGoodsRecordId, (short) 0);
--
Gitblit v1.9.1