From f8dc8889897431d908c658fb415186d39b963eb6 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 14 一月 2026 18:05:44 +0800
Subject: [PATCH] yys 销售报价，供应商，客户
---
src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java | 43 +++++++
src/main/java/com/ruoyi/sales/dto/CustomerInteractionDto.java | 6 +
src/main/java/com/ruoyi/purchase/service/IPaymentRegistrationService.java | 4
src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java | 3
src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java | 2
src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java | 4
src/main/resources/mapper/sales/ReceiptPaymentMapper.xml | 17 ++
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java | 4
src/main/java/com/ruoyi/common/utils/OrderUtils.java | 3
src/main/resources/mapper/sales/SalesQuotationMapper.xml | 11 +
src/main/java/com/ruoyi/purchase/controller/PaymentRegistrationController.java | 16 ++
src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java | 22 +++
src/main/java/com/ruoyi/purchase/mapper/PaymentRegistrationMapper.java | 5
src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java | 10 +
src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java | 3
src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java | 7 +
src/main/java/com/ruoyi/sales/dto/InvoiceLedgerDto.java | 10 +
src/main/resources/mapper/sales/InvoiceLedgerMapper.xml | 21 +--
src/main/java/com/ruoyi/sales/service/impl/SalesQuotationServiceImpl.java | 49 +++++++
src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java | 55 --------
src/main/java/com/ruoyi/sales/dto/SalesQuotationDto.java | 6 +
src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml | 35 +++++
22 files changed, 256 insertions(+), 80 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
index 09c94a7..4747ffe 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
@@ -20,7 +20,10 @@
import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.project.system.service.ISysNoticeService;
import com.ruoyi.sales.mapper.CommonFileMapper;
+import com.ruoyi.sales.mapper.SalesQuotationMapper;
+import com.ruoyi.sales.mapper.SalesQuotationProductMapper;
import com.ruoyi.sales.pojo.CommonFile;
+import com.ruoyi.sales.pojo.SalesQuotation;
import com.ruoyi.sales.service.impl.CommonFileServiceImpl;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
@@ -54,6 +57,9 @@
private CommonFileMapper fileMapper;
@Autowired
private DeviceRepairMapper deviceRepairMapper;
+
+ @Autowired
+ private SalesQuotationMapper salesQuotationMapper;
@@ -163,6 +169,22 @@
}
deviceRepairMapper.updateById(deviceRepair);
}
+ // 閿�鍞姤浠风姸鎬佷慨鏀�
+ if(approveProcess.getApproveType().equals(6)){
+ SalesQuotation salesQuote = salesQuotationMapper.selectOne(new LambdaQueryWrapper<SalesQuotation>()
+ .eq(SalesQuotation::getQuotationNo, approveProcess.getApproveReason())
+ .last("limit 1"));
+ // 鍚屾剰
+ if(status.equals(2) && salesQuote != null){
+ salesQuote.setStatus("閫氳繃");
+ }else if(status.equals(3) && salesQuote != null){
+ salesQuote.setStatus("鎷掔粷");
+ }else if(status.equals(1) && salesQuote != null){
+ salesQuote.setStatus("瀹℃牳涓�");
+ }
+
+ salesQuotationMapper.updateById(salesQuote);
+ }
// 缁戝畾闄勪欢
if(!CollectionUtils.isEmpty(approveNode.getTempFileIds()) && approveNode.getApproveNodeStatus() == 1){
tempFileService.migrateTempFilesToFormal(approveNode.getId(), approveNode.getTempFileIds(), FileNameType.ApproveNode.getValue());
diff --git a/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
index 2a430a9..c34e20a 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
@@ -93,6 +93,7 @@
approveProcess.setApproveReason(approveProcessVO.getApproveReason());
approveProcess.setDeviceRepairId(approveProcessVO.getDeviceRepairId());
approveProcess.setMaintenancePrice(approveProcessVO.getMaintenancePrice());
+ approveProcess.setPrice(approveProcessVO.getPrice());
approveProcess.setApproveOverTime(null);
approveProcess.setApproveStatus(0);
approveProcess.setApproveDelete(0);
@@ -180,6 +181,48 @@
private final ApproveNodeMapper approveNodeMapper;
+ // 鎶ヤ环瀹℃壒缂栬緫瀹℃牳浜�
+ public void updateApproveUser(ApproveGetAndUpdateVo approveGetAndUpdateVo){
+ LambdaQueryWrapper<ApproveProcess> approveProcessLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ approveProcessLambdaQueryWrapper.eq(ApproveProcess::getApproveType, approveGetAndUpdateVo.getApproveType())
+ .eq(ApproveProcess::getApproveReason, approveGetAndUpdateVo.getApproveReason())
+ .last("limit 1");
+ ApproveProcess approveProcess = approveProcessMapper.selectOne(approveProcessLambdaQueryWrapper);
+ if(approveProcess == null) throw new RuntimeException("璇烽�夋嫨瀹℃壒浜�");
+ String[] split = approveGetAndUpdateVo.getApproveUserIds().split(",");
+ if(split.length == 0){
+ throw new RuntimeException("璇烽�夋嫨瀹℃壒浜�");
+ }
+ List<SysUser> sysUsers = sysUserMapper.selectUserByIds(Arrays.asList(split).stream().map(Long::parseLong).collect(Collectors.toList()));
+ if(CollectionUtils.isEmpty(sysUsers)) throw new RuntimeException("璇烽�夋嫨瀹℃壒浜�");
+ //瀹℃牳涓笉鍙互缂栬緫瀹℃牳浜�
+ if(approveProcess.getApproveStatus() != 1){
+ approveProcess.setApproveUserCurrentId(Long.parseLong(split[0]));
+ approveProcess.setApproveUserCurrentName(sysUsers.stream().filter(user -> user.getUserId().equals(Long.parseLong(split[0]))).collect(Collectors.toList()).get(0).getNickName());
+ }
+ if(approveGetAndUpdateVo.getApproveStatus() != null){
+ approveProcess.setApproveStatus(approveGetAndUpdateVo.getApproveStatus());
+ }
+ approveProcess.setApproveUserIds(approveGetAndUpdateVo.getApproveUserIds());
+ updateById(approveProcess);
+ //淇敼瀹℃壒浜�
+ // 鍏堝垹闄� 鍚庢柊澧�
+ LambdaQueryWrapper<ApproveNode> approveNodeLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ approveNodeLambdaQueryWrapper.eq(ApproveNode::getApproveProcessId, approveProcess.getApproveId())
+ .eq(ApproveNode::getDeleteFlag, 0)
+ .eq(ApproveNode::getTenantId, SecurityUtils.getLoginUser().getTenantId())
+ .orderByAsc(ApproveNode::getApproveNodeOrder);
+ approveNodeMapper.delete(approveNodeLambdaQueryWrapper);
+ approveNodeService.initApproveNodes(approveGetAndUpdateVo.getApproveUserIds(),approveProcess.getApproveId(),approveProcess.getTenantId());
+ /*娑堟伅閫氱煡*/
+ String id = approveProcess.getApproveUserIds().split(",")[0];
+ sysNoticeService.simpleNoticeByUser(approveProcessType(approveProcess.getApproveType()),
+ approveProcess.getApproveId()+"娴佺▼缂栧彿鐨勫鎵归渶瑕佹偍瀹℃牳!!!!!",
+ Arrays.asList(Long.valueOf(id)),
+ approveProcess.getApproveDeptId(),
+ "/collaborativeApproval/approvalProcess?approveType="+approveProcess.getApproveType()+"&approveId="+approveProcess.getApproveId());
+ }
+
@Override
public void updateByApproveId(ApproveGetAndUpdateVo approveGetAndUpdateVo) throws IOException {
diff --git a/src/main/java/com/ruoyi/common/utils/OrderUtils.java b/src/main/java/com/ruoyi/common/utils/OrderUtils.java
index 9520b75..52df76b 100644
--- a/src/main/java/com/ruoyi/common/utils/OrderUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/OrderUtils.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.common.utils.uuid.UUID;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.stereotype.Component;
@@ -51,6 +52,6 @@
// 鎵ц鏌ヨ
Long aLong = mapper.selectCount(queryWrapper);
// 鎷兼帴璁㈠崟缂栧彿 preFix + 鏃堕棿锛坹yyyMMdd锛� + 璁㈠崟鏁伴噺(001)
- return preFix + LocalDate.now().format(DateTimeFormatter.ISO_LOCAL_DATE).replaceAll("-", "") + String.format("%03d", (aLong + 1));
+ return preFix + LocalDate.now().format(DateTimeFormatter.ISO_LOCAL_DATE).replaceAll("-", "") + String.format("%03d", (aLong + 1)) + "-" + new Date().getTime();
}
}
diff --git a/src/main/java/com/ruoyi/purchase/controller/PaymentRegistrationController.java b/src/main/java/com/ruoyi/purchase/controller/PaymentRegistrationController.java
index 15673cc..3d61f2c 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PaymentRegistrationController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PaymentRegistrationController.java
@@ -120,6 +120,22 @@
}
/**
+ * 渚涘簲鍟嗗線鏉ュ垎椤垫帴鍙�
+ */
+ @GetMapping("/supplierNameListPage")
+ public AjaxResult supplierNameListPage(PaymentLedgerDto paymentLedgerDto, Page page){
+ return success(paymentRegistrationService.supplierNameListPage(page,paymentLedgerDto));
+ }
+
+ /**
+ * 渚涘簲鍟嗗線鏉ュ垎椤垫帴鍙�
+ */
+ @GetMapping("/supplierNameListPageDetails")
+ public AjaxResult supplierNameListPageDetails(PaymentLedgerDto paymentLedgerDto){
+ return success(paymentRegistrationService.supplierNameListPageDetails(paymentLedgerDto));
+ }
+
+ /**
* 鑾峰彇鏈湀搴斾粯淇℃伅
*/
@GetMapping(value = "/paymentMonthList")
diff --git a/src/main/java/com/ruoyi/purchase/mapper/PaymentRegistrationMapper.java b/src/main/java/com/ruoyi/purchase/mapper/PaymentRegistrationMapper.java
index 71cfbd4..196d531 100644
--- a/src/main/java/com/ruoyi/purchase/mapper/PaymentRegistrationMapper.java
+++ b/src/main/java/com/ruoyi/purchase/mapper/PaymentRegistrationMapper.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.purchase.dto.PaymentHistoryRecordVo;
+import com.ruoyi.purchase.dto.PaymentLedgerDto;
import com.ruoyi.purchase.dto.PaymentRegistrationDto;
import com.ruoyi.purchase.pojo.PaymentRegistration;
import org.apache.ibatis.annotations.Param;
@@ -62,4 +63,8 @@
* @return 浠樻鐧昏闆嗗悎
*/
IPage<PaymentRegistrationDto> paymentHistoryListPage(Page page, @Param("params") PaymentRegistrationDto paymentRegistrationDto);
+
+ IPage<PaymentRegistrationDto> supplierNameListPage(Page page,@Param("req") PaymentLedgerDto paymentLedgerDto);
+
+ List<PaymentRegistrationDto> supplierNameListPageDetails(@Param("req") PaymentLedgerDto paymentLedgerDto);
}
diff --git a/src/main/java/com/ruoyi/purchase/service/IPaymentRegistrationService.java b/src/main/java/com/ruoyi/purchase/service/IPaymentRegistrationService.java
index 15fa498..f0b9738 100644
--- a/src/main/java/com/ruoyi/purchase/service/IPaymentRegistrationService.java
+++ b/src/main/java/com/ruoyi/purchase/service/IPaymentRegistrationService.java
@@ -99,4 +99,8 @@
Boolean delete(Long[] ids);
int delPaymentRegistration(Long ids);
+
+ IPage<PaymentRegistrationDto> supplierNameListPage(Page page, PaymentLedgerDto paymentLedgerDto);
+
+ List<PaymentRegistrationDto> supplierNameListPageDetails(PaymentLedgerDto paymentLedgerDto);
}
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java
index 91ec8a5..d6504cd 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java
@@ -458,6 +458,16 @@
return paymentRegistrationMapper.deleteById(id);
}
+ @Override
+ public IPage<PaymentRegistrationDto> supplierNameListPage(Page page, PaymentLedgerDto paymentLedgerDto) {
+ return paymentRegistrationMapper.supplierNameListPage(page, paymentLedgerDto);
+ }
+
+ @Override
+ public List<PaymentRegistrationDto> supplierNameListPageDetails(PaymentLedgerDto paymentLedgerDto) {
+ return paymentRegistrationMapper.supplierNameListPageDetails(paymentLedgerDto);
+ }
+
// 鎵归噺鏌ヨ閲囪喘鍙拌处锛堝綋鏈堬級
private Map<Long, List<PurchaseLedger>> batchQueryPurchaseLedgers(List<Long> supplierIds, LocalDate startDate, LocalDate endDate) {
LambdaQueryWrapper<PurchaseLedger> query = new LambdaQueryWrapper<>();
diff --git a/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java b/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
index 0748154..9bce200 100644
--- a/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
@@ -10,6 +10,7 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.purchase.dto.InvoicePurchaseDto;
+import com.ruoyi.sales.dto.InvoiceLedgerDto;
import com.ruoyi.sales.dto.ReceiptPaymentDto;
import com.ruoyi.sales.dto.ReceiptPaymentRecordDto;
import com.ruoyi.sales.dto.SalesLedgerDto;
@@ -71,7 +72,7 @@
* @return
*/
@GetMapping("/customerInteractions")
- public AjaxResult customerInteractions (ReceiptPaymentDto receiptPaymentDto) {
+ public AjaxResult customerInteractions (InvoiceLedgerDto receiptPaymentDto) {
return AjaxResult.success(receiptPaymentService.customerInteractions(receiptPaymentDto));
}
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java b/src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java
index 3a579d6..f9ea1df 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java
@@ -1,13 +1,16 @@
package com.ruoyi.sales.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ruoyi.aftersalesservice.dto.AfterSalesServiceDto;
import com.ruoyi.aftersalesservice.pojo.AfterSalesService;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.sales.dto.SalesQuotationDto;
+import com.ruoyi.sales.pojo.SalesQuotation;
import com.ruoyi.sales.service.SalesQuotationService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
@@ -29,6 +32,7 @@
return AjaxResult.success(salesQuotationService.listPage(page, salesQuotationDto));
}
+
@PostMapping("/export")
public void export(HttpServletResponse response) {
Page page = new Page(-1,-1);
diff --git a/src/main/java/com/ruoyi/sales/dto/CustomerInteractionDto.java b/src/main/java/com/ruoyi/sales/dto/CustomerInteractionDto.java
index 2ad0a24..aab0f9e 100644
--- a/src/main/java/com/ruoyi/sales/dto/CustomerInteractionDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/CustomerInteractionDto.java
@@ -17,6 +17,12 @@
/** 搴旀敹閲戦 */
private BigDecimal unReceiptAmount;
+ /** 閿�鍞悎鍚屽彿 */
+ private String salesContractNo;
+
+ /** 閲囪喘鍚堝悓鍙� */
+ private String purchaseContractNo;
+
/** 鍙戠敓鏃ユ湡 */
private LocalDate happenTime;
diff --git a/src/main/java/com/ruoyi/sales/dto/InvoiceLedgerDto.java b/src/main/java/com/ruoyi/sales/dto/InvoiceLedgerDto.java
index 218bb01..c638ebb 100644
--- a/src/main/java/com/ruoyi/sales/dto/InvoiceLedgerDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/InvoiceLedgerDto.java
@@ -1,11 +1,14 @@
package com.ruoyi.sales.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.vo.FileVo;
import com.ruoyi.sales.pojo.InvoiceLedger;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.Date;
import java.util.List;
@Data
@@ -19,6 +22,9 @@
@ApiModelProperty(value = "瀹㈡埛鍚嶇О")
private String customerName;
+ @ApiModelProperty(value = "瀹㈡埛ID")
+ private Integer customerId;
+
@ApiModelProperty(value = "瀹㈡埛鍚堝悓鍙�")
private String customerContractNo;
@@ -31,6 +37,10 @@
@ApiModelProperty(value = "鍥炴閲戦")
private BigDecimal receiptPaymentAmount;
+ @ApiModelProperty(value = "鍥炴鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date receiptPaymentDate;
+
@ApiModelProperty(value = "鏈洖娆鹃噾棰�")
private BigDecimal unReceiptPaymentAmount;
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesQuotationDto.java b/src/main/java/com/ruoyi/sales/dto/SalesQuotationDto.java
index c292a10..2f40bdd 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesQuotationDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesQuotationDto.java
@@ -11,4 +11,10 @@
public class SalesQuotationDto extends SalesQuotation {
@ApiModelProperty(value = "鎶ヤ环鍟嗗搧")
private List<SalesQuotationProduct> products;
+
+ /**
+ * 瀹℃壒浜篿d鍒楄〃
+ */
+ // 瀹℃壒浜�
+ private String approveUserIds;
}
diff --git a/src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java b/src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java
index 222f9f5..576ebd7 100644
--- a/src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java
+++ b/src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java
@@ -61,6 +61,13 @@
List<CustomerInteractionDto> customerInteractions (ReceiptPaymentDto receiptPaymentDto);
/**
+ * 瀹㈡埛鍥炴璁板綍鏌ヨ
+ * @param invoiceLedgerDto
+ * @return
+ */
+ List<InvoiceLedgerDto> invoiceLedgerSalesAccount(@Param("invoiceLedgerDto") InvoiceLedgerDto invoiceLedgerDto);
+
+ /**
* 鏌ヨ鍥炴璁板綍涓嶅垎椤�
*/
List<ReceiptPaymentDto> receiptPaymentHistoryListNoPage( @Param("params") ReceiptPaymentDto receiptPaymentDto);
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index 308c7bf..409a048 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -214,11 +214,11 @@
private BigDecimal pendingInvoiceTotal;
@ApiModelProperty(value = "鍥炴鎬婚噾棰�")
- private BigDecimal invoiceTotal;
+ private BigDecimal invoiceTotal = BigDecimal.ZERO;
@ApiModelProperty(value = "寰呬粯娆炬�婚噾棰�")
private BigDecimal pendingTicketsTotal;
@ApiModelProperty(value = "浠樻鎬婚噾棰�")
- private BigDecimal ticketsTotal;
+ private BigDecimal ticketsTotal = BigDecimal.ZERO;
}
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java b/src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java
index b22e6a3..f57293d 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java
@@ -7,6 +7,7 @@
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
+import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -43,7 +44,7 @@
private String status;
@ApiModelProperty(value = "鎶ヤ环鎬婚噾棰�")
@Excel(name = "鎶ヤ环閲戦")
- private Double totalAmount;
+ private BigDecimal totalAmount;
@ApiModelProperty(value = "澶囨敞")
private String remark;
diff --git a/src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java b/src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java
index 525217f..dbe8971 100644
--- a/src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java
+++ b/src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java
@@ -84,7 +84,7 @@
* @param receiptPaymentDto
* @return
*/
- List<CustomerInteractionDto> customerInteractions (ReceiptPaymentDto receiptPaymentDto);
+ List<InvoiceLedgerDto> customerInteractions (InvoiceLedgerDto receiptPaymentDto);
/**
* 鏌ヨ鍥炴璁板綍鍒嗛〉
diff --git a/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
index e93d62f..5a19bde 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
@@ -256,59 +256,8 @@
* @return
*/
@Override
- public List<CustomerInteractionDto> customerInteractions(ReceiptPaymentDto receiptPaymentDto) {
- ArrayList<CustomerInteractionDto> result = new ArrayList<>();
- List<CustomerInteractionDto> customerInteractionDtos = receiptPaymentMapper.customerInteractions(receiptPaymentDto);
- if(CollectionUtils.isEmpty(customerInteractionDtos)){
- return result;
- }
- // 搴旀敹鎬婚噾棰濋噾棰濊绠�
- BigDecimal amountTotal = BigDecimal.ZERO;
- Map<LocalDate, List<CustomerInteractionDto>> dateListMap = customerInteractionDtos.stream().collect(
- Collectors.groupingBy(
- CustomerInteractionDto::getHappenTime,
- LinkedHashMap::new,
- Collectors.toList()
- )
- );
- for (LocalDate localDate : dateListMap.keySet()) {
- BigDecimal currentReceiptAmount = BigDecimal.ZERO;
- BigDecimal invoiceAmount = BigDecimal.ZERO;
- BigDecimal currentDateTotal = BigDecimal.ZERO;
- List<CustomerInteractionDto> customerInteractionDtoList = dateListMap.get(localDate);
- // 璁＄畻褰撳ぉ鏀舵鏁�
- currentReceiptAmount = customerInteractionDtoList.stream()
- .filter(item ->item.getType() == 0)
- .map(CustomerInteractionDto::getReceiptAmount)
- .reduce(BigDecimal.ZERO,BigDecimal::add);
- // 璁＄畻褰撳ぉ寮�绁ㄦ暟
- invoiceAmount = customerInteractionDtoList.stream()
- .filter(item ->item.getType() == 1)
- .map(CustomerInteractionDto::getInvoiceAmount)
- .reduce(BigDecimal.ZERO,BigDecimal::add);
- // 璁＄畻褰撴棩姹囨��
- currentDateTotal = currentDateTotal.add(invoiceAmount).subtract(currentReceiptAmount);
- CustomerInteractionDto customerInteractionDto = new CustomerInteractionDto();
- customerInteractionDto.setHappenTime(localDate);
- customerInteractionDto.setInvoiceAmount(invoiceAmount);
- customerInteractionDto.setReceiptAmount(currentReceiptAmount);
- amountTotal = customerInteractionDto.getInvoiceAmount().subtract(customerInteractionDto.getReceiptAmount());
- customerInteractionDto.setUnReceiptAmount(amountTotal);
- result.add(customerInteractionDto);
- }
- ArrayList<CustomerInteractionDto> newResult = new ArrayList<>();
- for (int i = 0; i < result.size(); i++) {
- CustomerInteractionDto customerInteractionDto = result.get(i);
- if (i == 0) {
- customerInteractionDto.setUnReceiptAmount(customerInteractionDto.getInvoiceAmount().subtract(customerInteractionDto.getReceiptAmount()));
- }else {
- CustomerInteractionDto customerInteractionDto1 = result.get(i-1);
- customerInteractionDto.setUnReceiptAmount(customerInteractionDto1.getUnReceiptAmount()
- .add(customerInteractionDto.getInvoiceAmount()).subtract(customerInteractionDto.getReceiptAmount()));
- }
- newResult.add(customerInteractionDto);
- }
- return newResult;
+ public List<InvoiceLedgerDto> customerInteractions(InvoiceLedgerDto receiptPaymentDto) {
+ return receiptPaymentMapper.invoiceLedgerSalesAccount(receiptPaymentDto);
}
/**
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 104a712..db9e181 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesQuotationServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesQuotationServiceImpl.java
@@ -6,7 +6,16 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.approve.pojo.ApproveProcess;
+import com.ruoyi.approve.service.IApproveProcessService;
+import com.ruoyi.approve.service.impl.ApproveProcessServiceImpl;
+import com.ruoyi.approve.vo.ApproveGetAndUpdateVo;
+import com.ruoyi.approve.vo.ApproveProcessVO;
+import com.ruoyi.common.utils.OrderUtils;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
+import com.ruoyi.common.utils.uuid.UUID;
+import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.sales.dto.SalesQuotationDto;
import com.ruoyi.sales.mapper.SalesQuotationMapper;
import com.ruoyi.sales.mapper.SalesQuotationProductMapper;
@@ -19,6 +28,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.time.LocalDate;
import java.util.List;
import java.util.stream.Collectors;
@@ -31,6 +41,9 @@
private SalesQuotationProductMapper salesQuotationProductMapper;
@Autowired
private SalesQuotationProductService salesQuotationProductService;
+
+ @Autowired
+ private ApproveProcessServiceImpl approveProcessService;
@Override
public IPage<SalesQuotationDto> listPage(Page page, SalesQuotationDto salesQuotationDto) {
IPage<SalesQuotationDto> salesQuotationDtoIPage = salesQuotationMapper.listPage(page, salesQuotationDto);
@@ -46,29 +59,49 @@
@Override
public boolean add(SalesQuotationDto salesQuotationDto) {
+ LoginUser loginUser = SecurityUtils.getLoginUser();
SalesQuotation salesQuotation = new SalesQuotation();
BeanUtils.copyProperties(salesQuotationDto, salesQuotation);
- String quotationNo = salesQuotation.getQuotationNo();
+ String quotationNo = OrderUtils.countTodayByCreateTime(salesQuotationMapper, "QT");
+ salesQuotation.setQuotationNo(quotationNo);
+ salesQuotation.setStatus("寰呭鎵�");
salesQuotationMapper.insert(salesQuotation);
-// if(salesQuotationMapper.insert(salesQuotation)!=1){
-// return false;
-// }
if(CollectionUtils.isEmpty(salesQuotationDto.getProducts())){
return true;
}
List<SalesQuotationProduct> products = salesQuotationDto.getProducts().stream().map(product -> {
SalesQuotationProduct salesQuotationProduct = new SalesQuotationProduct();
BeanUtils.copyProperties(product, salesQuotationProduct);
- salesQuotationProduct.setSalesQuotationId(salesQuotationMapper.selectOne(new LambdaQueryWrapper<SalesQuotation>().eq(SalesQuotation::getQuotationNo, quotationNo)).getId());
+ salesQuotationProduct.setSalesQuotationId(salesQuotation.getId());
return salesQuotationProduct;
}).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("瀹℃壒澶辫触");
+ }
return true;
}
@Override
public boolean edit(SalesQuotationDto salesQuotationDto) {
SalesQuotation salesQuotation = new SalesQuotation();
BeanUtils.copyProperties(salesQuotationDto, salesQuotation);
+ ApproveGetAndUpdateVo vo = new ApproveGetAndUpdateVo();
+ if("鎷掔粷".equals(salesQuotationDto.getStatus())){
+ vo.setApproveStatus(0);
+ salesQuotation.setStatus("寰呭鎵�");
+ }
if(salesQuotationMapper.updateById(salesQuotation)!=1){
return false;
}
@@ -82,7 +115,13 @@
salesQuotationProduct.setSalesQuotationId(salesQuotation.getId());
return salesQuotationProduct;
}).collect(Collectors.toList());
+
salesQuotationProductService.saveBatch(products);
+ // 淇敼鎶ヤ环瀹℃壒
+ vo.setApproveUserIds(salesQuotationDto.getApproveUserIds());
+ vo.setApproveType(6);
+ vo.setApproveReason(salesQuotationDto.getQuotationNo());
+ approveProcessService.updateApproveUser(vo);
return true;
}
@Override
diff --git a/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml b/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
index d8b9241..70f7543 100644
--- a/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
+++ b/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
@@ -183,5 +183,40 @@
</where>
ORDER BY T1.payment_date,T1.create_time DESC
</select>
+ <select id="supplierNameListPage" resultType="com.ruoyi.purchase.dto.PaymentRegistrationDto">
+ SELECT
+ T1.supplier_id,
+ T1.supplier_name,
+ SUM(contract_amount) AS invoiceAmount,
+ IFNULL( SUM(T2.current_payment_amount) , 0 ) AS paymentAmount,
+ IFNULL((IFNULL(SUM(contract_amount),0) - IFNULL(SUM(T2.current_payment_amount),0)),0) AS payableAmount
+ FROM purchase_ledger T1
+ LEFT JOIN payment_registration T2 ON T1.id = T2.sales_ledger_id
+ <where>
+ <if test="req.supplierName != null and req.supplierName != '' ">
+ T1.supplier_name LIKE CONCAT ('%',#{req.supplierName},'%')
+ </if>
+ </where>
+ GROUP BY T1.supplier_name
+ </select>
+ <select id="supplierNameListPageDetails" resultType="com.ruoyi.purchase.dto.PaymentRegistrationDto">
+ SELECT
+ T1.supplier_id,
+ T1.supplier_name,
+ SUM(contract_amount) AS invoiceAmount,
+ IFNULL( SUM(T2.current_payment_amount) , 0 ) AS paymentAmount,
+ IFNULL((IFNULL(SUM(contract_amount),0) - IFNULL(SUM(T2.current_payment_amount),0)),0) AS payableAmount,
+ T1.purchase_contract_number,
+ T2.payment_date
+ FROM purchase_ledger T1
+ LEFT JOIN payment_registration T2 ON T1.id = T2.sales_ledger_id
+ <where>
+ T1.supplier_id = #{req.supplierId}
+ <if test="req.supplierName != null and req.supplierName != '' ">
+ T1.supplier_name LIKE CONCAT ('%',#{req.supplierName},'%')
+ </if>
+ </where>
+ GROUP BY T1.purchase_contract_number,T2.payment_date
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/sales/InvoiceLedgerMapper.xml b/src/main/resources/mapper/sales/InvoiceLedgerMapper.xml
index 0c93e4d..2874f48 100644
--- a/src/main/resources/mapper/sales/InvoiceLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/InvoiceLedgerMapper.xml
@@ -111,22 +111,19 @@
<select id="invoiceLedgerSalesAccount" resultType="com.ruoyi.sales.dto.InvoiceLedgerDto">
SELECT
- T4.id,T4.customer_name ,
- SUM(invoice_total) AS invoice_total,
- IFNULL( SUM(T5.receipt_payment_amount) , 0 ) AS receipt_payment_amount,
- IFNULL((IFNULL(SUM(invoice_total),0) - IFNULL(SUM(T5.receipt_payment_amount),0)),0) AS unReceipt_payment_amount
- FROM
- invoice_ledger T1
- LEFT JOIN invoice_registration_product T2 ON T1.invoice_registration_product_id = T2.id
- LEFT JOIN sales_ledger T3 ON T3.id = T2.sales_ledger_id
- LEFT JOIN customer T4 ON T4.id = T3.customer_id
- LEFT JOIN ( SELECT invoice_ledger_id, SUM( receipt_payment_amount ) AS receipt_payment_amount FROM receipt_payment GROUP BY invoice_ledger_id ) T5 ON T5.invoice_ledger_id = T1.id
+ T1.customer_id as id,
+ T1.customer_name,
+ SUM(contract_amount) AS invoice_total,
+ IFNULL( SUM(T2.receipt_payment_amount) , 0 ) AS receipt_payment_amount,
+ IFNULL((IFNULL(SUM(contract_amount),0) - IFNULL(SUM(T2.receipt_payment_amount),0)),0) AS unReceipt_payment_amount
+ FROM sales_ledger T1
+ LEFT JOIN receipt_payment T2 ON T1.id = T2.sales_ledger_id
<where>
<if test="invoiceLedgerDto.searchText != null and invoiceLedgerDto.searchText != '' ">
- T4.customer_name LIKE CONCAT ('%',#{invoiceLedgerDto.searchText},'%')
+ T1.customer_name LIKE CONCAT ('%',#{invoiceLedgerDto.searchText},'%')
</if>
</where>
- GROUP BY T4.id,T4.customer_name
+ GROUP BY T1.customer_name
</select>
<select id="invoiceLedgerProductInfo" resultType="com.ruoyi.sales.dto.InvoiceRegistrationProductDto">
diff --git a/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml b/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
index 0cd0919..91fd041 100644
--- a/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
+++ b/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
@@ -432,5 +432,22 @@
</where>
</select>
+ <select id="invoiceLedgerSalesAccount" resultType="com.ruoyi.sales.dto.InvoiceLedgerDto">
+ SELECT
+ T1.sales_contract_no,
+ SUM(contract_amount) AS invoice_total,
+ IFNULL( SUM(T2.receipt_payment_amount) , 0 ) AS receipt_payment_amount,
+ IFNULL((IFNULL(SUM(contract_amount),0) - IFNULL(SUM(T2.receipt_payment_amount),0)),0) AS unReceipt_payment_amount,
+ T2.receipt_payment_date
+ FROM sales_ledger T1
+ LEFT JOIN receipt_payment T2 ON T1.id = T2.sales_ledger_id
+ <where>
+ T1.customer_id = #{invoiceLedgerDto.customerId}
+ <if test="invoiceLedgerDto.searchText != null and invoiceLedgerDto.searchText != '' ">
+ T1.customer_name LIKE CONCAT ('%',#{invoiceLedgerDto.searchText},'%')
+ </if>
+ </where>
+ GROUP BY T1.sales_contract_no,T2.receipt_payment_date
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/sales/SalesQuotationMapper.xml b/src/main/resources/mapper/sales/SalesQuotationMapper.xml
index a39cd45..1e358ca 100644
--- a/src/main/resources/mapper/sales/SalesQuotationMapper.xml
+++ b/src/main/resources/mapper/sales/SalesQuotationMapper.xml
@@ -4,16 +4,19 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.sales.mapper.SalesQuotationMapper">
<select id="listPage" resultType="com.ruoyi.sales.dto.SalesQuotationDto">
- SELECT * FROM sales_quotation
+ SELECT t1.*,
+ t2.approve_user_ids
+ FROM sales_quotation t1
+ LEFT JOIN approve_process t2 ON t1.quotation_no = t2.approve_reason and t2.approve_type = 6
WHERE 1=1
<if test="salesQuotationDto.quotationNo != null and salesQuotationDto.quotationNo != '' ">
- AND quotation_no LIKE CONCAT('%',#{salesQuotationDto.quotationNo},'%')
+ AND t1.quotation_no LIKE CONCAT('%',#{salesQuotationDto.quotationNo},'%')
</if>
<if test="salesQuotationDto.customer != null and salesQuotationDto.customer != '' ">
- AND customer = #{salesQuotationDto.customer}
+ AND t1.customer = #{salesQuotationDto.customer}
</if>
<if test="salesQuotationDto.status != null and salesQuotationDto.status != '' ">
- AND status = #{salesQuotationDto.status}
+ AND t1.status = #{salesQuotationDto.status}
</if>
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3