From 6d356442b2209d17869a4156356ecfa3a8321e74 Mon Sep 17 00:00:00 2001 From: futian.liu <liufutianyoo@163.com> Date: 星期四, 21 十二月 2023 15:29:07 +0800 Subject: [PATCH] 调拨撤销时进行状态检查 --- consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferCoreService.java | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferCoreService.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferCoreService.java index 6a2114d..359084a 100644 --- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferCoreService.java +++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferCoreService.java @@ -16,6 +16,7 @@ import com.consum.base.core.WhBusinessEnum; import com.consum.base.core.service.LWhWarningCoreServiceImpl; +import com.consum.base.core.type.TransferStatesType; import com.consum.base.core.utils.IdUtil; import com.consum.base.core.utils.LockManage; import com.consum.base.service.BaseGoodsTemplateService; @@ -286,7 +287,7 @@ lWhFormTransfer = new LWhFormTransfer(whFormTransferId); // 璋冩嫧鍗曚笉鍐嶅叧鑱斿嚭鍏ュ簱鍗� // lWhFormTransfer.setOutWarehouseFormId(outWarehouseFormId); - lWhFormTransfer.setStates(1); + lWhFormTransfer.setStates(TransferStatesType.RECEIVE_ING.getValue()); lWhFormTransfer.setOutOperatorId(userId); lWhFormTransfer.setOutOperatorName(nickName); lWhFormTransfer.setOutputTime(dealTime); @@ -389,12 +390,6 @@ lWhGoodsService.modGoodsTransfering(outGoodsIds, inWarehouseType, inWarehouseId, inWarehouseName, goodsStatus); - // 閫氳繃鐗╁搧id鏌ヨ鎵�鏈夊晢鍝佺殑鎬婚噾棰� - // long amount = lWhGoodsService.queryGoodsPriceById(outGoodsIds); - // LWhProcureModel lWhFormScrappedGoods = new LWhProcureModel(formScrappedGood.getId()); - // lWhFormScrappedGoods.setTotalAmount(amount); - // lWhFormTransferService.update(lWhFormScrappedGoods); - whGoodsRecord.setInitialCount(goodsModelNum); whGoodsRecord.setEndCount(goodsModelNum + whGoodsRecord.getThisCount()); long totalAmount = lWhGoodsService.queryGoodsPriceById(outGoodsIds); @@ -474,7 +469,7 @@ lWhFormTransfer = new LWhFormTransfer(whFormTransferId); lWhFormTransfer.setInWarehouseFlowId(inWarehouseFlowId); lWhFormTransfer.setInWarehouseFormId(null); - lWhFormTransfer.setStates(2); + lWhFormTransfer.setStates(TransferStatesType.SUCCESS.getValue()); if (StringUtils.isEmpty(inOperatorName)) { lWhFormTransfer.setInOperatorId(userId); lWhFormTransfer.setInOperatorName(nickName); -- Gitblit v1.9.1