From d39e4f7d839167c16425086dfa2f8747bccfdff9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 05 十一月 2026 17:39:01 +0800
Subject: [PATCH] feat: 打通销售采购财务闭环并完成累计业务优化
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImpl.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImpl.java
index c80507d..35288c5 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImpl.java
@@ -113,6 +113,12 @@
MesWmProductSalesStatusEnum.FINISHED.getStatus()) == 0) {
throw exception(WM_RETURN_SALES_BATCH_NOT_SHIPPED);
}
+ // 鎵嬪伐鍏ュ簱鎵规鍙兘娌℃湁瀹㈡埛锛涗粎鍦ㄨ鍗曠洏鍙峰強宸插畬鎴愬嚭搴撻兘宸查獙璇佸悗鍏佽閫�璐с��
+ if (batch != null && (batch.getClientId() != null || reelNumbers.isEmpty())) {
+ batchService.validateBatchExists(batch.getId(), reqVO.getItemId(), returnSales.getClientId(), null);
+ }
+ } else if (batch != null) {
+ batchService.validateBatchExists(batch.getId(), reqVO.getItemId(), returnSales.getClientId(), null);
}
}
@@ -179,7 +185,7 @@
/**
* 鏍￠獙鐗╂枡鎵规绠＄悊
*
- * @param returnId 閫�璐у崟ID
+ * @param returnSales 閫�璐у崟
* @param itemId 鐗╂枡ID
* @param batchId 鎵规ID
*/
@@ -191,8 +197,7 @@
}
// 鏍￠獙鎵规瀛樺湪涓斿睘浜庡綋鍓嶇墿鏂欏拰瀹㈡埛
if (batchId != null) {
- // 浠庣埗鍗曡幏鍙栧鎴稩D锛屾牎楠屾壒娆″綊灞�
- return batchService.validateBatchExists(batchId, itemId, returnSales.getClientId(), null);
+ return batchService.validateBatchExists(batchId, itemId);
}
return null;
}
--
Gitblit v1.9.3