From 38d39b8c11096668d1a49eea84bbec298489d23e Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期一, 07 九月 2026 16:44:27 +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/MesWmReturnIssueDetailServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueDetailServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueDetailServiceImpl.java
index fec1bfe..be3e1bd 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueDetailServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueDetailServiceImpl.java
@@ -18,6 +18,8 @@
import java.math.BigDecimal;
import java.util.List;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
@@ -123,9 +125,10 @@
if (stock == null) {
throw exception(WM_MATERIAL_STOCK_NOT_EXISTS);
}
- // 鏍￠獙鐗╂枡鍜屾壒娆′竴鑷�
+ // 鏍￠獙鐗╂枡涓�鑷达細姝ゅ鍙瘮瀵圭墿鏂欙紝鍥犱负鏉ユ簮搴撳瓨(绾胯竟/铏氭嫙浠�)涓庝笂鏋剁洰鏍囦粨搴撴湰灏变笉鍚屽睘姝ｅ父
if (ObjUtil.notEqual(stock.getItemId(), reqVO.getItemId())) {
- throw exception(WM_MATERIAL_STOCK_SELECTION_MISMATCH);
+ throw new ServiceException(WM_MATERIAL_STOCK_SELECTION_MISMATCH.getCode(),
+ "鎵�閫夋潵婧愬簱瀛樺綊灞炵墿鏂欎笌褰撳墠閫�璐х墿鏂欎笉涓�鑷达紝璇烽噸鏂伴�夋嫨鏉ユ簮搴撳瓨");
}
// 鏍￠獙搴撳瓨鏁伴噺鍏呰冻
if (reqVO.getQuantity() != null && stock.getQuantity() != null
--
Gitblit v1.9.3