From 15edc521582e08e0e59ee5da9eaec2f2049bb462 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期六, 24 十月 2026 21:57:46 +0800
Subject: [PATCH] fix(mes): 自动生成生产入库及倒冲领料单
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueServiceImpl.java | 80 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 80 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueServiceImpl.java
index 24053ea..3f13334 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueServiceImpl.java
@@ -12,12 +12,18 @@
import cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.MesWmProductIssuePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.MesWmProductIssueSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.feedback.MesProFeedbackDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskIssueDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemconsume.MesWmItemConsumeDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemconsume.MesWmItemConsumeDetailDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemconsume.MesWmItemConsumeLineDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productissue.MesWmProductIssueDetailDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productissue.MesWmProductIssueDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productissue.MesWmProductIssueLineDO;
import cn.iocoder.yudao.module.mes.dal.mysql.pro.task.MesProTaskIssueMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.productissue.MesWmProductIssueDetailMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.wm.productissue.MesWmProductIssueLineMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.wm.productissue.MesWmProductIssueMapper;
import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmProductIssueStatusEnum;
@@ -29,6 +35,8 @@
import cn.iocoder.yudao.module.mes.service.pro.task.MesProTaskIssueService;
import cn.iocoder.yudao.module.mes.service.pro.task.MesProTaskService;
import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
+import cn.iocoder.yudao.module.mes.service.wm.itemconsume.MesWmItemConsumeDetailService;
+import cn.iocoder.yudao.module.mes.service.wm.itemconsume.MesWmItemConsumeLineService;
import cn.iocoder.yudao.module.mes.service.wm.stockreserve.MesWmStockReserveService;
import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService;
import cn.iocoder.yudao.module.mes.service.wm.transaction.dto.MesWmTransactionSaveReqDTO;
@@ -63,11 +71,19 @@
@Resource
private MesWmProductIssueMapper issueMapper;
+ @Resource
+ private MesWmProductIssueLineMapper issueLineMapper;
+ @Resource
+ private MesWmProductIssueDetailMapper issueDetailMapper;
@Resource
private MesWmProductIssueLineService issueLineService;
@Resource
private MesWmProductIssueDetailService issueDetailService;
+ @Resource
+ private MesWmItemConsumeLineService itemConsumeLineService;
+ @Resource
+ private MesWmItemConsumeDetailService itemConsumeDetailService;
@Resource
private MesMdWorkstationService workstationService;
@Resource
@@ -118,6 +134,70 @@
@Override
@Transactional(rollbackFor = Exception.class)
+ public Long generateBackflushProductIssue(MesProFeedbackDO feedback, MesWmItemConsumeDO consume) {
+ String code = "AUTO-BC-" + consume.getId();
+ MesWmProductIssueDO existing = issueMapper.selectByCode(code);
+ if (existing != null) {
+ return existing.getId();
+ }
+
+ LocalDateTime now = LocalDateTime.now();
+ MesWmProductIssueDO issue = MesWmProductIssueDO.builder()
+ .code(code)
+ .name("鍊掑啿鑷姩棰嗘枡-" + feedback.getCode())
+ .taskId(feedback.getTaskId())
+ .workOrderId(feedback.getWorkOrderId())
+ .workstationId(feedback.getWorkstationId())
+ .issueType(MesWmProductIssueTypeEnum.NORMAL.getType())
+ .issueDate(now)
+ .requiredTime(now)
+ .status(MesWmProductIssueStatusEnum.FINISHED.getStatus())
+ .remark("宸ュ簭鍊掑啿鑷姩鐢熸垚锛岀墿鏂欐秷鑰楀崟ID锛�" + consume.getId())
+ .build();
+ issueMapper.insert(issue);
+
+ List<MesWmItemConsumeLineDO> consumeLines = itemConsumeLineService
+ .getItemConsumeLineListByConsumeId(consume.getId());
+ List<MesWmItemConsumeDetailDO> consumeDetails = itemConsumeDetailService
+ .getItemConsumeDetailListByConsumeId(consume.getId());
+ Map<Long, List<MesWmItemConsumeDetailDO>> detailsByLineId = CollectionUtils.convertMultiMap(
+ consumeDetails, MesWmItemConsumeDetailDO::getLineId);
+
+ for (MesWmItemConsumeLineDO consumeLine : consumeLines) {
+ MesWmProductIssueLineDO issueLine = MesWmProductIssueLineDO.builder()
+ .issueId(issue.getId())
+ .taskId(feedback.getTaskId())
+ .itemId(consumeLine.getItemId())
+ .quantity(consumeLine.getQuantity())
+ .remark("宸ュ簭鍊掑啿鑷姩鐢熸垚")
+ .build();
+ issueLineMapper.insert(issueLine);
+
+ for (MesWmItemConsumeDetailDO consumeDetail : detailsByLineId
+ .getOrDefault(consumeLine.getId(), List.of())) {
+ MesMdItemDO item = mdmItemService.getItem(consumeDetail.getItemId());
+ Long mdmItemId = item != null && item.getMdmItemId() != null
+ ? item.getMdmItemId() : consumeDetail.getItemId();
+ issueDetailMapper.insert(MesWmProductIssueDetailDO.builder()
+ .issueId(issue.getId())
+ .lineId(issueLine.getId())
+ .materialStockId(consumeDetail.getMaterialStockId())
+ .itemId(mdmItemId)
+ .quantity(consumeDetail.getQuantity())
+ .batchId(consumeDetail.getBatchId())
+ .batchCode(consumeDetail.getBatchCode())
+ .warehouseId(consumeDetail.getWarehouseId())
+ .locationId(consumeDetail.getLocationId())
+ .areaId(consumeDetail.getAreaId())
+ .remark("宸ュ簭鍊掑啿鑷姩鐢熸垚")
+ .build());
+ }
+ }
+ return issue.getId();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
public void updateProductIssue(MesWmProductIssueSaveReqVO updateReqVO) {
// 1.1 鏍￠獙瀛樺湪 + 鍑嗗涓姸鎬�
validateProductIssueExistsAndPrepare(updateReqVO.getId());
--
Gitblit v1.9.3