From 9c49c10d3d007d2c242383f3d0134a5aa402fec8 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 22 十二月 2025 18:57:53 +0800
Subject: [PATCH] yys 修改bug
---
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index fe79f8a..37ef955 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -296,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