diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemconsume/MesWmItemConsumeServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemconsume/MesWmItemConsumeServiceImpl.java index b2d262b..d7fe5d0 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemconsume/MesWmItemConsumeServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemconsume/MesWmItemConsumeServiceImpl.java @@ -5,9 +5,19 @@ import cn.iocoder.yudao.module.mes.dal.dataobject.pro.feedback.MesProFeedbackDO; import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProductBomDO; import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemconsume.MesWmItemConsumeDO; import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemconsume.MesWmItemConsumeLineDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO; import cn.iocoder.yudao.module.mes.dal.mysql.wm.itemconsume.MesWmItemConsumeMapper; import cn.iocoder.yudao.module.mes.enums.wm.MesWmItemConsumeStatusEnum; +import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants; +import cn.iocoder.yudao.module.mes.enums.wm.MesWmTransactionTypeEnum; import cn.iocoder.yudao.module.mes.service.pro.route.MesProRouteProductBomService; +import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService; +import cn.iocoder.yudao.module.mes.service.wm.transaction.dto.MesWmTransactionSaveReqDTO; +import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService; +import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseLocationService; +import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseService; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -32,10 +42,14 @@ public class MesWmItemConsumeServiceImpl implements MesWmItemConsumeService { private MesWmItemConsumeLineService itemConsumeLineService; @Resource private MesProRouteProductBomService routeProductBomService; - - // TODO @芋艿:待 MaterialStockService 补充 decreaseStock 后,注入并调用 - // @Resource - // private MesWmMaterialStockService materialStockService; + @Resource + private MesWmTransactionService wmTransactionService; + @Resource + private MesWmWarehouseService warehouseService; + @Resource + private MesWmWarehouseLocationService locationService; + @Resource + private MesWmWarehouseAreaService areaService; @Override public MesWmItemConsumeDO generateItemConsume(MesProFeedbackDO feedback) { @@ -64,11 +78,22 @@ public class MesWmItemConsumeServiceImpl implements MesWmItemConsumeService { @Override public void finishItemConsume(Long consumeId) { - // TODO @AI(from codex):对齐,这里还需要按消耗明细扣减线边库库存,不能只把消耗单状态改为已完成。 - // List lines = itemConsumeLineService.getItemConsumeLineListByConsumeId(consumeId); - // for (MesWmItemConsumeLineDO line : lines) { - // materialStockService.decreaseStock(line.getItemId(), ..., line.getQuantity()); - // } + MesWmWarehouseDO virtualWarehouse = warehouseService.getWarehouseByCode(MesWmWarehouseDO.WIP_VIRTUAL_WAREHOUSE); + MesWmWarehouseLocationDO virtualLocation = locationService.getWarehouseLocationByCode(MesWmWarehouseLocationDO.WIP_VIRTUAL_LOCATION); + MesWmWarehouseAreaDO virtualArea = areaService.getWarehouseAreaByCode(MesWmWarehouseAreaDO.WIP_VIRTUAL_AREA); + + // 遍历消耗行,创建库存事务(从线边库扣减) + List lines = itemConsumeLineService.getItemConsumeLineListByConsumeId(consumeId); + for (MesWmItemConsumeLineDO line : lines) { + wmTransactionService.createTransaction(new MesWmTransactionSaveReqDTO() + .setType(MesWmTransactionTypeEnum.OUT.getType()).setItemId(line.getItemId()) + .setQuantity(line.getQuantity().negate()) // 库存减少 + .setWarehouseId(virtualWarehouse.getId()).setLocationId(virtualLocation.getId()).setAreaId(virtualArea.getId()) + .setCheckFlag(false) // 线边库允许负库存 + .setBizType(MesBizTypeConstants.WM_ITEM_CONSUME).setBizId(consumeId) + .setBizCode("").setBizLineId(line.getId())); + } + // 更新消耗单状态为已完成 itemConsumeMapper.updateById(MesWmItemConsumeDO.builder() .id(consumeId).status(MesWmItemConsumeStatusEnum.FINISHED.getStatus()).build()); diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceServiceImpl.java index 28ebe7e..7c49f0d 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceServiceImpl.java @@ -14,8 +14,18 @@ import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProduct import cn.iocoder.yudao.module.mes.dal.mysql.wm.productproduce.MesWmProductProduceMapper; import cn.iocoder.yudao.module.mes.enums.wm.MesWmProductProduceStatusEnum; import cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum; +import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants; +import cn.iocoder.yudao.module.mes.enums.wm.MesWmTransactionTypeEnum; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO; import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService; import cn.iocoder.yudao.module.mes.service.wm.batch.MesWmBatchService; +import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService; +import cn.iocoder.yudao.module.mes.service.wm.transaction.dto.MesWmTransactionSaveReqDTO; +import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService; +import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseLocationService; +import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseService; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,6 +57,14 @@ public class MesWmProductProduceServiceImpl implements MesWmProductProduceServic private MesProWorkOrderService workOrderService; @Resource private MesWmBatchService batchService; + @Resource + private MesWmTransactionService wmTransactionService; + @Resource + private MesWmWarehouseService warehouseService; + @Resource + private MesWmWarehouseLocationService locationService; + @Resource + private MesWmWarehouseAreaService areaService; @Override @Transactional(rollbackFor = Exception.class) @@ -59,8 +77,17 @@ public class MesWmProductProduceServiceImpl implements MesWmProductProduceServic throw exception(WM_PRODUCT_PRODUCE_NO_LINE); } - // 2. 校验每行明细数量之和等于行数量 + // 2. 创建库存事务 + createTransactionList(id, lines); + + // 3. 更新入库单状态 + productProduceMapper.updateById(new MesWmProductProduceDO() + .setId(id).setStatus(MesWmProductProduceStatusEnum.FINISHED.getStatus())); + } + + private void createTransactionList(Long produceId, List lines) { for (MesWmProductProduceLineDO line : lines) { + // 1. 校验每行明细数量之和等于行数量 List details = productProduceDetailService.getProductProduceDetailListByLineId( line.getId()); BigDecimal totalDetailQty = CollectionUtils.getSumValue(details, @@ -68,13 +95,17 @@ public class MesWmProductProduceServiceImpl implements MesWmProductProduceServic if (line.getQuantity() != null && totalDetailQty.compareTo(line.getQuantity()) != 0) { throw exception(WM_PRODUCT_PRODUCE_DETAIL_QUANTITY_MISMATCH); } + // 2. 按明细创建库存事务(产品产出到线边库) + for (MesWmProductProduceDetailDO detail : details) { + wmTransactionService.createTransaction(new MesWmTransactionSaveReqDTO() + .setType(MesWmTransactionTypeEnum.IN.getType()).setItemId(detail.getItemId()) + .setQuantity(detail.getQuantity()) + .setBatchId(detail.getBatchId()).setBatchCode(detail.getBatchCode()) + .setWarehouseId(detail.getWarehouseId()).setLocationId(detail.getLocationId()).setAreaId(detail.getAreaId()) + .setBizType(MesBizTypeConstants.WM_PRODUCT_PRODUCE).setBizId(produceId) + .setBizCode("").setBizLineId(line.getId())); + } } - - // TODO @AI(from codex):对齐,这里还需要按产出明细执行库存入账,而不是只校验明细并更新单据状态。 - - // 3. 更新入库单状态 - productProduceMapper.updateById(new MesWmProductProduceDO() - .setId(id).setStatus(MesWmProductProduceStatusEnum.FINISHED.getStatus())); } @Override @@ -106,6 +137,11 @@ public class MesWmProductProduceServiceImpl implements MesWmProductProduceServic Long batchId = batch != null ? batch.getId() : null; String batchCode = batch != null ? batch.getCode() : null; + // 1.5 获取虚拟线边库 + MesWmWarehouseDO virtualWarehouse = warehouseService.getWarehouseByCode(MesWmWarehouseDO.WIP_VIRTUAL_WAREHOUSE); + MesWmWarehouseLocationDO virtualLocation = locationService.getWarehouseLocationByCode(MesWmWarehouseLocationDO.WIP_VIRTUAL_LOCATION); + MesWmWarehouseAreaDO virtualArea = areaService.getWarehouseAreaByCode(MesWmWarehouseAreaDO.WIP_VIRTUAL_AREA); + // 3. 根据是否需要检验分支处理 if (checkFlag) { // 3.1 需要检验:创建一条行(质量状态=待检验),不生成明细 @@ -123,7 +159,8 @@ public class MesWmProductProduceServiceImpl implements MesWmProductProduceServic unqualifiedQty, MesWmQualityStatusEnum.FAIL.getStatus()); productProduceLineService.createProductProduceLine(unqualifiedLine); MesWmProductProduceDetailDO unqualifiedDetail = buildProduceDetail(produce, feedback, batchId, batchCode, - unqualifiedLine.getId(), unqualifiedQty); + unqualifiedLine.getId(), unqualifiedQty, + virtualWarehouse.getId(), virtualLocation.getId(), virtualArea.getId()); productProduceDetailService.createProductProduceDetail(unqualifiedDetail); } // 3.2.2 合格品行 + 明细 @@ -132,7 +169,8 @@ public class MesWmProductProduceServiceImpl implements MesWmProductProduceServic qualifiedQty, MesWmQualityStatusEnum.PASS.getStatus()); productProduceLineService.createProductProduceLine(qualifiedLine); MesWmProductProduceDetailDO qualifiedDetail = buildProduceDetail(produce, feedback, batchId, batchCode, - qualifiedLine.getId(), qualifiedQty); + qualifiedLine.getId(), qualifiedQty, + virtualWarehouse.getId(), virtualLocation.getId(), virtualArea.getId()); productProduceDetailService.createProductProduceDetail(qualifiedDetail); } } @@ -153,12 +191,13 @@ public class MesWmProductProduceServiceImpl implements MesWmProductProduceServic private MesWmProductProduceDetailDO buildProduceDetail(MesWmProductProduceDO produce, MesProFeedbackDO feedback, Long batchId, String batchCode, - Long lineId, BigDecimal quantity) { + Long lineId, BigDecimal quantity, + Long warehouseId, Long locationId, Long areaId) { return MesWmProductProduceDetailDO.builder() .produceId(produce.getId()).lineId(lineId) .itemId(feedback.getItemId()).quantity(quantity) .batchId(batchId).batchCode(batchCode) - // TODO @AI(from codex):对齐 产出明细需要补齐虚拟仓/库区/库位(VIRTUAL_WH/VIRTUAL_WS/VIRTUAL_WA),否则后续库存入账定位不完整。 + .warehouseId(warehouseId).locationId(locationId).areaId(areaId) .build(); } diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptServiceImpl.java index 38ec7a4..a5e5443 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productreceipt/MesWmProductReceiptServiceImpl.java @@ -13,8 +13,19 @@ import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt.MesWmProduct import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt.MesWmProductReceiptDetailDO; import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productreceipt.MesWmProductReceiptLineDO; import cn.iocoder.yudao.module.mes.dal.mysql.wm.productreceipt.MesWmProductReceiptMapper; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO; import cn.iocoder.yudao.module.mes.enums.wm.MesWmProductReceiptStatusEnum; +import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants; +import cn.iocoder.yudao.module.mes.enums.wm.MesWmTransactionTypeEnum; +import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService; import cn.iocoder.yudao.module.mes.service.wm.materialstock.MesWmMaterialStockService; +import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService; +import cn.iocoder.yudao.module.mes.service.wm.transaction.dto.MesWmTransactionSaveReqDTO; +import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService; +import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseLocationService; +import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseService; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -46,7 +57,16 @@ public class MesWmProductReceiptServiceImpl implements MesWmProductReceiptServic private MesWmMaterialStockService materialStockService; @Resource - private cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService workOrderService; + private MesWmTransactionService wmTransactionService; + + @Resource + private MesProWorkOrderService workOrderService; + @Resource + private MesWmWarehouseService warehouseService; + @Resource + private MesWmWarehouseLocationService locationService; + @Resource + private MesWmWarehouseAreaService areaService; @Override public Long createProductReceipt(MesWmProductReceiptSaveReqVO createReqVO) { @@ -160,20 +180,44 @@ public class MesWmProductReceiptServiceImpl implements MesWmProductReceiptServic throw exception(WM_PRODUCT_RECPT_STATUS_ERROR); } - // 遍历所有明细,更新库存台账 - // DONE @芋艿:【后面优化】(AI 未修复原因:标注为后续优化,需人工介入) - List details = productReceiptDetailService.getProductReceiptDetailListByRecptId(id); - for (MesWmProductReceiptDetailDO detail : details) { - materialStockService.increaseStock( - detail.getItemId(), detail.getWarehouseId(), detail.getLocationId(), detail.getAreaId(), - detail.getBatchId(), detail.getQuantity(), null, null, null); - } + // 创建库存事务 + createTransactionList(receipt); // 更新收货单状态 productReceiptMapper.updateById(new MesWmProductReceiptDO() .setId(id).setStatus(MesWmProductReceiptStatusEnum.FINISHED.getStatus())); } + private void createTransactionList(MesWmProductReceiptDO receipt) { + // 1. 查询虚拟线边库 + MesWmWarehouseDO virtualWarehouse = warehouseService.getWarehouseByCode(MesWmWarehouseDO.WIP_VIRTUAL_WAREHOUSE); + MesWmWarehouseLocationDO virtualLocation = locationService.getWarehouseLocationByCode(MesWmWarehouseLocationDO.WIP_VIRTUAL_LOCATION); + MesWmWarehouseAreaDO virtualArea = areaService.getWarehouseAreaByCode(MesWmWarehouseAreaDO.WIP_VIRTUAL_AREA); + + // 2. 遍历明细,每条明细产生 OUT(虚拟线边库扣减)+ IN(实际仓库增加) + List details = productReceiptDetailService.getProductReceiptDetailListByRecptId(receipt.getId()); + for (MesWmProductReceiptDetailDO detail : details) { + // 2.1 先从虚拟线边库出库(库存减少) + Long outTransactionId = wmTransactionService.createTransaction(new MesWmTransactionSaveReqDTO() + .setType(MesWmTransactionTypeEnum.OUT.getType()).setItemId(detail.getItemId()) + .setQuantity(detail.getQuantity().negate()) // 库存减少 + .setBatchId(detail.getBatchId()) + .setWarehouseId(virtualWarehouse.getId()).setLocationId(virtualLocation.getId()).setAreaId(virtualArea.getId()) + .setCheckFlag(false) // 线边库允许负库存 + .setBizType(MesBizTypeConstants.WM_PRODUCT_RECPT).setBizId(receipt.getId()) + .setBizCode(receipt.getCode()).setBizLineId(detail.getLineId())); + // 2.2 再入实际仓库(库存增加) + wmTransactionService.createTransaction(new MesWmTransactionSaveReqDTO() + .setType(MesWmTransactionTypeEnum.IN.getType()).setItemId(detail.getItemId()) + .setQuantity(detail.getQuantity()) // 库存增加 + .setBatchId(detail.getBatchId()) + .setWarehouseId(detail.getWarehouseId()).setLocationId(detail.getLocationId()).setAreaId(detail.getAreaId()) + .setBizType(MesBizTypeConstants.WM_PRODUCT_RECPT).setBizId(receipt.getId()) + .setBizCode(receipt.getCode()).setBizLineId(detail.getLineId()) + .setRelatedTransactionId(outTransactionId)); // 关联出库事务 + } + } + @Override @Transactional(rollbackFor = Exception.class) public void cancelProductReceipt(Long id) { diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueServiceImpl.java index 2b98d99..92e634c 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueServiceImpl.java @@ -22,6 +22,12 @@ import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationServic import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService; import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService; import cn.iocoder.yudao.module.mes.service.wm.transaction.dto.MesWmTransactionSaveReqDTO; +import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService; +import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseLocationService; +import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseService; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -32,7 +38,6 @@ import java.util.List; import java.util.Map; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList; import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*; /** @@ -57,6 +62,12 @@ public class MesWmReturnIssueServiceImpl implements MesWmReturnIssueService { private MesMdItemService itemService; @Resource private MesWmTransactionService wmTransactionService; + @Resource + private MesWmWarehouseService warehouseService; + @Resource + private MesWmWarehouseLocationService locationService; + @Resource + private MesWmWarehouseAreaService areaService; @Override @Transactional(rollbackFor = Exception.class) @@ -194,14 +205,33 @@ public class MesWmReturnIssueServiceImpl implements MesWmReturnIssueService { } private void createTransactionList(MesWmReturnIssueDO issue) { + // 1. 查询虚拟线边库 + MesWmWarehouseDO virtualWarehouse = warehouseService.getWarehouseByCode(MesWmWarehouseDO.WIP_VIRTUAL_WAREHOUSE); + MesWmWarehouseLocationDO virtualLocation = locationService.getWarehouseLocationByCode(MesWmWarehouseLocationDO.WIP_VIRTUAL_LOCATION); + MesWmWarehouseAreaDO virtualArea = areaService.getWarehouseAreaByCode(MesWmWarehouseAreaDO.WIP_VIRTUAL_AREA); + + // 2. 遍历明细,每条明细产生 OUT(虚拟线边库扣减)+ IN(实际仓库增加) List details = issueDetailService.getReturnIssueDetailListByIssueId(issue.getId()); - wmTransactionService.createTransactionList(convertList(details, detail -> new MesWmTransactionSaveReqDTO() - .setType(MesWmTransactionTypeEnum.IN.getType()).setItemId(detail.getItemId()) - .setQuantity(detail.getQuantity()) // 入库数量为正数(退料回仓) - .setBatchId(detail.getBatchId()).setBatchCode(detail.getBatchCode()) - .setWarehouseId(detail.getWarehouseId()).setLocationId(detail.getLocationId()).setAreaId(detail.getAreaId()) - .setBizType(MesBizTypeConstants.WM_RETURN_ISSUE).setBizId(issue.getId()) - .setBizCode(issue.getCode()).setBizLineId(detail.getLineId()))); + for (MesWmReturnIssueDetailDO detail : details) { + // 2.1 先从虚拟线边库出库(库存减少) + Long outTransactionId = wmTransactionService.createTransaction(new MesWmTransactionSaveReqDTO() + .setType(MesWmTransactionTypeEnum.OUT.getType()).setItemId(detail.getItemId()) + .setQuantity(detail.getQuantity().negate()) // 库存减少 + .setBatchId(detail.getBatchId()).setBatchCode(detail.getBatchCode()) + .setWarehouseId(virtualWarehouse.getId()).setLocationId(virtualLocation.getId()).setAreaId(virtualArea.getId()) + .setCheckFlag(false) // 线边库允许负库存 + .setBizType(MesBizTypeConstants.WM_RETURN_ISSUE).setBizId(issue.getId()) + .setBizCode(issue.getCode()).setBizLineId(detail.getLineId())); + // 2.2 再入实际仓库(库存增加) + wmTransactionService.createTransaction(new MesWmTransactionSaveReqDTO() + .setType(MesWmTransactionTypeEnum.IN.getType()).setItemId(detail.getItemId()) + .setQuantity(detail.getQuantity()) // 库存增加(退料回仓) + .setBatchId(detail.getBatchId()).setBatchCode(detail.getBatchCode()) + .setWarehouseId(detail.getWarehouseId()).setLocationId(detail.getLocationId()).setAreaId(detail.getAreaId()) + .setBizType(MesBizTypeConstants.WM_RETURN_ISSUE).setBizId(issue.getId()) + .setBizCode(issue.getCode()).setBizLineId(detail.getLineId()) + .setRelatedTransactionId(outTransactionId)); // 关联出库事务 + } } @Override diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transaction/MesWmTransactionServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transaction/MesWmTransactionServiceImpl.java index 0579871..c6c5ec7 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transaction/MesWmTransactionServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/transaction/MesWmTransactionServiceImpl.java @@ -68,6 +68,8 @@ public class MesWmTransactionServiceImpl implements MesWmTransactionService { if (inbound) { materialStockService.checkAreaMixingRule(reqDTO.getAreaId(), reqDTO.getItemId(), reqDTO.getBatchId()); } + // 1.5 关联事务校验 + checkRelatedTransaction(reqDTO); // 2.1 获取或创建库存记录 MesWmMaterialStockDO materialStock = materialStockService.getOrCreateMaterialStock( @@ -143,6 +145,19 @@ public class MesWmTransactionServiceImpl implements MesWmTransactionService { } /** + * 关联事务校验:relatedTransactionId 不为空时,关联的事务必须存在 + */ + private void checkRelatedTransaction(MesWmTransactionSaveReqDTO reqDTO) { + if (reqDTO.getRelatedTransactionId() == null) { + return; + } + MesWmTransactionDO relatedTransaction = transactionMapper.selectById(reqDTO.getRelatedTransactionId()); + if (relatedTransaction == null) { + throw exception(WM_TRANSACTION_RELATED_NOT_EXISTS); + } + } + + /** * 冻结校验:检查仓库、库区、库位、库存记录是否被冻结 * * @param reqDTO 事务请求 DTO @@ -167,8 +182,7 @@ public class MesWmTransactionServiceImpl implements MesWmTransactionService { // 2. 检查库存记录冻结 if (Boolean.TRUE.equals(materialStock.getFrozen())) { - throw exception(WM_TRANSACTION_STOCK_FROZEN, - warehouse.getName(), location.getName(), area.getName()); + throw exception(WM_TRANSACTION_STOCK_FROZEN, warehouse.getName(), location.getName(), area.getName()); } }