From a647bc8a43c0212f482bee0630ebd14dca120a8a Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 28 九月 2026 14:13:28 +0800
Subject: [PATCH] feat: CRM 发票/合同导入、MES 质检批量导入与检测台账、回款与报价校验、权限码细化
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/quotation/CrmSaleQuotationServiceImpl.java | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/quotation/CrmSaleQuotationServiceImpl.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/quotation/CrmSaleQuotationServiceImpl.java
index 2c00fd7..a65a717 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/quotation/CrmSaleQuotationServiceImpl.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/quotation/CrmSaleQuotationServiceImpl.java
@@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.crm.service.quotation;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.number.MoneyUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
@@ -43,7 +44,7 @@
/**
* CRM 閿�鍞姤浠峰崟 Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
@@ -81,11 +82,11 @@
public Long createSaleQuotation(CrmSaleQuotationSaveReqVO createReqVO, Long userId) {
// 1.1 鏍￠獙鐗╂枡椤圭殑鏈夋晥鎬�
List<CrmSaleQuotationProductDO> quotationProducts = validateQuotationItems(createReqVO.getItems());
- // 1.2 鐢熸垚鎶ヤ环鍗曞彿锛屽苟鏍￠獙鍞竴鎬�
- String no = noRedisDAO.generate(CrmNoRedisDAO.SALE_QUOTATION_NO_PREFIX);
- if (saleQuotationMapper.selectByNo(no) != null) {
- throw exception(SALE_QUOTATION_NO_EXISTS);
- }
+ // 1.2 纭畾鎶ヤ环鍗曞彿锛堝墠绔～鍐欏垯鐢ㄨ嚜瀹氫箟鍗曞彿锛岀暀绌哄垯鑷姩鐢熸垚锛夛紝骞舵牎楠屽敮涓�鎬�
+ String customNo = StrUtil.trim(createReqVO.getNo());
+ String no = StrUtil.isBlank(customNo)
+ ? noRedisDAO.generate(CrmNoRedisDAO.SALE_QUOTATION_NO_PREFIX) : customNo;
+ validateQuotationNoUnique(no, null);
// 1.3 鏍￠獙鍏宠仈瀛楁
validateRelationDataExists(createReqVO);
@@ -123,8 +124,15 @@
// 1.4 鏍￠獙鍏宠仈瀛楁
validateRelationDataExists(updateReqVO);
- // 2.1 鏇存柊鎶ヤ环鍗�
+ // 2.1 鏇存柊鎶ヤ环鍗曪紙鎶ヤ环鍗曞彿鐣欑┖琛ㄧず淇濇寔鍘熷�硷紝濉啓鍒欐牎楠屽敮涓�鎬у悗鏇挎崲锛�
CrmSaleQuotationDO updateObj = BeanUtils.toBean(updateReqVO, CrmSaleQuotationDO.class);
+ String no = StrUtil.trim(updateReqVO.getNo());
+ if (StrUtil.isBlank(no)) {
+ updateObj.setNo(saleQuotation.getNo());
+ } else {
+ validateQuotationNoUnique(no, saleQuotation.getId());
+ updateObj.setNo(no);
+ }
calculateTotalPrice(updateObj, quotationProducts);
saleQuotationMapper.updateById(updateObj);
// 2.2 鏇存柊鎶ヤ环鏄庣粏
@@ -167,6 +175,19 @@
return saleQuotation;
}
+ /**
+ * 鏍￠獙鎶ヤ环鍗曞彿鍞竴锛堝惈宸查�昏緫鍒犻櫎鐨勬姤浠峰崟锛屽洜 uk_no 鍞竴绱㈠紩瑕嗙洊宸插垹闄よ锛�
+ *
+ * @param no 鎶ヤ环鍗曞彿
+ * @param selfId 鑷韩缂栧彿锛堜慨鏀规椂鎺掗櫎鑷繁锛屾柊澧炰紶 null锛�
+ */
+ private void validateQuotationNoUnique(String no, Long selfId) {
+ CrmSaleQuotationDO exists = saleQuotationMapper.selectAnyByNo(no);
+ if (exists != null && !exists.getId().equals(selfId)) {
+ throw exception(SALE_QUOTATION_NO_EXISTS, no);
+ }
+ }
+
private List<CrmSaleQuotationProductDO> validateQuotationItems(List<CrmSaleQuotationSaveReqVO.Item> list) {
// 1. 鏍￠獙鐗╂枡瀛樺湪涓斿惎鐢�
Set<Long> itemIds = convertSet(list, CrmSaleQuotationSaveReqVO.Item::getItemId);
--
Gitblit v1.9.3