From 47200ddd17698ae4afefd0d25c6b1b9551bcf14f Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 10 三月 2026 11:11:00 +0800
Subject: [PATCH] yys 1.工资计算修改
---
src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml | 25 +++++++------------------
1 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
index 6fc731f..597f2bc 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
@@ -234,19 +234,12 @@
</select>
<select id="listPageByProduction" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDto">
select
- t3.customer_contract_no,
- t3.sales_contract_no,
- t3.customer_name,
- t2.product_category,
t1.id,
t1.sales_ledger_product_id,
t1.create_user,
- t2.specification_model,
+ t3.product_name as productCategory,
+ t2.model as specificationModel,
t2.unit,
- t2.tax_rate,
- t2.tax_inclusive_unit_price,
- (t1.inbound_num * t2.tax_inclusive_unit_price) as taxInclusiveTotalPrice,
- (t1.inbound_num * t2.tax_inclusive_unit_price - t1.inbound_num * t2.tax_inclusive_unit_price * t2.tax_rate / 100) as taxExclusiveTotalPrice,
t1.unit_price,
t1.total_price,
t1.inbound_batches,
@@ -255,18 +248,14 @@
t1.create_time,
t1.update_time,
t1.create_by,
- t2.warn_num,
- t2.product_id
+ t3.id as productId
from procurement_record_storage t1
- left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id and t2.type = 3
- left join sales_ledger t3 on t3.id = t2.sales_ledger_id
+ left join product_model t2 on t2.id = t1.product_model_id
+ left join product t3 on t3.id = t2.product_id
<where>
- t1.type = 2 and t1.sales_ledger_product_id != 0
- <if test="req.customerName != null and req.customerName != ''">
- and t3.customer_name like concat('%',#{req.customerName},'%')
- </if>
+ t1.type = 2
<if test="req.productCategory != null and req.productCategory != ''">
- and t2.product_category like concat('%',#{req.productCategory},'%')
+ and t3.product_name like concat('%',#{req.productCategory},'%')
</if>
<if test="req.timeStr != null and req.timeStr != ''">
and t1.create_time like concat('%',#{req.timeStr},'%')
--
Gitblit v1.9.3