From 8e4eee5ad4d74e1a4e6ab4de3a9c28000700dce0 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 03 十一月 2026 13:49:04 +0800
Subject: [PATCH] 修复采购退货页面 ERP 模块已禁用报错
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productissue/MesWmProductIssueServiceImpl.java | 169 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 168 insertions(+), 1 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 0856972..fedb307 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
@@ -2,14 +2,20 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
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.controller.admin.wm.productissue.vo.MesWmProductIssueSupplementReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.productissue.vo.line.MesWmProductIssueLineSaveReqVO;
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.workorder.MesProWorkOrderDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderBomDO;
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;
@@ -18,12 +24,15 @@
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.MesWmProductIssueTypeEnum;
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.autocode.MesMdAutoCodeRecordService;
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.MesProWorkOrderBomService;
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;
@@ -41,6 +50,7 @@
import java.math.BigDecimal;
import java.time.LocalDateTime;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -66,6 +76,8 @@
@Resource
private MesProWorkOrderService workOrderService;
@Resource
+ private MesProWorkOrderBomService workOrderBomService;
+ @Resource
private MesProTaskService taskService;
@Resource
private MesProTaskIssueService taskIssueService;
@@ -83,6 +95,8 @@
private MesWmWarehouseAreaService areaService;
@Resource
private MesWmStockReserveService stockReserveService;
+ @Resource
+ private MesMdAutoCodeRecordService autoCodeRecordService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -103,6 +117,146 @@
MesWmProductIssueDO issue = BeanUtils.toBean(createReqVO, MesWmProductIssueDO.class);
issue.setStatus(MesWmProductIssueStatusEnum.PREPARE.getStatus());
issueMapper.insert(issue);
+ return issue.getId();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Long generateByWorkOrder(Long workOrderId) {
+ // 1. 宸ュ崟蹇呴』宸茬‘璁わ細鑽夌鏈紑宸ャ�佸凡瀹屾垚銆佸凡鍙栨秷閮戒笉闇�瑕佸啀鐢熸垚棰嗘枡浠诲姟
+ MesProWorkOrderDO workOrder = workOrderService.validateWorkOrderConfirmed(workOrderId);
+ // 2. BOM 鐗╂枡娓呭崟涓虹┖鏃舵棤娉曟帹绠楀簲棰嗘暟閲�
+ List<MesProWorkOrderBomDO> boms = workOrderBomService.getWorkOrderBomListByWorkOrderId(workOrderId);
+ if (CollUtil.isEmpty(boms)) {
+ throw new ServiceException(WM_PRODUCT_ISSUE_GENERATE_BOM_EMPTY.getCode(),
+ "鐢熶骇宸ュ崟[" + workOrder.getCode() + "]鐨� BOM 鐗╂枡娓呭崟涓虹┖锛屾棤娉曠敓鎴愰鏂欎换鍔°��"
+ + "璇峰厛鍦ㄨ宸ュ崟鐨� BOM 鐗╂枡涓淮鎶ら渶瑕侀鐢ㄧ殑鍘熻緟鏂欏強鐢ㄩ噺");
+ }
+ // 3. 缁熻璇ュ伐鍗曚笅宸查鏁伴噺锛堟帓闄ゅ凡鍙栨秷鐨勯鏂欏崟锛岄伩鍏嶆妸浣滃簾鍗曟嵁绠楁垚宸查锛�
+ Map<Long, BigDecimal> issuedQuantityMap = getIssuedQuantityMap(workOrderId);
+ BigDecimal planQuantity = workOrder.getQuantity() != null ? workOrder.getQuantity() : BigDecimal.ZERO;
+
+ // 4. 閫愮墿鏂欒绠楁湰娆″簲棰嗘暟閲� = BOM 鍗曡�� 脳 宸ュ崟璁″垝鏁伴噺 - 宸查鏁伴噺
+ List<MesWmProductIssueLineSaveReqVO> lines = new java.util.ArrayList<>();
+ for (MesProWorkOrderBomDO bom : boms) {
+ if (bom.getQuantity() == null) {
+ continue;
+ }
+ BigDecimal required = bom.getQuantity().multiply(planQuantity);
+ BigDecimal issued = issuedQuantityMap.getOrDefault(bom.getItemId(), BigDecimal.ZERO);
+ BigDecimal remain = required.subtract(issued);
+ if (remain.compareTo(BigDecimal.ZERO) <= 0) {
+ continue;
+ }
+ lines.add(new MesWmProductIssueLineSaveReqVO()
+ .setItemId(bom.getItemId()).setQuantity(remain)
+ .setRemark("宸ュ崟搴旈 " + required.stripTrailingZeros().toPlainString()
+ + "锛屽凡棰� " + issued.stripTrailingZeros().toPlainString()
+ + "锛屾湰娆¤ˉ瓒� " + remain.stripTrailingZeros().toPlainString()));
+ }
+ if (lines.isEmpty()) {
+ throw new ServiceException(WM_PRODUCT_ISSUE_GENERATE_ALL_ISSUED.getCode(),
+ "鐢熶骇宸ュ崟[" + workOrder.getCode() + "]鎸� BOM 搴旈鐨� " + boms.size() + " 绉嶇墿鏂欏凡鍏ㄩ儴棰嗚繃锛�"
+ + "鏃犻渶閲嶅鐢熸垚棰嗘枡浠诲姟銆傚闇�缁х画棰嗙敤锛岃浣跨敤銆愯ˉ棰嗚緟鏂欍�戝苟濉啓琛ラ鍘熷洜");
+ }
+
+ // 5. 鍙栬宸ュ崟涓嬬殑绗竴閬撶敓浜т换鍔★紝浣滀负棰嗘枡鍗曠殑浠诲姟涓庡伐浣滅珯褰掑睘
+ List<MesProTaskDO> tasks = taskService.getTaskListByWorkOrderIds(Collections.singletonList(workOrderId));
+ MesProTaskDO firstTask = CollUtil.isEmpty(tasks) ? null : tasks.get(0);
+ Long taskId = firstTask != null ? firstTask.getId() : null;
+ Long workstationId = firstTask != null ? firstTask.getWorkstationId() : null;
+
+ // 6. 鐢熸垚鑽夌棰嗘枡鍑哄簱鍗�
+ MesWmProductIssueDO issue = new MesWmProductIssueDO()
+ .setCode(autoCodeRecordService.generateAutoCode("WM_PRODUCT_ISSUE_CODE"))
+ .setName("棰嗘枡-" + workOrder.getCode())
+ .setIssueType(MesWmProductIssueTypeEnum.NORMAL.getType())
+ .setWorkOrderId(workOrder.getId())
+ .setTaskId(taskId)
+ .setWorkstationId(workstationId)
+ .setRequiredTime(LocalDateTime.now())
+ .setStatus(MesWmProductIssueStatusEnum.PREPARE.getStatus())
+ .setRemark("鏍规嵁鐢熶骇宸ュ崟[" + workOrder.getCode() + "]鐨� BOM 鐗╂枡娓呭崟鑷姩鐢熸垚");
+ issueMapper.insert(issue);
+ // 7. 鐢熸垚棰嗘枡琛�
+ for (MesWmProductIssueLineSaveReqVO line : lines) {
+ line.setIssueId(issue.getId()).setTaskId(taskId);
+ issueLineService.createProductIssueLine(line);
+ }
+ return issue.getId();
+ }
+
+ /**
+ * 缁熻鏌愬伐鍗曚笅鍚勭墿鏂欏凡棰嗘暟閲忥紙鍙粺璁℃湭鍙栨秷鐨勯鏂欏崟锛�
+ */
+ private Map<Long, BigDecimal> getIssuedQuantityMap(Long workOrderId) {
+ List<MesWmProductIssueDO> issues = issueMapper.selectListByWorkOrderId(workOrderId);
+ List<Long> issueIds = issues.stream()
+ .filter(issue -> ObjUtil.notEqual(issue.getStatus(), MesWmProductIssueStatusEnum.CANCELED.getStatus()))
+ .map(MesWmProductIssueDO::getId).toList();
+ if (CollUtil.isEmpty(issueIds)) {
+ return java.util.Collections.emptyMap();
+ }
+ List<MesWmProductIssueLineDO> lines = issueLineService.getProductIssueLineListByIssueIds(issueIds);
+ Map<Long, BigDecimal> result = new java.util.HashMap<>();
+ for (MesWmProductIssueLineDO line : lines) {
+ if (line.getQuantity() == null) {
+ continue;
+ }
+ result.merge(line.getItemId(), line.getQuantity(), BigDecimal::add);
+ }
+ return result;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Long createSupplementIssue(MesWmProductIssueSupplementReqVO reqVO) {
+ // 1. 鏍￠獙宸ュ崟宸茬‘璁わ紙鏈‘璁ょ殑宸ュ崟涓嶅厑璁歌ˉ棰嗭紝閬垮厤琛ラ鎸傚埌涓嶅瓨鍦ㄧ殑鐢熶骇浠诲姟涓婏級
+ MesProWorkOrderDO workOrder = workOrderService.validateWorkOrderConfirmed(reqVO.getWorkOrderId());
+ // 2.1 琛ラ鍘熷洜蹇呭～
+ if (StrUtil.isBlank(reqVO.getReason())) {
+ throw exception(WM_PRODUCT_ISSUE_SUPPLEMENT_REASON_REQUIRED);
+ }
+ // 2.2 鐗╂枡蹇呴』瀛樺湪涓斿惎鐢�
+ mdmItemService.validateItemExistsAndEnable(reqVO.getItemId());
+ // 3.1 鏈寚瀹氫换鍔℃椂锛屽彇璇ュ伐鍗曚笅鐨勭涓�閬撶敓浜т换鍔�
+ Long taskId = reqVO.getTaskId();
+ Long workstationId = reqVO.getWorkstationId();
+ if (taskId == null) {
+ List<MesProTaskDO> tasks = taskService.getTaskListByWorkOrderIds(
+ Collections.singletonList(reqVO.getWorkOrderId()));
+ MesProTaskDO firstTask = CollUtil.isEmpty(tasks) ? null : tasks.get(0);
+ if (firstTask != null) {
+ taskId = firstTask.getId();
+ if (workstationId == null) {
+ workstationId = firstTask.getWorkstationId();
+ }
+ }
+ } else {
+ MesProTaskDO task = taskService.validateTaskExists(taskId);
+ if (workstationId == null) {
+ workstationId = task.getWorkstationId();
+ }
+ }
+
+ // 4.1 鍒涘缓琛ラ涓昏〃锛堣崏绋匡紝鍚庣画璧� 鎻愪氦 鈫� 鎷ｈ揣 鈫� 瀹屾垚锛�
+ MesWmProductIssueDO issue = new MesWmProductIssueDO()
+ .setCode(autoCodeRecordService.generateAutoCode("WM_PRODUCT_ISSUE_CODE"))
+ .setName("琛ラ-" + workOrder.getCode())
+ .setIssueType(MesWmProductIssueTypeEnum.SUPPLEMENT.getType())
+ .setSupplementReason(reqVO.getReason())
+ .setWorkOrderId(workOrder.getId())
+ .setTaskId(taskId)
+ .setWorkstationId(workstationId)
+ .setRequiredTime(reqVO.getRequiredTime() != null ? reqVO.getRequiredTime() : LocalDateTime.now())
+ .setStatus(MesWmProductIssueStatusEnum.PREPARE.getStatus())
+ .setRemark(reqVO.getRemark());
+ issueMapper.insert(issue);
+ // 4.2 鍒涘缓琛ラ琛�
+ issueLineService.createProductIssueLine(new MesWmProductIssueLineSaveReqVO()
+ .setIssueId(issue.getId()).setTaskId(taskId)
+ .setItemId(reqVO.getItemId()).setQuantity(reqVO.getQuantity())
+ .setRemark("琛ラ鍘熷洜锛�" + reqVO.getReason()));
return issue.getId();
}
@@ -248,7 +402,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()));
@@ -398,6 +552,14 @@
*/
private void validateProductIssueSaveData(MesWmProductIssueSaveReqVO reqVO) {
validateCodeUnique(reqVO.getId(), reqVO.getCode());
+ // 棰嗘枡绫诲瀷锛氫负绌烘寜姝ｅ父棰嗘枡澶勭悊锛涜ˉ棰嗚緟鏂欏繀椤诲～鍐欒ˉ棰嗗師鍥�
+ if (reqVO.getIssueType() == null) {
+ reqVO.setIssueType(MesWmProductIssueTypeEnum.NORMAL.getType());
+ }
+ if (MesWmProductIssueTypeEnum.SUPPLEMENT.getType().equals(reqVO.getIssueType())
+ && StrUtil.isBlank(reqVO.getSupplementReason())) {
+ throw exception(WM_PRODUCT_ISSUE_SUPPLEMENT_REASON_REQUIRED);
+ }
// 鏍￠獙 task 瀛樺湪
MesProTaskDO task = taskService.validateTaskExists(reqVO.getTaskId());
// 鏍￠獙 task 鍏宠仈鐨勫伐鍗曞凡纭
@@ -410,4 +572,9 @@
}
}
+ @Override
+ public List<MesWmProductIssueDO> getFinishedIssuesByWorkOrderId(Long workOrderId) {
+ return issueMapper.selectListByWorkOrderIdAndStatus(workOrderId, MesWmProductIssueStatusEnum.FINISHED.getStatus());
+ }
+
}
--
Gitblit v1.9.3