From da54b18e2934c39eb21e246aeda8baef9d1af933 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 16 一月 2026 09:54:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy
---
src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml | 166 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 98 insertions(+), 68 deletions(-)
diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml
index 0fc12a9..adc64dd 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml
@@ -19,85 +19,82 @@
t1.create_by,
t2.warn_num,
t4.unit_price,
- t4.unit_price * t1.inbound_num as totalPrice
- from procurement_record_out t1
+ 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 = 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
<where>
and t1.type = 1
<if test="req.supplierName != null and req.supplierName != ''">
- and t3.supplier_name like concat('%',#{req.supplierName},'%')
+ and t3.supplier_name like concat('%',#{req.supplierName},'%')
</if>
<if test="req.productCategory != null and req.productCategory != ''">
- and t2.product_category like concat('%',#{req.productCategory},'%')
+ and t2.product_category like concat('%',#{req.productCategory},'%')
</if>
<if test="req.timeStr != null and req.timeStr != ''">
- and t1.create_time like concat('%',#{req.timeStr},'%')
+ and t1.create_time like concat('%',#{req.timeStr},'%')
</if>
</where>
order by t1.create_time desc
</select>
<select id="list" resultType="com.ruoyi.procurementrecord.dto.ProcurementRecordOutPageDto">
- select
- t3.supplier_name,
- t2.product_category,
- t1.id,
- t2.specification_model,
- t2.unit,
- t2.tax_rate,
- t2.tax_inclusive_unit_price,
- t2.tax_inclusive_total_price,
- t2.tax_exclusive_total_price,
- t1.inbound_num,
- t1.create_time,
- t1.create_time as time,
- t1.create_by
- from procurement_record_out t1
- left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
- left join purchase_ledger t3 on t3.id = t2.sales_ledger_id
- where t1.type = 1
+ select t3.supplier_name,
+ t2.product_category,
+ t1.id,
+ t2.specification_model,
+ t2.unit,
+ t2.tax_rate,
+ t2.tax_inclusive_unit_price,
+ t2.tax_inclusive_total_price,
+ t2.tax_exclusive_total_price,
+ t1.inbound_num,
+ t1.create_time,
+ t1.create_time as time,
+ t1.create_by
+ from procurement_record_out t1
+ left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
+ left join purchase_ledger t3 on t3.id = t2.sales_ledger_id
+ where t1.type = 1
</select>
<select id="listOne" resultType="com.ruoyi.procurementrecord.dto.ProcurementRecordOutPageDto">
- select
- t3.customer_contract_no,
- t3.sales_contract_no,
- t3.customer_name,
- t2.product_category,
- t1.id,
- t2.specification_model,
- t2.unit,
- t2.tax_rate,
- t2.tax_inclusive_unit_price,
- t2.tax_inclusive_total_price,
- t2.tax_exclusive_total_price,
- t1.inbound_num,
- t1.create_time,
- t1.create_time as time,
- t1.create_by
- from procurement_record_out t1
- left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
- left join sales_ledger t3 on t3.id = t2.sales_ledger_id
+ select t3.customer_contract_no,
+ t3.sales_contract_no,
+ t3.customer_name,
+ t2.product_category,
+ t1.id,
+ t2.specification_model,
+ t2.unit,
+ t2.tax_rate,
+ t2.tax_inclusive_unit_price,
+ t2.tax_inclusive_total_price,
+ t2.tax_exclusive_total_price,
+ t1.inbound_num,
+ t1.create_time,
+ t1.create_time as time,
+ t1.create_by
+ from procurement_record_out t1
+ left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
+ left join sales_ledger t3 on t3.id = t2.sales_ledger_id
where t1.type = 2
</select>
<select id="listTwo" resultType="com.ruoyi.procurementrecord.dto.ProcurementRecordOutPageDto">
- select
- t1.supplier_name,
- t1.product_category,
- t1.id,
- t1.specification_model,
- t1.unit,
- t1.tax_rate,
- t1.tax_inclusive_unit_price,
- t1.tax_inclusive_total_price,
- t1.tax_exclusive_total_price,
- t1.inbound_num,
- t1.create_time,
- t1.create_time as time,
- t1.create_by
- from procurement_record_out t1
+ select t1.supplier_name,
+ t1.product_category,
+ t1.id,
+ t1.specification_model,
+ t1.unit,
+ t1.tax_rate,
+ t1.tax_inclusive_unit_price,
+ t1.tax_inclusive_total_price,
+ t1.tax_exclusive_total_price,
+ t1.inbound_num,
+ t1.create_time,
+ t1.create_time as time,
+ t1.create_by
+ from procurement_record_out t1
where t1.type = 3
</select>
<select id="listPageByProduct" resultType="com.ruoyi.procurementrecord.dto.ProcurementRecordOutPageDto">
@@ -118,21 +115,21 @@
t1.create_time,
t1.create_by,
t4.unit_price,
- t4.unit_price * t1.inbound_num as totalPrice
- from procurement_record_out t1
+ 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
<where>
and t1.type = 2
<if test="req.customerName != null and req.customerName != ''">
- and t3.customer_name like concat('%',#{req.customerName},'%')
+ and t3.customer_name like concat('%',#{req.customerName},'%')
</if>
<if test="req.productCategory != null and req.productCategory != ''">
- and t2.product_category like concat('%',#{req.productCategory},'%')
+ and t2.product_category like concat('%',#{req.productCategory},'%')
</if>
<if test="req.timeStr != null and req.timeStr != ''">
- and t1.create_time like concat('%',#{req.timeStr},'%')
+ and t1.create_time like concat('%',#{req.timeStr},'%')
</if>
</where>
order by t1.create_time desc
@@ -153,18 +150,18 @@
t1.create_by,
t2.item_type,
t2.code
- from procurement_record_out t1
+ from procurement_record_out t1
left join custom_storage t2 on t2.id = t1.procurement_record_storage_id
<where>
t1.type = 3
<if test="req.supplierName != null and req.supplierName != ''">
- and t2.supplier_name like concat('%',#{req.supplierName},'%')
+ and t2.supplier_name like concat('%',#{req.supplierName},'%')
</if>
<if test="req.productCategory != null and req.productCategory != ''">
- and t2.product_category like concat('%',#{req.productCategory},'%')
+ and t2.product_category like concat('%',#{req.productCategory},'%')
</if>
<if test="req.timeStr != null and req.timeStr != ''">
- and t1.create_time like concat('%',#{req.timeStr},'%')
+ and t1.create_time like concat('%',#{req.timeStr},'%')
</if>
</where>
order by t1.create_time desc
@@ -173,7 +170,40 @@
<select id="getSumQuantity" resultType="BigDecimal">
select COALESCE(sum(inbound_num), 0)
from procurement_record_out
- where type = 1
- and product_model_id = #{productModelId}
+ where
+ product_model_id = #{productModelId}
</select>
+ <select id="selectCode" resultType="com.ruoyi.procurementrecord.pojo.ProcurementRecordOut">
+ select *
+ from procurement_record_out
+ where code like concat('%', #{format})
+ order by id desc
+ limit 1
+ </select>
+ <select id="listPageBySemiProduct" resultType="com.ruoyi.procurementrecord.dto.ProcurementRecordOutPageDto">
+ select
+ t1.id,
+ t1.code,
+ t2.unit,
+ t1.inbound_num,
+ t1.create_time,
+ t1.create_by,
+ t2.model as specification_model,
+ t2.product_code,
+ t3.product_name as product_category
+ from procurement_record_out t1
+ left join product_model t2 on t2.id = t1.product_model_id
+ left join product t3 on t3.id = t2.product_id
+ <where>
+ and t1.type = 4
+ <if test="req.productCategory !=null and req.productCategory !=''">
+ t3.product_name like concat('%',#{req.productCategory},'%')
+ </if>
+ <if test="req.timeStr != null and req.timeStr != ''">
+ and t1.create_time like concat('%',#{req.timeStr},'%')
+ </if>
+ </where>
+ order by t1.create_time desc
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3