From 99cc2c135bb97943ef25f31d4d85c24b683b725b Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 24 十二月 2025 11:31:50 +0800
Subject: [PATCH] yys 成品入库修改入库时间
---
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index 35985d8..37ef955 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -211,9 +211,11 @@
// 璁＄畻鍥炴閲戦锛屽緟鍥炴閲戦
List<InvoiceRegistrationProduct> invoiceRegistrationProducts = invoiceRegistrationProductMapper.selectList(new LambdaQueryWrapper<InvoiceRegistrationProduct>()
.in(InvoiceRegistrationProduct::getSalesLedgerId, salesLedgerIds));
-
- List<InvoiceLedger> invoiceLedgers = invoiceLedgerMapper.selectList(new LambdaQueryWrapper<InvoiceLedger>()
- .in(InvoiceLedger::getInvoiceRegistrationProductId, invoiceRegistrationProducts.stream().map(InvoiceRegistrationProduct::getId).collect(Collectors.toList())));
+ List<InvoiceLedger> invoiceLedgers = new ArrayList<>();
+ if(!CollectionUtils.isEmpty(invoiceRegistrationProducts)){
+ invoiceLedgers = invoiceLedgerMapper.selectList(new LambdaQueryWrapper<InvoiceLedger>()
+ .in(InvoiceLedger::getInvoiceRegistrationProductId, invoiceRegistrationProducts.stream().map(InvoiceRegistrationProduct::getId).collect(Collectors.toList())));
+ }
List<ReceiptPayment> receiptPayments = new ArrayList<>();
if(!CollectionUtils.isEmpty(invoiceLedgers)){
receiptPayments = receiptPaymentMapper.selectList(new LambdaQueryWrapper<ReceiptPayment>()
@@ -294,7 +296,18 @@
}
salesLedger.setInvoiceTotal(invoiceTotal);
// 鍒ゆ柇鏄惁鏄敓浜у畬鎴�
- salesLedger.setProductionStatus(salesLedgerProductCountMap.get(salesLedger.getId()) == null ? "鏈紑濮�" : salesLedgerProductCountMap.get(salesLedger.getId()).compareTo(salesLedgerWorkCountMap.get(salesLedger.getId())) > 0 ? "鐢熶骇涓�" : "宸插畬鎴�");
+ String productionStatus = "";
+ BigDecimal productCount = salesLedgerProductCountMap.get(salesLedger.getId());
+ BigDecimal workCount = salesLedgerWorkCountMap.get(salesLedger.getId());
+
+ if (productCount == null || workCount == null) {
+ productionStatus = "鏈紑濮�";
+ } else if (productCount.compareTo(workCount) > 0) {
+ productionStatus = "鐢熶骇涓�";
+ } else if(productCount.compareTo(workCount) <= 0){
+ productionStatus = "宸插畬鎴�";
+ }
+ salesLedger.setProductionStatus(productionStatus);
}
if (ObjectUtils.isNotEmpty(salesLedgerDto.getStatus())) {
if (salesLedgerDto.getStatus()) {
--
Gitblit v1.9.3