From b1b59aac99c3d465d51e5fb4f7ab8185ddb733d2 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 16 十二月 2025 17:24:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hckx' into hckx
---
src/main/java/com/ruoyi/production/service/impl/SalesLedgerWorkServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/SalesLedgerWorkServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/SalesLedgerWorkServiceImpl.java
index b6590db..2135a8b 100644
--- a/src/main/java/com/ruoyi/production/service/impl/SalesLedgerWorkServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/SalesLedgerWorkServiceImpl.java
@@ -63,12 +63,12 @@
iPage.getRecords().forEach(item -> {
String[] split = item.getSpecificationModel().split("\\*");
if(split.length == 2 && isNumeric(split[1]) && isNumeric(split[0])){
- // 璁＄畻鎹熻��
+ // 璁＄畻鎹熻�楋紙100000浠ｈ〃 鎹熻�楃殑 100 鍜� 鍗曚綅杞崲鐨�1000锛�
BigDecimal divide = new BigDecimal(split[0])
.multiply(new BigDecimal(split[1]))
.multiply(item.getFinishedNum())
.multiply(losses.get(0).getRate())
- .divide(new BigDecimal(100), 2, RoundingMode.HALF_UP);
+ .divide(new BigDecimal(100000), 2, RoundingMode.HALF_UP);
item.setLoss(divide.toString());
}
@@ -129,6 +129,8 @@
Details details1 = new Details();
details1.setInboundQuantity(productionReportDto.getFinishedNum());
details1.setId(Integer.parseInt(salesLedgerWork.getSalesLedgerProductId().toString()));
+ details1.setUnitPrice(productionReportDto.getUnitPrice());
+ details1.setTotalPrice(productionReportDto.getTotalPrice());
details.add(details1);
procurementRecordOutAdd.setDetails(details);
procurementRecordService.add(procurementRecordOutAdd);
--
Gitblit v1.9.3