From e5e8464e8a6385683187b3459f8bfb5f9682a8ae Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 22 一月 2026 14:37:54 +0800
Subject: [PATCH] yys 发货台账优化
---
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index e968530..3398347 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -21,14 +21,19 @@
import com.ruoyi.sales.pojo.SalesLedger;
import com.ruoyi.sales.service.ICommonFileService;
import com.ruoyi.sales.service.ISalesLedgerService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@@ -42,6 +47,7 @@
@RestController
@RequestMapping("/sales/ledger")
@AllArgsConstructor
+@Api(tags = "閿�鍞彴璐�")
public class SalesLedgerController extends BaseController {
private ISalesLedgerService salesLedgerService;
@@ -56,6 +62,18 @@
@Autowired
private ReceiptPaymentMapper receiptPaymentMapper;
+
+ /**
+ * 瀵煎叆閿�鍞彴璐�
+ */
+ @Log(title = "瀵煎叆閿�鍞彴璐�", businessType = BusinessType.INSERT)
+ @PostMapping("/import")
+ @ApiOperation("瀵煎叆閿�鍞彴璐�")
+ public AjaxResult importData(@RequestParam("file")
+ @ApiParam(value = "Excel鏂囦欢", required = true)
+ MultipartFile file) {
+ return salesLedgerService.importData(file);
+ }
/**
* 鏌ヨ閿�鍞彴璐﹀垪琛�
@@ -102,6 +120,20 @@
List<SalesLedger> list = salesLedgerService.selectSalesLedgerList(salesLedgerDto);
ExcelUtil<SalesLedger> util = new ExcelUtil<SalesLedger>(SalesLedger.class);
util.exportExcel(response, list, "閿�鍞彴璐︽暟鎹�");
+ }
+
+ /**
+ * 瀵煎嚭寮�绁ㄧ櫥璁板垪琛�
+ */
+ @Log(title = "瀵煎嚭寮�绁ㄧ櫥璁板垪琛�", businessType = BusinessType.EXPORT)
+ @PostMapping("/exportOne")
+ public void exportOne(HttpServletResponse response, SalesLedgerDto salesLedgerDto) {
+ Page page = new Page();
+ page.setCurrent(-1);
+ page.setSize(-1);
+ IPage<SalesLedger> salesLedgerIPage = listPage(page, salesLedgerDto);
+ ExcelUtil<SalesLedger> util = new ExcelUtil<SalesLedger>(SalesLedger.class);
+ util.exportExcel(response, salesLedgerIPage == null ? new ArrayList<>() : salesLedgerIPage.getRecords(), "瀵煎嚭寮�绁ㄧ櫥璁板垪琛�");
}
/**
@@ -191,7 +223,6 @@
List<Long> salesLedgerIds = iPage.getRecords().stream().map(SalesLedger::getId).collect(Collectors.toList());
List<InvoiceLedgerDto> invoiceLedgerDtoList = invoiceLedgerMapper.invoicedTotal(salesLedgerIds);
if(CollectionUtils.isEmpty(invoiceLedgerDtoList)){
- iPage.setTotal(iPage.getRecords().size());
return iPage;
}
// 璁＄畻鍥炴閲戦锛屽緟鍥炴閲戦
@@ -206,6 +237,9 @@
.in(ReceiptPayment::getInvoiceLedgerId, invoiceLedgers.stream().map(InvoiceLedger::getId).collect(Collectors.toList())));
}
for (SalesLedger salesLedger : iPage.getRecords()) {
+ if(salesLedger.getShippingDate() != null){
+ salesLedger.setShippingStatus("宸插彂璐�");
+ }
boolean existFlag = false;
BigDecimal noInvoiceAmountTotal = BigDecimal.ZERO;
BigDecimal invoiceTotal = BigDecimal.ZERO;
@@ -246,10 +280,12 @@
}
if (ObjectUtils.isNotEmpty(salesLedgerDto.getStatus())) {
if (salesLedgerDto.getStatus()) {
+ long count = iPage.getRecords().stream().filter(salesLedger -> Objects.equals(salesLedger.getNoInvoiceAmountTotal(), new BigDecimal("0.00"))).count();
iPage.getRecords().removeIf(salesLedger -> Objects.equals(salesLedger.getNoInvoiceAmountTotal(), new BigDecimal("0.00")));
+ iPage.setTotal(iPage.getTotal() - count);
}
}
- iPage.setTotal(iPage.getRecords().size());
+
return iPage;
}
}
--
Gitblit v1.9.3