From 5140e16bd1cb2bdf974d47a4342f9e27ef804655 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 18 七月 2026 15:54:07 +0800
Subject: [PATCH] feat(erp): 增加销售订单MPS集成与发货通知单控制功能
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueServiceImpl.java | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 109 insertions(+), 5 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 b193252..ee24926 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
@@ -8,15 +8,22 @@
import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
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.task.MesProTaskDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskIssueDO;
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.MesWmProductIssueMapper;
import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmProductIssueStatusEnum;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmStockReserveBizTypeEnum;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmTransactionTypeEnum;
+import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService;
+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.stockreserve.MesWmStockReserveService;
import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService;
@@ -35,6 +42,7 @@
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
+import java.util.Map;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
@@ -58,6 +66,14 @@
@Resource
private MesProWorkOrderService workOrderService;
@Resource
+ private MesProTaskService taskService;
+ @Resource
+ private MesProTaskIssueService taskIssueService;
+ @Resource
+ private MesProTaskIssueMapper taskIssueMapper;
+ @Resource
+ private MesMdItemService mdmItemService;
+ @Resource
private MesWmTransactionService wmTransactionService;
@Resource
private MesWmWarehouseService warehouseService;
@@ -74,7 +90,16 @@
// 1. 鏍￠獙鍏宠仈鏁版嵁
validateProductIssueSaveData(createReqVO);
- // 2. 鎻掑叆涓昏〃
+ // 2. 浠� task 鑷姩甯﹀叆 workOrderId 鍜� workstationId
+ MesProTaskDO task = taskService.validateTaskExists(createReqVO.getTaskId());
+ if (createReqVO.getWorkOrderId() == null) {
+ createReqVO.setWorkOrderId(task.getWorkOrderId());
+ }
+ if (createReqVO.getWorkstationId() == null) {
+ createReqVO.setWorkstationId(task.getWorkstationId());
+ }
+
+ // 3. 鎻掑叆涓昏〃
MesWmProductIssueDO issue = BeanUtils.toBean(createReqVO, MesWmProductIssueDO.class);
issue.setStatus(MesWmProductIssueStatusEnum.PREPARE.getStatus());
issueMapper.insert(issue);
@@ -89,7 +114,16 @@
// 1.2 鏍￠獙鍏宠仈鏁版嵁
validateProductIssueSaveData(updateReqVO);
- // 2. 鏇存柊涓昏〃
+ // 2. 浠� task 鑷姩甯﹀叆 workOrderId 鍜� workstationId
+ MesProTaskDO task = taskService.validateTaskExists(updateReqVO.getTaskId());
+ if (updateReqVO.getWorkOrderId() == null) {
+ updateReqVO.setWorkOrderId(task.getWorkOrderId());
+ }
+ if (updateReqVO.getWorkstationId() == null) {
+ updateReqVO.setWorkstationId(task.getWorkstationId());
+ }
+
+ // 3. 鏇存柊涓昏〃
MesWmProductIssueDO updateObj = BeanUtils.toBean(updateReqVO, MesWmProductIssueDO.class);
issueMapper.updateById(updateObj);
}
@@ -192,7 +226,10 @@
// 3. 閬嶅巻鎵�鏈夋槑缁嗭紝鍒涘缓搴撳瓨浜嬪姟锛堟墸鍑忓簱瀛� + 璁板綍娴佹按锛�
createTransactionList(issue);
- // 4. 鏇存柊鍑哄簱鍗曠姸鎬� + 棰嗘枡鏃ユ湡
+ // 4. 鑷姩鍒涘缓浠诲姟鎶曟枡璁板綍
+ createTaskIssueRecords(issue);
+
+ // 5. 鏇存柊鍑哄簱鍗曠姸鎬� + 棰嗘枡鏃ユ湡
issueMapper.updateById(new MesWmProductIssueDO()
.setId(id).setStatus(MesWmProductIssueStatusEnum.FINISHED.getStatus())
.setIssueDate(LocalDateTime.now()));
@@ -211,7 +248,7 @@
Long outTransactionId = wmTransactionService.createTransaction(new MesWmTransactionSaveReqDTO()
.setType(MesWmTransactionTypeEnum.OUT.getType()).setItemId(detail.getItemId())
.setQuantity(detail.getQuantity().negate()) // 搴撳瓨鍑忓皯
- .setBatchId(detail.getBatchId()).setBatchCode(detail.getBatchCode())
+ .setBatchId(detail.getBatchId()).setBatchCode(detail.getBatchCode()).setMaterialStockId(detail.getMaterialStockId())
.setWarehouseId(detail.getWarehouseId()).setLocationId(detail.getLocationId()).setAreaId(detail.getAreaId())
.setBizType(MesBizTypeConstants.WM_ISSUE).setBizId(issue.getId())
.setBizCode(issue.getCode()).setBizLineId(detail.getLineId()));
@@ -224,6 +261,64 @@
.setBizType(MesBizTypeConstants.WM_ISSUE).setBizId(issue.getId())
.setBizCode(issue.getCode()).setBizLineId(detail.getLineId())
.setRelatedTransactionId(outTransactionId)); // 鍏宠仈鍑哄簱浜嬪姟
+ }
+ }
+
+ /**
+ * 棰嗘枡鍑哄簱瀹屾垚鏃讹紝鑷姩鍒涘缓浠诲姟鎶曟枡璁板綍
+ * 鎸夎閬嶅巻锛屾瘡琛屽垱寤轰竴鏉� task_issue 璁板綍
+ */
+ private void createTaskIssueRecords(MesWmProductIssueDO issue) {
+ List<MesWmProductIssueLineDO> lines = issueLineService.getProductIssueLineListByIssueId(issue.getId());
+ if (CollUtil.isEmpty(lines)) {
+ return;
+ }
+
+ // 鎵归噺鏌ヨ鐗╂枡淇℃伅锛堣幏鍙� unitMeasureId锛�
+ Map<Long, MesMdItemDO> itemMap = mdmItemService.getItemMap(
+ CollectionUtils.convertSet(lines, MesWmProductIssueLineDO::getItemId));
+
+ // 鑾峰彇鏄庣粏鍒楄〃锛岀敤浜庢彁鍙� batchCode
+ List<MesWmProductIssueDetailDO> details = issueDetailService.getProductIssueDetailListByIssueId(issue.getId());
+ Map<Long, List<MesWmProductIssueDetailDO>> detailMapByLineId = CollectionUtils.convertMultiMap(
+ details, MesWmProductIssueDetailDO::getLineId);
+
+ for (MesWmProductIssueLineDO line : lines) {
+ // 琛岀殑 taskId 浼樺厛锛屽惁鍒欏彇涓昏〃鐨� taskId
+ Long taskId = line.getTaskId() != null ? line.getTaskId() : issue.getTaskId();
+ if (taskId == null) {
+ continue;
+ }
+
+ // 鑾峰彇鐗╂枡鍗曚綅
+ MesMdItemDO item = itemMap.get(line.getItemId());
+ Long unitMeasureId = item != null ? item.getUnitMeasureId() : null;
+
+ // 鑾峰彇鎵规鍙凤細鍙栬琛岀涓�涓槑缁嗙殑 batchCode
+ String batchCode = null;
+ List<MesWmProductIssueDetailDO> lineDetails = detailMapByLineId.get(line.getId());
+ if (CollUtil.isNotEmpty(lineDetails)) {
+ MesWmProductIssueDetailDO firstDetail = lineDetails.get(0);
+ batchCode = firstDetail.getBatchCode();
+ }
+
+ // 鍒涘缓浠诲姟鎶曟枡璁板綍
+ MesProTaskIssueDO taskIssue = MesProTaskIssueDO.builder()
+ .taskId(taskId)
+ .workOrderId(issue.getWorkOrderId())
+ .workstationId(issue.getWorkstationId())
+ .sourceDocType("PRODUCT_ISSUE")
+ .sourceDocId(issue.getId())
+ .sourceLineId(line.getId())
+ .sourceDocCode(issue.getCode())
+ .batchCode(batchCode)
+ .itemId(line.getItemId())
+ .unitMeasureId(unitMeasureId)
+ .issuedQuantity(line.getQuantity())
+ .availableQuantity(line.getQuantity()) // 鍒濆鍏ㄥ彲鐢�
+ .usedQuantity(BigDecimal.ZERO)
+ .build();
+ taskIssueMapper.insert(taskIssue);
}
}
@@ -241,6 +336,9 @@
// 閲婃斁搴撳瓨鍗犵敤
stockReserveService.releaseReserve(MesWmStockReserveBizTypeEnum.PRODUCT_ISSUE.getType(), id);
+
+ // 鍒犻櫎閫氳繃璇ラ鏂欏崟鍒涘缓鐨勪换鍔℃姇鏂欒褰�
+ taskIssueService.deleteTaskIssueBySourceDoc("PRODUCT_ISSUE", id);
// 鍙栨秷
issueMapper.updateById(new MesWmProductIssueDO()
@@ -300,7 +398,13 @@
*/
private void validateProductIssueSaveData(MesWmProductIssueSaveReqVO reqVO) {
validateCodeUnique(reqVO.getId(), reqVO.getCode());
- workOrderService.validateWorkOrderConfirmed(reqVO.getWorkOrderId());
+ // 鏍￠獙 task 瀛樺湪
+ MesProTaskDO task = taskService.validateTaskExists(reqVO.getTaskId());
+ // 鏍￠獙 task 鍏宠仈鐨勫伐鍗曞凡纭
+ Long workOrderId = reqVO.getWorkOrderId() != null ? reqVO.getWorkOrderId() : task.getWorkOrderId();
+ if (workOrderId != null) {
+ workOrderService.validateWorkOrderConfirmed(workOrderId);
+ }
if (reqVO.getWorkstationId() != null) {
workstationService.validateWorkstationExistsAndEnable(reqVO.getWorkstationId());
}
--
Gitblit v1.9.3