From bc31cda78817c62aa552be40f39eccaa03262923 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期六, 07 十一月 2026 01:21:22 +0800
Subject: [PATCH] feat: 补齐排产约束与缺料校验,新增风险监测,优化隐患通知与招投标联动
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java | 61 ++++++++++++++++++++++--------
1 files changed, 44 insertions(+), 17 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..1314265 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
@@ -17,7 +17,7 @@
import cn.iocoder.yudao.module.mes.enums.wm.MesWmOutStatusEnum;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmProductSalesStatusEnum;
import cn.iocoder.yudao.module.mes.service.md.autocode.MesMdAutoCodeRecordService;
-import cn.iocoder.yudao.module.mes.service.md.client.MesMdClientService;
+import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
import cn.iocoder.yudao.module.erp.api.sale.ErpSaleOrderApi;
import cn.iocoder.yudao.module.erp.api.sale.dto.ErpSaleOrderItemRespDTO;
import cn.iocoder.yudao.module.erp.api.sale.dto.ErpSaleOrderRespDTO;
@@ -51,7 +51,7 @@
@Resource
private MesWmSalesNoticeLineService salesNoticeLineService;
@Resource
- private MesMdClientService clientService;
+ private CrmCustomerApi customerApi;
@Resource
private ErpSaleOrderApi saleOrderApi;
@@ -66,7 +66,9 @@
private MesWmSalesNoticeLineMapper salesNoticeLineMapper;
@Override
+ @Transactional(rollbackFor = Exception.class)
public Long createSalesNotice(MesWmSalesNoticeSaveReqVO createReqVO) {
+ lockReferencedSaleOrder(createReqVO, null);
// 鏍¢獙鏁版嵁
validateSalesNoticeSave(createReqVO);
@@ -78,9 +80,11 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void updateSalesNotice(MesWmSalesNoticeSaveReqVO updateReqVO) {
// 鏍¢獙瀛樺湪 + 鑽夌鐘舵��
- validateSalesNoticeExistsAndDraft(updateReqVO.getId());
+ MesWmSalesNoticeDO existing = validateSalesNoticeExistsAndDraft(updateReqVO.getId());
+ lockReferencedSaleOrder(updateReqVO, existing);
// 鏍¢獙鏁版嵁
validateSalesNoticeSave(updateReqVO);
@@ -108,7 +112,7 @@
@Override
public PageResult<MesWmSalesNoticeDO> getSalesNoticePage(MesWmSalesNoticePageReqVO pageReqVO) {
- return salesNoticeMapper.selectPage(pageReqVO);
+ return salesNoticeMapper.selectPage(pageReqVO, (List<Long>) null);
}
@Override
@@ -166,8 +170,23 @@
validateNoticeCodeUnique(saveReqVO.getId(), saveReqVO.getCode());
// 鏍¢獙瀹㈡埛瀛樺湪
if (saveReqVO.getClientId() != null) {
- clientService.validateClientExistsAndEnable(saveReqVO.getClientId());
+ customerApi.validateCustomer(saveReqVO.getClientId());
}
+ }
+
+ /** 涓庤鍗曚綔搴熶娇鐢ㄥ悓涓�璁㈠崟琛岄攣锛涙敮鎸佸巻鍙茶姹備粎浼犺鍗曞彿銆� */
+ private void lockReferencedSaleOrder(MesWmSalesNoticeSaveReqVO request, MesWmSalesNoticeDO existing) {
+ Long orderId = request.getSaleOrderId();
+ String orderNo = request.getSaleOrderCode();
+ if (orderId == null && (orderNo == null || orderNo.isBlank()) && existing != null) {
+ orderId = existing.getSaleOrderId();
+ orderNo = existing.getSaleOrderCode();
+ }
+ if (orderId == null && (orderNo == null || orderNo.isBlank())) return;
+ ErpSaleOrderRespDTO order = saleOrderApi.lockSaleOrderForNotice(orderId, orderNo).getCheckedData();
+ if (order == null) throw exception(WM_SALES_NOTICE_SALE_ORDER_NOT_EXISTS);
+ request.setSaleOrderId(order.getId());
+ request.setSaleOrderCode(order.getNo());
}
private void validateNoticeCodeUnique(Long id, String code) {
@@ -183,22 +202,25 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Long generateSalesNoticeFromSaleOrder(Long saleOrderId) {
- // 1. 鑾峰彇閿�鍞鍗曚俊鎭�
- ErpSaleOrderRespDTO saleOrder = saleOrderApi.getSaleOrder(saleOrderId).getCheckedData();
- if (saleOrder == null) {
- throw exception(WM_SALES_NOTICE_SALE_ORDER_NOT_EXISTS);
+ // 鍏堥攣瀹氳鍗曪紝鍐嶆鏌ラ�氱煡锛涗笌璁㈠崟浣滃簾涓茶鎵ц銆�
+ ErpSaleOrderRespDTO saleOrder = saleOrderApi.lockSaleOrderForNotice(saleOrderId, null).getCheckedData();
+ if (saleOrder == null) throw exception(WM_SALES_NOTICE_SALE_ORDER_NOT_EXISTS);
+ // 1. 鏍¢獙鏄惁宸茬敓鎴愯繃鍙戣揣閫氱煡鍗曪紙闃叉閲嶅鐢熸垚锛�
+ MesWmSalesNoticeDO existNotice = salesNoticeMapper.selectBySaleOrderId(saleOrderId);
+ if (existNotice != null) {
+ throw exception(WM_SALES_NOTICE_ALREADY_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 +231,7 @@
notice.setStatus(PREPARE.getStatus());
salesNoticeMapper.insert(notice);
- // 5. 閬嶅巻鏄庣粏鍒涘缓鍙戣揣閫氱煡鍗曡
+ // 6. 閬嶅巻鏄庣粏鍒涘缓鍙戣揣閫氱煡鍗曡
for (ErpSaleOrderItemRespDTO saleOrderItem : saleOrderItems) {
MesWmSalesNoticeLineDO line = new MesWmSalesNoticeLineDO();
line.setNoticeId(notice.getId());
@@ -315,16 +337,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 +367,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