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/materialstock/MesWmMaterialStockServiceImpl.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java
index d4a42da..ef8e9ff 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java
@@ -399,7 +399,7 @@
} else {
// 鍑哄簱鏃舵牎楠屾壒娆″瓨鍦�
if (batchId != null) {
- batchService.validateBatchExists(batchId, reqVO.getItemId());
+ batchCode = batchService.validateBatchExists(batchId, reqVO.getItemId()).getCode();
}
}
@@ -457,16 +457,16 @@
* @return 鎵规璁板綍锛堢墿鏂欐湭鍚敤鎵规绠＄悊鏃惰繑鍥� null锛�
*/
private MesWmBatchDO resolveBatch(MesWmMaterialStockAdjustReqVO reqVO, MesMdmItemDO item) {
- // 1. 鐗╂枡鏈惎鐢ㄦ壒娆＄鐞嗭紝杩斿洖 null
- if (Boolean.FALSE.equals(item.getIsBatchManaged())) {
- return null;
- }
-
- // 2. 浼犲叆 batchId锛屾牎楠屽苟杩斿洖宸叉湁鎵规
+ // 鍗充娇鐗╂枡鏈惎鐢ㄦ櫘閫氭壒娆＄鐞嗭紝涔熻淇濈暀骞舵牎楠岀洏鍙疯拷婧壒娆°��
if (reqVO.getBatchId() != null) {
return batchService.validateBatchExists(reqVO.getBatchId(), reqVO.getItemId());
}
+ // 1. 鏈寚瀹氳拷婧壒娆′笖鐗╂枡鏈惎鐢ㄦ壒娆＄鐞嗭紝杩斿洖 null
+ if (Boolean.FALSE.equals(item.getIsBatchManaged())) {
+ return null;
+ }
+
// 3. 鏈紶 batchId锛岃嚜鍔ㄥ垱寤烘壒娆�
MesWmBatchGenerateReqVO batchReqVO = new MesWmBatchGenerateReqVO()
.setItemId(reqVO.getItemId())
--
Gitblit v1.9.3