From dd637406e18a7afbf08d323c6ece913fe545b7ad Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 28 十月 2026 18:11:32 +0800
Subject: [PATCH] feat(mes): 增加盘号追溯功能和销售退货单优化
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeLineServiceImpl.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeLineServiceImpl.java
index 7f40f15..94373e8 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeLineServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeLineServiceImpl.java
@@ -2,6 +2,7 @@
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.module.erp.api.sale.ErpSaleOrderApi;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.mes.controller.admin.wm.salesnotice.vo.line.MesWmSalesNoticeLinePageReqVO;
@@ -40,6 +41,8 @@
private MesWmBatchService batchService;
@Resource
private MesMdmItemService mdmItemService;
+ @Resource
+ private ErpSaleOrderApi saleOrderApi;
@Override
public Long createSalesNoticeLine(MesWmSalesNoticeLineSaveReqVO createReqVO) {
@@ -59,6 +62,9 @@
MesWmSalesNoticeLineDO line = validateSalesNoticeLineExists(updateReqVO.getId());
// 鏍￠獙鏁版嵁
updateReqVO.setNoticeId(line.getNoticeId());
+ if (updateReqVO.getSaleOrderItemId() == null) {
+ updateReqVO.setSaleOrderItemId(line.getSaleOrderItemId());
+ }
validateLineSaveData(updateReqVO);
// 鏇存柊
@@ -120,6 +126,17 @@
private void validateLineSaveData(MesWmSalesNoticeLineSaveReqVO reqVO) {
// 鏍￠獙鐖跺崟鎹瓨鍦ㄤ笖涓鸿崏绋跨姸鎬�
validateNoticeStatusDraft(reqVO.getNoticeId());
+ MesWmSalesNoticeDO notice = salesNoticeService.getSalesNotice(reqVO.getNoticeId());
+ if (notice.getSaleOrderId() != null && reqVO.getSaleOrderItemId() == null) {
+ throw exception(WM_SALES_NOTICE_LINE_SALE_ITEM_REQUIRED);
+ }
+ if (reqVO.getSaleOrderItemId() != null) {
+ var saleItem = saleOrderApi.getSaleOrderItem(reqVO.getSaleOrderItemId()).getCheckedData();
+ if (saleItem == null || !ObjUtil.equal(notice.getSaleOrderId(), saleItem.getOrderId())
+ || !ObjUtil.equal(reqVO.getItemId(), saleItem.getProductId())) {
+ throw exception(WM_SALES_NOTICE_LINE_SALE_ITEM_MISMATCH);
+ }
+ }
// 鏍￠獙鐗╂枡瀛樺湪
if (reqVO.getItemId() != null) {
mdmItemService.validateItemExistsAndEnable(reqVO.getItemId());
--
Gitblit v1.9.3