From be5783c8a7e13bbc76d33c95643d75779cce21db Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 18 七月 2026 15:39:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java | 58 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 43 insertions(+), 15 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 c2b964c..a233210 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,10 +17,11 @@
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;
+import cn.iocoder.yudao.module.erp.api.sale.enums.ErpSaleOrderOutStatusEnum;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -50,7 +51,7 @@
@Resource
private MesWmSalesNoticeLineService salesNoticeLineService;
@Resource
- private MesMdClientService clientService;
+ private CrmCustomerApi customerApi;
@Resource
private ErpSaleOrderApi saleOrderApi;
@@ -102,19 +103,29 @@
@Override
public MesWmSalesNoticeDO getSalesNotice(Long id) {
- return salesNoticeMapper.selectById(id);
+ MesWmSalesNoticeDO notice = salesNoticeMapper.selectById(id);
+ // 鏍￠獙瀹㈡埛鏉冮檺
+ if (notice != null && notice.getClientId() != null) {
+ List<Long> permittedIds = customerApi.getPermittedCustomerIds();
+ if (permittedIds != null && !permittedIds.contains(notice.getClientId())) {
+ return null; // 鏃犳潈闄愬垯杩斿洖 null
+ }
+ }
+ return notice;
}
@Override
public PageResult<MesWmSalesNoticeDO> getSalesNoticePage(MesWmSalesNoticePageReqVO pageReqVO) {
- return salesNoticeMapper.selectPage(pageReqVO);
+ // 鑾峰彇鐢ㄦ埛鏈夋潈闄愮殑瀹㈡埛 ID 鍒楄〃
+ List<Long> permittedClientIds = customerApi.getPermittedCustomerIds();
+ return salesNoticeMapper.selectPage(pageReqVO, permittedClientIds);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void submitSalesNotice(Long id) {
// 1.1 鏍￠獙瀛樺湪 + 鑽夌鐘舵��
- validateSalesNoticeExistsAndDraft(id);
+ MesWmSalesNoticeDO notice = validateSalesNoticeExistsAndDraft(id);
// 1.2 妫�鏌ユ槸鍚︽湁琛岄」鐩�
List<MesWmSalesNoticeLineDO> lines = salesNoticeLineService.getSalesNoticeLineListByNoticeId(id);
if (CollUtil.isEmpty(lines)) {
@@ -124,6 +135,12 @@
// 2. 鏇存柊鐘舵�侊細鑽夌 鈫� 寰呭嚭搴�
salesNoticeMapper.updateById(new MesWmSalesNoticeDO()
.setId(id).setStatus(APPROVED.getStatus()));
+
+ // 3. 鍥炲啓 ERP 閿�鍞鍗曞嚭搴撶姸鎬佷负"宸查鐣�"
+ if (notice.getSaleOrderId() != null) {
+ saleOrderApi.updateOrderOutStatusTo(notice.getSaleOrderId(),
+ ErpSaleOrderOutStatusEnum.RESERVED.getStatus());
+ }
}
@Override
@@ -159,7 +176,7 @@
validateNoticeCodeUnique(saveReqVO.getId(), saveReqVO.getCode());
// 鏍￠獙瀹㈡埛瀛樺湪
if (saveReqVO.getClientId() != null) {
- clientService.validateClientExistsAndEnable(saveReqVO.getClientId());
+ customerApi.validateCustomer(saveReqVO.getClientId());
}
}
@@ -176,22 +193,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() + "]鍙戣揣閫氱煡");
@@ -202,7 +225,7 @@
notice.setStatus(PREPARE.getStatus());
salesNoticeMapper.insert(notice);
- // 5. 閬嶅巻鏄庣粏鍒涘缓鍙戣揣閫氱煡鍗曡
+ // 6. 閬嶅巻鏄庣粏鍒涘缓鍙戣揣閫氱煡鍗曡
for (ErpSaleOrderItemRespDTO saleOrderItem : saleOrderItems) {
MesWmSalesNoticeLineDO line = new MesWmSalesNoticeLineDO();
line.setNoticeId(notice.getId());
@@ -308,16 +331,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() + "]鍑哄簱");
@@ -333,7 +361,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