From 85156554438bb13930c89072ee0b7fa93192a7fe Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 16 七月 2026 17:43:30 +0800
Subject: [PATCH] 1.联调优化采购申请到入库的整个逻辑
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java
index eb42a1f..d7124e9 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java
@@ -183,22 +183,28 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Long generateSalesNoticeFromSaleOrder(Long saleOrderId) {
- // 1. 鑾峰彇閿�鍞鍗曚俊鎭�
+ // 1. 鏍￠獙鏄惁宸茬敓鎴愯繃鍙戣揣閫氱煡鍗曪紙闃叉閲嶅鐢熸垚锛�
+ MesWmSalesNoticeDO existNotice = salesNoticeMapper.selectBySaleOrderId(saleOrderId);
+ if (existNotice != null) {
+ throw exception(WM_SALES_NOTICE_ALREADY_EXISTS);
+ }
+
+ // 2. 鑾峰彇閿�鍞鍗曚俊鎭�
ErpSaleOrderRespDTO saleOrder = saleOrderApi.getSaleOrder(saleOrderId).getCheckedData();
if (saleOrder == null) {
throw exception(WM_SALES_NOTICE_SALE_ORDER_NOT_EXISTS);
}
- // 2. 鑾峰彇閿�鍞鍗曟槑缁�
+ // 3. 鑾峰彇閿�鍞鍗曟槑缁�
List<ErpSaleOrderItemRespDTO> saleOrderItems = saleOrderApi.getSaleOrderItemList(saleOrderId).getCheckedData();
if (CollUtil.isEmpty(saleOrderItems)) {
throw exception(WM_SALES_NOTICE_SALE_ORDER_ITEM_EMPTY);
}
- // 3. 鐢熸垚鍙戣揣閫氱煡鍗曠紪鐮�
+ // 4. 鐢熸垚鍙戣揣閫氱煡鍗曠紪鐮�
String code = autoCodeRecordService.generateAutoCode("SALESNOTICE_CODE", null);
- // 4. 鍒涘缓鍙戣揣閫氱煡鍗曚富琛�
+ // 5. 鍒涘缓鍙戣揣閫氱煡鍗曚富琛�
MesWmSalesNoticeDO notice = new MesWmSalesNoticeDO();
notice.setCode(code);
notice.setName("閿�鍞鍗昜" + saleOrder.getNo() + "]鍙戣揣閫氱煡");
@@ -209,7 +215,7 @@
notice.setStatus(PREPARE.getStatus());
salesNoticeMapper.insert(notice);
- // 5. 閬嶅巻鏄庣粏鍒涘缓鍙戣揣閫氱煡鍗曡
+ // 6. 閬嶅巻鏄庣粏鍒涘缓鍙戣揣閫氱煡鍗曡
for (ErpSaleOrderItemRespDTO saleOrderItem : saleOrderItems) {
MesWmSalesNoticeLineDO line = new MesWmSalesNoticeLineDO();
line.setNoticeId(notice.getId());
@@ -315,16 +321,21 @@
throw exception(WM_SALES_NOTICE_STATUS_NOT_APPROVED);
}
- // 2. 鑾峰彇鍙戣揣閫氱煡鍗曡
+ // 2. 鏍￠獙鏄惁宸茬敓鎴愯繃閿�鍞嚭搴撳崟锛堥槻姝㈤噸澶嶇敓鎴愶級
+ if (productSalesMapper.selectByNoticeId(noticeId) != null) {
+ throw exception(WM_PRODUCT_SALES_ALREADY_EXISTS);
+ }
+
+ // 3. 鑾峰彇鍙戣揣閫氱煡鍗曡
List<MesWmSalesNoticeLineDO> noticeLines = salesNoticeLineService.getSalesNoticeLineListByNoticeId(noticeId);
if (CollUtil.isEmpty(noticeLines)) {
throw exception(WM_SALES_NOTICE_LINE_EMPTY);
}
- // 3. 鐢熸垚閿�鍞嚭搴撳崟缂栫爜
+ // 4. 鐢熸垚閿�鍞嚭搴撳崟缂栫爜
String code = autoCodeRecordService.generateAutoCode("WM_PRODUCT_SALES_CODE", null);
- // 4. 鍒涘缓閿�鍞嚭搴撳崟涓昏〃
+ // 5. 鍒涘缓閿�鍞嚭搴撳崟涓昏〃
MesWmProductSalesDO productSales = new MesWmProductSalesDO();
productSales.setCode(code);
productSales.setName("鍙戣揣閫氱煡鍗昜" + notice.getCode() + "]鍑哄簱");
@@ -340,7 +351,7 @@
productSales.setStatus(MesWmProductSalesStatusEnum.PREPARE.getStatus());
productSalesMapper.insert(productSales);
- // 5. 閬嶅巻鍙戣揣閫氱煡鍗曡鍒涘缓閿�鍞嚭搴撳崟琛�
+ // 6. 閬嶅巻鍙戣揣閫氱煡鍗曡鍒涘缓閿�鍞嚭搴撳崟琛�
for (MesWmSalesNoticeLineDO noticeLine : noticeLines) {
MesWmProductSalesLineDO salesLine = new MesWmProductSalesLineDO();
salesLine.setSalesId(productSales.getId());
--
Gitblit v1.9.3