From 95c61d927e361592eec441c293acde5bff0fd494 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 27 一月 2026 13:48:13 +0800
Subject: [PATCH] yys 销售，采购导出修改
---
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | 8 +++++++-
src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java | 6 ++++++
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 6 ++++++
src/main/java/com/ruoyi/sales/pojo/SalesLedger.java | 14 --------------
src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java | 3 ++-
5 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java b/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
index fef46ea..e01db26 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
@@ -90,7 +90,7 @@
/**
* 闄勪欢鏉愭枡璺緞鎴栧悕绉�
*/
- @Excel(name = "闄勪欢鏉愭枡璺緞鎴栧悕绉�")
+// @Excel(name = "闄勪欢鏉愭枡璺緞鎴栧悕绉�")
private String attachmentMaterials;
/**
@@ -151,6 +151,7 @@
@ApiModelProperty(value = "浠樻鏂瑰紡")
private String paymentMethod;
@ApiModelProperty("瀹℃壒鐘舵�� 1-寰呭鏍革紝2-瀹℃壒涓紝3-瀹℃壒閫氳繃锛�4-瀹℃壒澶辫触,5琛ㄧず鏄ā鏉�")
+ @Excel(name = "瀹℃壒鐘舵��", readConverterExp = "1=寰呭鏍�,2=瀹℃壒涓�,3=瀹℃壒閫氳繃,4=瀹℃壒澶辫触")
private Integer approvalStatus;
@ApiModelProperty(value = "妯℃澘鍚嶇О")
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
index 8277593..e5dd8a3 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
@@ -643,6 +643,12 @@
List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>().in(SysUser::getNickName,
salesLedgerImportDtoList.stream().map(PurchaseLedgerImportDto::getRecorderName).collect(Collectors.toList())));
for (PurchaseLedgerImportDto salesLedgerImportDto : salesLedgerImportDtoList) {
+ PurchaseLedger purchaseLedger = purchaseLedgerMapper.selectOne(new LambdaQueryWrapper<PurchaseLedger>()
+ .eq(PurchaseLedger::getPurchaseContractNumber, salesLedgerImportDto.getPurchaseContractNumber())
+ .last("limit 1"));
+ if(purchaseLedger != null){
+ continue;
+ }
PurchaseLedger salesLedger = new PurchaseLedger();
BeanUtils.copyProperties(salesLedgerImportDto, salesLedger);
// 閫氳繃渚涘簲鍟嗗悕绉版煡璇D
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index 46d3d48..f006c5b 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -163,8 +163,14 @@
@Log(title = "閿�鍞彴璐�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SalesLedgerDto salesLedgerDto) {
- List<SalesLedger> list = salesLedgerService.selectSalesLedgerList(salesLedgerDto);
+ Page page = new Page(-1,-1);
+ IPage<SalesLedger> salesLedgerIPage = listPage(page, salesLedgerDto);
ExcelUtil<SalesLedger> util = new ExcelUtil<SalesLedger>(SalesLedger.class);
+ if(salesLedgerIPage == null){
+ util.exportExcel(response, new ArrayList<>(), "閿�鍞彴璐︽暟鎹�");
+ return;
+ }
+ List<SalesLedger> list = salesLedgerIPage.getRecords();
util.exportExcel(response, list, "閿�鍞彴璐︽暟鎹�");
}
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
index 955f4da..8a48696 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
@@ -40,20 +40,6 @@
@Excel(name = "瀹㈡埛鍚堝悓鍙�")
private String customerContractNo;
- /**
- * 鍙戣揣杞︾墝鍙�
- */
- @Excel(name = "鍙戣揣杞︾墝鍙�")
- @TableField(exist = false)
- private String shippingCarNumber;
-
- /**
- * 鍙戣揣鏃ユ湡
- */
- @Excel(name = "鍙戣揣鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
- @TableField(exist = false)
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date shippingDate;
/**
* 椤圭洰鍚嶇О
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
index 6f705a4..7464933 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -375,6 +375,12 @@
List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>().in(SysUser::getNickName,
salesLedgerImportDtoList.stream().map(SalesLedgerImportDto::getEntryPerson).collect(Collectors.toList())));
for (SalesLedgerImportDto salesLedgerImportDto : salesLedgerImportDtoList) {
+ SalesLedger salesLedger1 = salesLedgerMapper.selectOne(new LambdaQueryWrapper<SalesLedger>()
+ .eq(SalesLedger::getSalesContractNo, salesLedgerImportDto.getSalesContractNo())
+ .last("LIMIT 1"));
+ if(salesLedger1 != null){
+ continue;
+ }
SalesLedger salesLedger = new SalesLedger();
BeanUtils.copyProperties(salesLedgerImportDto, salesLedger);
salesLedger.setExecutionDate(DateUtils.toLocalDate(salesLedgerImportDto.getExecutionDate()));
--
Gitblit v1.9.3