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/production/service/impl/SalesLedgerSchedulingServiceImpl.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 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 cdf8457..3c1193e 100644
--- a/src/main/java/com/ruoyi/production/service/impl/SalesLedgerSchedulingServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/SalesLedgerSchedulingServiceImpl.java
@@ -84,13 +84,15 @@
}
// 鐘舵�� = 鏁伴噺鍜屽畬宸ユ暟閲忔瘮杈�
- if(i.getSchedulingNum().compareTo(new BigDecimal(0)) == 0){
- i.setStatus("鏈畬鎴�");
- } else if(i.getQuantity().compareTo(i.getSchedulingNum()) <= 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.setProgress(i.getSchedulingNum().divide(i.getQuantity(),4,RoundingMode.CEILING).multiply(new BigDecimal(100)));
});
return list;
@@ -257,8 +259,9 @@
// 闇�瑕� / 鎹熻�楃巼
Loss loss = lossMapper.selectOne(new LambdaQueryWrapper<Loss>().last("limit 1"));
BigDecimal lossNum = loss == null ? new BigDecimal(6) : loss.getRate(); //娌℃湁鎹熻�楃巼鍒欓粯璁や负6
-
- return new BigDecimal(totalNum.get()).multiply(new BigDecimal(100)).divide(lossNum, 2,RoundingMode.HALF_UP);
+ lossNum = new BigDecimal(100).subtract(lossNum); // 100 - 鎹熻�楃巼
+ lossNum = lossNum.divide(new BigDecimal(100), 2,RoundingMode.DOWN);
+ return new BigDecimal(totalNum.get()).multiply(lossNum);
}
private final LossMapper lossMapper;
--
Gitblit v1.9.3