From 274dd8b724dd4485658e1d2a3f825a007f625bd7 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 17 七月 2026 09:10:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueServiceImpl.java | 75 +++++++++++++++++++++++++++++++++++--
1 files changed, 70 insertions(+), 5 deletions(-)
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 41d05d5..529c4df 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
@@ -10,9 +10,12 @@
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.vo.MesWmReturnIssuePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.returnissue.vo.MesWmReturnIssueSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.mdm.MesMdmItemDO;
+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.returnissue.MesWmReturnIssueDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnissue.MesWmReturnIssueDetailDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnissue.MesWmReturnIssueLineDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.pro.task.MesProTaskIssueMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.wm.returnissue.MesWmReturnIssueMapper;
import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum;
@@ -20,6 +23,7 @@
import cn.iocoder.yudao.module.mes.enums.wm.MesWmTransactionTypeEnum;
import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
import cn.iocoder.yudao.module.mes.service.md.workstation.MesMdWorkstationService;
+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.transaction.MesWmTransactionService;
import cn.iocoder.yudao.module.mes.service.wm.transaction.dto.MesWmTransactionSaveReqDTO;
@@ -61,6 +65,10 @@
@Resource
private MesProWorkOrderService workOrderService;
@Resource
+ private MesProTaskService taskService;
+ @Resource
+ private MesProTaskIssueMapper taskIssueMapper;
+ @Resource
private MesMdmItemService mdmItemService;
@Resource
private MesWmTransactionService wmTransactionService;
@@ -77,7 +85,16 @@
// 1. 鏍￠獙鍏宠仈鏁版嵁
validateReturnIssueSaveData(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. 鎻掑叆涓昏〃
MesWmReturnIssueDO issue = BeanUtils.toBean(createReqVO, MesWmReturnIssueDO.class);
issue.setStatus(MesWmReturnIssueStatusEnum.PREPARE.getStatus());
issueMapper.insert(issue);
@@ -92,11 +109,20 @@
// 1.2 鏍￠獙鍏宠仈鏁版嵁
validateReturnIssueSaveData(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. 鏇存柊涓昏〃
MesWmReturnIssueDO updateObj = BeanUtils.toBean(updateReqVO, MesWmReturnIssueDO.class);
issueMapper.updateById(updateObj);
- // 3. 閫�鏂欑被鍨嬪彉鏇存椂锛屽埛鏂版墍鏈夎鐨勮川閲忕姸鎬�
+ // 4. 閫�鏂欑被鍨嬪彉鏇存椂锛屽埛鏂版墍鏈夎鐨勮川閲忕姸鎬�
if (ObjUtil.notEqual(oldIssue.getType(), updateReqVO.getType())) {
issueLineService.updateReturnIssueQualityStatusByIssueId(updateReqVO.getId(), updateReqVO.getType());
}
@@ -192,7 +218,10 @@
// 2. 閬嶅巻鎵�鏈夋槑缁嗭紝鍒涘缓搴撳瓨浜嬪姟锛堝鍔犲簱瀛� + 璁板綍娴佹按锛�
createTransactionList(issue);
- // 3. 鏇存柊閫�鏂欏崟鐘舵��
+ // 3. 鎵ｅ噺浠诲姟鎶曟枡璁板綍鐨勫彲鐢ㄩ噺
+ updateTaskIssueOnReturn(issue);
+
+ // 4. 鏇存柊閫�鏂欏崟鐘舵��
issueMapper.updateById(new MesWmReturnIssueDO()
.setId(id).setStatus(MesWmReturnIssueStatusEnum.FINISHED.getStatus()));
}
@@ -224,6 +253,36 @@
.setBizType(MesBizTypeConstants.WM_RETURN_ISSUE).setBizId(issue.getId())
.setBizCode(issue.getCode()).setBizLineId(detail.getLineId())
.setRelatedTransactionId(outTransactionId)); // 鍏宠仈鍑哄簱浜嬪姟
+ }
+ }
+
+ /**
+ * 閫�鏂欏畬鎴愭椂锛屾墸鍑忎换鍔℃姇鏂欒褰曠殑鍙敤閲�
+ * 鎸夎閬嶅巻锛屾壘鍒板搴旂殑 task_issue 璁板綍锛屾墸鍑� availableQuantity銆乮ssuedQuantity
+ */
+ private void updateTaskIssueOnReturn(MesWmReturnIssueDO issue) {
+ List<MesWmReturnIssueLineDO> lines = issueLineService.getReturnIssueLineListByIssueId(issue.getId());
+ if (CollUtil.isEmpty(lines)) {
+ return;
+ }
+ for (MesWmReturnIssueLineDO line : lines) {
+ Long taskId = line.getTaskId() != null ? line.getTaskId() : issue.getTaskId();
+ if (taskId == null) {
+ continue;
+ }
+ // 鏌ユ壘璇� task + item + 鏉ユ簮涓洪鏂欏嚭搴撳崟 鐨勬姇鏂欒褰�
+ List<MesProTaskIssueDO> taskIssues = taskIssueMapper.selectListByTaskId(taskId);
+ MesProTaskIssueDO matchedIssue = CollUtil.findOne(taskIssues,
+ ti -> ti.getItemId().equals(line.getItemId())
+ && "PRODUCT_ISSUE".equals(ti.getSourceDocType()));
+ if (matchedIssue != null) {
+ // 鎵ｅ噺鎶曟枡閲忓拰鍙敤閲�
+ BigDecimal newIssuedQty = matchedIssue.getIssuedQuantity().subtract(line.getQuantity());
+ BigDecimal newAvailableQty = matchedIssue.getAvailableQuantity().subtract(line.getQuantity());
+ matchedIssue.setIssuedQuantity(newIssuedQty.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : newIssuedQty);
+ matchedIssue.setAvailableQuantity(newAvailableQty.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : newAvailableQty);
+ taskIssueMapper.updateById(matchedIssue);
+ }
}
}
@@ -289,7 +348,13 @@
*/
private void validateReturnIssueSaveData(MesWmReturnIssueSaveReqVO 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