From 8c65f898ed6e5b0c7a94c792c4562f6ec831dccd Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 07 十一月 2026 08:50:53 +0800
Subject: [PATCH] feat: 完善质检、生产、销售、财务与人事模块并接入审批流程
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueServiceImpl.java
index c84bcc0..efd17b7 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueServiceImpl.java
@@ -251,7 +251,7 @@
.setWarehouseId(virtualWarehouse.getId()).setLocationId(virtualLocation.getId()).setAreaId(virtualArea.getId())
.setMaterialStockId(detail.getMaterialStockId()) // 鎸囧畾铏氭嫙绾胯竟搴撳簱瀛樿褰�
.setCheckFlag(false) // 绾胯竟搴撳厑璁歌礋搴撳瓨
- .setBizType(MesBizTypeConstants.WM_RETURN_ISSUE).setBizId(issue.getId())
+ .setBizType(MesBizTypeConstants.WM_RETURN_ISSUE).setBizId(issue.getId()).setWorkOrderId(issue.getWorkOrderId())
.setBizCode(issue.getCode()).setBizLineId(detail.getLineId()));
// 2.2 纭畾涓婃灦鐩爣浠撳簱锛歞etail 鐨� warehouseId/locationId/areaId 鏄笂鏋剁洰鏍囷紙瀹為檯浠撳簱锛�
@@ -268,13 +268,14 @@
}
}
- // 2.3 鍏ヤ笂鏋剁洰鏍囦粨搴擄紙搴撳瓨澧炲姞锛�
+ // 2.3 鍏ヤ笂鏋剁洰鏍囦粨搴擄紙搴撳瓨澧炲姞锛夆�� 濮嬬粓鍒涘缓鏂扮殑搴撳瓨璁板綍锛屼笉鏇存柊宸叉湁璁板綍
wmTransactionService.createTransaction(new MesWmTransactionSaveReqDTO()
.setType(MesWmTransactionTypeEnum.IN.getType()).setItemId(detail.getItemId())
.setQuantity(detail.getQuantity()) // 搴撳瓨澧炲姞锛堥��鏂欏洖浠擄級
.setBatchId(detail.getBatchId()).setBatchCode(detail.getBatchCode())
.setWarehouseId(targetWarehouseId).setLocationId(targetLocationId).setAreaId(targetAreaId)
- .setBizType(MesBizTypeConstants.WM_RETURN_ISSUE).setBizId(issue.getId())
+ .setForceCreateNewStock(true) // 寮哄埗鍒涘缓鏂板簱瀛樿褰�
+ .setBizType(MesBizTypeConstants.WM_RETURN_ISSUE).setBizId(issue.getId()).setWorkOrderId(issue.getWorkOrderId())
.setBizCode(issue.getCode()).setBizLineId(detail.getLineId())
.setRelatedTransactionId(outTransactionId)); // 鍏宠仈鍑哄簱浜嬪姟
}
--
Gitblit v1.9.3