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 | 5 +++--
src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml | 11 ++++++-----
src/main/resources/static/report-template.docx | 0
src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java | 4 ++++
4 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java
index 6b57f2a..bbbbb13 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java
@@ -22,6 +22,10 @@
private BigDecimal warnNum;
/**
+ * 閲囪喘鍚堝悓鍙�
+ */
+ private String purchaseContractNumber;
+ /**
* 閿�鍞悎鍚屽彿
*/
private String salesContractNo;
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 6ea4520..3c1193e 100644
--- a/src/main/java/com/ruoyi/production/service/impl/SalesLedgerSchedulingServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/SalesLedgerSchedulingServiceImpl.java
@@ -259,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;
diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml
index b58db32..21117a3 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml
@@ -19,11 +19,12 @@
t1.create_by,
t2.warn_num,
t4.unit_price,
- t4.unit_price * t1.inbound_num as totalPrice
+ t4.unit_price * t1.inbound_num as totalPrice,
+ t3.purchase_contract_number
from procurement_record_out t1
- left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id and t2.type = 2
- left join purchase_ledger t3 on t3.id = t2.sales_ledger_id
left join procurement_record_storage t4 on t4.id = t1.procurement_record_storage_id
+ left join sales_ledger_product t2 on t2.id = t4.sales_ledger_product_id and t2.type = 2
+ left join purchase_ledger t3 on t3.id = t2.sales_ledger_id
<where>
and t1.type = 1
<if test="req.supplierName != null and req.supplierName != ''">
@@ -120,9 +121,9 @@
t4.unit_price,
t4.unit_price * t1.inbound_num as totalPrice
from procurement_record_out t1
- left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id and t2.type = 1
- left join sales_ledger t3 on t3.id = t2.sales_ledger_id
left join procurement_record_storage t4 on t4.id = t1.procurement_record_storage_id
+ left join sales_ledger_product t2 on t2.id = t4.sales_ledger_product_id and t2.type = 1
+ left join sales_ledger t3 on t3.id = t2.sales_ledger_id
<where>
and t1.type = 2
<if test="req.customerName != null and req.customerName != ''">
diff --git a/src/main/resources/static/report-template.docx b/src/main/resources/static/report-template.docx
index 6824a62..da0a08c 100644
--- a/src/main/resources/static/report-template.docx
+++ b/src/main/resources/static/report-template.docx
Binary files differ
--
Gitblit v1.9.3