From 9e5c392acb19838c263a569b09bb56da94bdbbf6 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 05 一月 2026 10:49:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sqd' into sqd
---
src/main/java/com/ruoyi/production/service/impl/SalesLedgerSchedulingServiceImpl.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/SalesLedgerSchedulingServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/SalesLedgerSchedulingServiceImpl.java
index 4f60b7e..13dd28e 100644
--- a/src/main/java/com/ruoyi/production/service/impl/SalesLedgerSchedulingServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/SalesLedgerSchedulingServiceImpl.java
@@ -61,10 +61,12 @@
.map(SalesLedgerWork::getFinishedNum)
.reduce(BigDecimal.ZERO, BigDecimal::add));
// 鐘舵�� = 鏁伴噺鍜屽畬宸ユ暟閲忔瘮杈�
- if(i.getSchedulingNum().compareTo(i.getSuccessNum()) == 0){
+ if(i.getSuccessNum().compareTo(new BigDecimal(0)) == 0){
+ i.setStatus("鏈紑濮�");
+ } else if(i.getQuantity().compareTo(i.getSuccessNum()) <= 0){
i.setStatus("宸插畬鎴�");
}else{
- i.setStatus("鏈畬鎴�");
+ i.setStatus("鐢熶骇涓�");
}
});
return list;
@@ -88,6 +90,13 @@
.filter(j -> j.getSalesLedgerProductId().equals(i.getSalesLedgerProductId()))
.map(SalesLedgerWork::getFinishedNum)
.reduce(BigDecimal.ZERO, BigDecimal::add));
+ if(i.getSuccessNum().compareTo(new BigDecimal(0)) == 0){
+ i.setStatus("鏈紑濮�");
+ } else if(i.getQuantity().compareTo(i.getSuccessNum()) <= 0){
+ i.setStatus("宸插畬鎴�");
+ }else{
+ i.setStatus("鐢熶骇涓�");
+ }
});
ExcelUtil<SalesLedgerSchedulingDto> util = new ExcelUtil<>(SalesLedgerSchedulingDto.class);
util.exportExcel(response, list, "鐢熶骇璁㈠崟");
--
Gitblit v1.9.3