From b67dbc6737b5a8751bbc6932724c34ae4b19c34e Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 20 一月 2026 18:02:32 +0800
Subject: [PATCH] yys 优化影响的模块
---
src/main/java/com/ruoyi/sales/service/impl/SalesQuotationServiceImpl.java | 60 ++++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 40 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesQuotationServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesQuotationServiceImpl.java
index db9e181..902003b 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesQuotationServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesQuotationServiceImpl.java
@@ -13,6 +13,7 @@
import com.ruoyi.approve.vo.ApproveProcessVO;
import com.ruoyi.common.utils.OrderUtils;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.uuid.UUID;
import com.ruoyi.framework.security.LoginUser;
@@ -28,6 +29,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.List;
import java.util.stream.Collectors;
@@ -59,7 +61,7 @@
@Override
public boolean add(SalesQuotationDto salesQuotationDto) {
- LoginUser loginUser = SecurityUtils.getLoginUser();
+// LoginUser loginUser = SecurityUtils.getLoginUser();
SalesQuotation salesQuotation = new SalesQuotation();
BeanUtils.copyProperties(salesQuotationDto, salesQuotation);
String quotationNo = OrderUtils.countTodayByCreateTime(salesQuotationMapper, "QT");
@@ -77,20 +79,20 @@
}).collect(Collectors.toList());
salesQuotationProductService.saveBatch(products);
// 鎶ヤ环瀹℃壒
- ApproveProcessVO approveProcessVO = new ApproveProcessVO();
- approveProcessVO.setApproveType(6);
- approveProcessVO.setApproveDeptId(loginUser.getTenantId());
- approveProcessVO.setApproveReason(quotationNo);
- approveProcessVO.setApproveUserIds(salesQuotationDto.getApproveUserIds());
- approveProcessVO.setApproveUser(loginUser.getUserId());
- approveProcessVO.setApproveTime(LocalDate.now().toString());
- approveProcessVO.setPrice(salesQuotationDto.getTotalAmount());
- try {
- approveProcessService.addApprove(approveProcessVO);
- }catch (Exception e){
- log.error("SalesQuotationServiceImpl error:{}", e);
- throw new RuntimeException("瀹℃壒澶辫触");
- }
+// ApproveProcessVO approveProcessVO = new ApproveProcessVO();
+// approveProcessVO.setApproveType(6);
+// approveProcessVO.setApproveDeptId(loginUser.getTenantId());
+// approveProcessVO.setApproveReason(quotationNo);
+// approveProcessVO.setApproveUserIds(salesQuotationDto.getApproveUserIds());
+// approveProcessVO.setApproveUser(loginUser.getUserId());
+// approveProcessVO.setApproveTime(LocalDate.now().toString());
+// approveProcessVO.setPrice(salesQuotationDto.getTotalAmount());
+// try {
+// approveProcessService.addApprove(approveProcessVO);
+// }catch (Exception e){
+// log.error("SalesQuotationServiceImpl error:{}", e);
+// throw new RuntimeException("瀹℃壒澶辫触");
+// }
return true;
}
@Override
@@ -117,13 +119,31 @@
}).collect(Collectors.toList());
salesQuotationProductService.saveBatch(products);
- // 淇敼鎶ヤ环瀹℃壒
- vo.setApproveUserIds(salesQuotationDto.getApproveUserIds());
- vo.setApproveType(6);
- vo.setApproveReason(salesQuotationDto.getQuotationNo());
- approveProcessService.updateApproveUser(vo);
+// // 淇敼鎶ヤ环瀹℃壒
+// vo.setApproveUserIds(salesQuotationDto.getApproveUserIds());
+// vo.setApproveType(6);
+// vo.setApproveReason(salesQuotationDto.getQuotationNo());
+// approveProcessService.updateApproveUser(vo);
return true;
}
+
+ @Override
+ public BigDecimal detail(String type, String productName, String specification) {
+ if(StringUtils.isEmpty(type)) return null;
+ SalesQuotationProduct salesQuotationProduct = salesQuotationProductMapper.selectOne(new LambdaQueryWrapper<SalesQuotationProduct>()
+ .eq(SalesQuotationProduct::getProduct, productName)
+ .eq(SalesQuotationProduct::getSpecification, specification)
+ .last("limit 1"));
+ if(salesQuotationProduct==null) return null;
+ switch (type){
+ case "涓�鎵瑰晢":
+ return salesQuotationProduct.getUnitPrice();
+ case "缁堢鍟�":
+ return salesQuotationProduct.getUnitPriceTwo();
+ default:
+ return salesQuotationProduct.getUnitPriceThree();
+ }
+ }
@Override
public boolean delete(Long id) {
salesQuotationMapper.deleteById(id);
--
Gitblit v1.9.3