From 83b345680004d1f9203a847ecb39bbebc6a51478 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 22 一月 2026 11:00:44 +0800
Subject: [PATCH] yys 新疆优化
---
src/main/java/com/ruoyi/production/service/impl/SalesLedgerProductionAccountingServiceImpl.java | 7 ++-----
src/main/java/com/ruoyi/production/pojo/SalesLedgerProductionAccounting.java | 5 +++++
src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml | 5 +++--
src/main/java/com/ruoyi/production/dto/SalesLedgerProductionAccountingDto.java | 3 +++
4 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/SalesLedgerProductionAccountingDto.java b/src/main/java/com/ruoyi/production/dto/SalesLedgerProductionAccountingDto.java
index 297f6b9..f108975 100644
--- a/src/main/java/com/ruoyi/production/dto/SalesLedgerProductionAccountingDto.java
+++ b/src/main/java/com/ruoyi/production/dto/SalesLedgerProductionAccountingDto.java
@@ -61,4 +61,7 @@
@ApiModelProperty(value = "缁撴潫鏃堕棿")
private String entryDateEnd;
+ @ApiModelProperty(value = "鍚◣鍗曚环")
+ private BigDecimal taxInclusiveUnitPrice;
+
}
diff --git a/src/main/java/com/ruoyi/production/pojo/SalesLedgerProductionAccounting.java b/src/main/java/com/ruoyi/production/pojo/SalesLedgerProductionAccounting.java
index 38a2469..072597f 100644
--- a/src/main/java/com/ruoyi/production/pojo/SalesLedgerProductionAccounting.java
+++ b/src/main/java/com/ruoyi/production/pojo/SalesLedgerProductionAccounting.java
@@ -63,6 +63,11 @@
private BigDecimal workHours;
/**
+ * 鎻愭垚鍗犳瘮
+ */
+ private BigDecimal unitPrice;
+
+ /**
* 宸ュ簭
*/
private String process;
diff --git a/src/main/java/com/ruoyi/production/service/impl/SalesLedgerProductionAccountingServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/SalesLedgerProductionAccountingServiceImpl.java
index 3fcb8f2..88721fd 100644
--- a/src/main/java/com/ruoyi/production/service/impl/SalesLedgerProductionAccountingServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/SalesLedgerProductionAccountingServiceImpl.java
@@ -28,11 +28,8 @@
public IPage<SalesLedgerProductionAccountingDto> listPage(Page page, SalesLedgerProductionAccountingDto salesLedgerProductionAccountingDto) {
IPage<SalesLedgerProductionAccountingDto> list = salesLedgerProductionAccountingMapper.listPage(page, salesLedgerProductionAccountingDto);
list.getRecords().forEach(item -> {
- String[] split = item.getSpecificationModel().split("\\*");
- if(split.length == 2 && isNumeric(split[1])){
- // 璁＄畻宸ヨ祫 = 宸ユ椂瀹氶 * 鏁伴噺 * 瑙勬牸
- item.setWages(item.getWages().multiply(new BigDecimal(split[1])));
- }
+ // 璁＄畻宸ヨ祫 = 鐢熶骇鏁伴噺 * 浜у搧鍚◣鍗曚环 * 鎻愭垚鐜�,淇濈暀涓変綅灏忔暟涓嶇敤鍥涜垗浜斿叆
+ item.setWages(item.getWages().multiply(item.getTaxInclusiveUnitPrice()).setScale(3, BigDecimal.ROUND_HALF_UP));
});
return list;
}
diff --git a/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml b/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml
index ea766e6..b78206c 100644
--- a/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml
+++ b/src/main/resources/mapper/production/SalesLedgerProductionAccountingMapper.xml
@@ -5,7 +5,7 @@
<select id="listPage" resultType="com.ruoyi.production.dto.SalesLedgerProductionAccountingDto">
SELECT
t4.id,
- t4.finished_num * t4.work_hours as wages,
+ t4.finished_num * t4.unit_price as wages,
t4.scheduling_user_id,
t4.scheduling_user_name,
t4.scheduling_date,
@@ -18,7 +18,8 @@
T1.customer_name,
t3.product_category,
t3.specification_model,
- t3.unit
+ t3.unit,
+ t3.tax_inclusive_unit_price
FROM
sales_ledger_production_accounting t4
LEFT JOIN sales_ledger T1 ON T1.id = t4.sales_ledger_id
--
Gitblit v1.9.3