From ccda8b2733a2fabb8c23c062583b1437d6866379 Mon Sep 17 00:00:00 2001 From: cy <1664593601@qq.com> Date: 星期四, 09 十一月 2023 11:47:48 +0800 Subject: [PATCH] feat: 增加查询角色类 --- consum-base/src/main/java/com/consum/base/service/LWhFormOutputCoreService.java | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 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..3e32a02 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 @@ -20,20 +20,19 @@ /** * @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; @@ -44,7 +43,6 @@ LWhGoodsService lWhGoodsService, CodeGeneratorService codeGeneratorService, LWhProcureModelService lWhProcureModelService, - LWhFormTransferService lWhFormTransferService, LWhFormOutputService lWhFormOutputService, LWarehouseFlowService lWarehouseFlowService, LWhGoodsRecordDetailsService lWhGoodsRecordDetailsService, @@ -53,7 +51,6 @@ this.lWhGoodsService = lWhGoodsService; this.codeGeneratorService = codeGeneratorService; this.lWhProcureModelService = lWhProcureModelService; - this.lWhFormTransferService = lWhFormTransferService; this.lWhFormOutputService = lWhFormOutputService; this.lWarehouseFlowService = lWarehouseFlowService; this.lWhGoodsRecordDetailsService = lWhGoodsRecordDetailsService; @@ -73,7 +70,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 +112,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(璋冩嫧鏃堕渶瑕�) @@ -168,6 +165,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(); @@ -201,10 +201,6 @@ short queryModelStatus = queryModelStatusT; Short buyType = buyTypeT; Short modGoodsTransferingStatus = modGoodsTransferingStatusT; - - // 鎺ユ敹鏂逛粨搴撲俊鎭� - Long inWarehouseId = lWhFormOutput.getInWarehouseId(); - String inWarehouseName = lWhFormOutput.getInWarehouseName(); goodsModelNumList.forEach(itemModelInfo -> { // 闇�瑕佽皟鎷ㄧ殑鐗╁搧鐨勬煇涓瀷鍙� @@ -257,7 +253,7 @@ //鍑哄簱鏃跺�欙紝鎸� 鍏堝叆搴撶殑鍏堝嚭搴擄紝鍚屾椂鍏ュ簱鐨勶紝鎸変环鏍奸珮鐨勫厛鍑哄簱 List<Long> outGoodsId = lWhGoodsService.queryOutGoodsId(outWarehouseType, outWarehouseId, baseGoodsModelsId, queryModelStatus, buyType, goodsModelNum); - lWhGoodsService.modGoodsTransfering(outGoodsId, outWarehouseType, inWarehouseId, inWarehouseName, modGoodsTransferingStatus); + lWhGoodsService.modGoodsTransfering(outGoodsId, inWarehouseType, inWarehouseId, inWarehouseName, modGoodsTransferingStatus); // 鎵归噺鎻掑叆 杩涘嚭搴撴祦姘存槑缁哰L_WH_GOODS_RECORD_DETAILS] lWhGoodsRecordDetailsService.sameGoodsInsertMore(outGoodsId, whGoodsRecordId, (short) 0); lWhGoodsRecordService.insert(whGoodsRecord); @@ -279,6 +275,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