From 258b69ac258a3cee13792ef8441977e7dae9b7d8 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 02 二月 2026 11:20:20 +0800
Subject: [PATCH] yys 成品入库单价修改，成品库存修改
---
src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml | 106 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 78 insertions(+), 28 deletions(-)
diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
index c66cf09..8537970 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
@@ -20,7 +20,7 @@
t2.tax_exclusive_total_price,
t3.inbound_num as quantityStock
from purchase_ledger t1
- left join sales_ledger_product t2 on t1.id = t2.sales_ledger_id
+ left join sales_ledger_product t2 on t1.id = t2.sales_ledger_id and t2.type = 2
left join procurement_record_storage t3 on t2.id = t3.sales_ledger_product_id
where t1.purchase_contract_number = #{req.purchaseContractNumber}
<if test="req.id != null and req.id != ''">
@@ -42,25 +42,36 @@
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,
t1.inbound_num,
t1.inbound_num as inboundNum0,
t1.create_time,
t1.update_time,
t1.create_by,
- t2.warn_num
+ t2.warn_num,
+ (t1.inbound_num - COALESCE(SUM(t4.inbound_num), 0)) / count(1) AS availableStock
from procurement_record_storage 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_out t4 on t1.id = t4.procurement_record_storage_id and t4.type = 1
<where>
t1.type = 1
<if test="req.supplierName != null and 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},'%')
+ </if>
<if test="req.timeStr != null and req.timeStr != ''">
and t1.create_time like concat('%',#{req.timeStr},'%')
</if>
</where>
+ group by t1.id
+ <if test="req.flag != null and req.flag">
+ having availableStock > 0
+ </if>
order by t1.create_time desc
</select>
<select id="list" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDto">
@@ -128,20 +139,26 @@
t2.tax_inclusive_total_price,
t2.tax_exclusive_total_price,
t1.inbound_batches,
- sum(t1.inbound_num) as inboundNum,
- sum(t1.inbound_num) as inboundNum0,
- t1.inbound_num as totalInboundNum,
+ t1.unit_price as unitPrice,
+ sum(t1.total_price) as totalPrice,
+ sum(t1.inbound_num) / COALESCE(count(1), 1) as inboundNum,
+ sum(t1.inbound_num) / COALESCE(count(1), 1) as inboundNum0,
t1.create_time,
t1.update_time,
t1.create_by,
- t2.warn_num
+ t2.warn_num,
+ (SUM(t1.inbound_num) - COALESCE(SUM(t4.inbound_num), 0)) / COALESCE(count(1), 1) AS availableStock
from procurement_record_storage 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_out t4 on t1.id = t4.procurement_record_storage_id and t4.type = 1
<where>
- t1.type = 1
+ t1.type = 1 and t4.type = 1
<if test="req.supplierName != null and 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},'%')
</if>
<if test="req.timeStr != null and req.timeStr != ''">
and t1.create_time like concat('%',#{req.timeStr},'%')
@@ -162,7 +179,8 @@
and t1.create_time <= #{req.endDate}
</if>
</where>
- group by t3.supplier_name,t2.product_category,t2.specification_model
+ group by t2.product_category,t2.specification_model,t1.unit_price
+ having availableStock > 0
order by t1.create_time desc
</select>
<select id="listCopy" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">
@@ -228,6 +246,7 @@
t3.sales_contract_no,
t3.customer_name,
t2.product_category,
+ group_concat(t1.id) as ids,
t1.id,
t1.sales_ledger_product_id,
t1.create_user,
@@ -237,36 +256,47 @@
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,
t1.inbound_num,
t1.inbound_num as inboundNum0,
t1.create_time,
t1.update_time,
t1.create_by,
- t2.warn_num
+ t2.warn_num,
+ (t1.inbound_num - COALESCE(SUM(t4.inbound_num), 0)) / count(1) AS availableStock
from procurement_record_storage 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_out t4 on t4.procurement_record_storage_id = t1.id and t4.type = 2
<where>
t1.type = 2
<if test="req.customerName != null and 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},'%')
+ </if>
<if test="req.timeStr != null and req.timeStr != ''">
and t1.create_time like concat('%',#{req.timeStr},'%')
</if>
</where>
+ group by t1.id
+ <if test="req.flag != null and req.flag">
+ having availableStock > 0
+ </if>
order by t1.create_time desc
</select>
<select id="listPageCopyByProduction" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">
- select
+ 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,
+ NULL AS id,
+ NULL AS sales_ledger_product_id,
+ NULL AS create_user,
t2.specification_model,
t2.unit,
t2.min_stock,
@@ -274,24 +304,40 @@
t2.tax_inclusive_unit_price,
t2.tax_inclusive_total_price,
t2.tax_exclusive_total_price,
- t1.inbound_batches,
- sum(t1.inbound_num) as inboundNum,
- sum(t1.inbound_num) as inboundNum0,
- t1.inbound_num as totalInboundNum,
- t1.create_time,
- t1.update_time,
- t1.create_by,
- t2.warn_num
- from procurement_record_storage 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
+ GROUP_CONCAT(DISTINCT t1.inbound_batches) AS inbound_batches,
+ SUM(t1.total_price) AS totalPrice,
+ t1.unit_price,
+ SUM(t1.inbound_num) AS inboundNum,
+ SUM(t1.inbound_num) AS inboundNum0,
+ MAX(t1.create_time) AS create_time,
+ MAX(t1.update_time) AS update_time,
+ GROUP_CONCAT(DISTINCT t1.create_by) AS create_by,
+ t2.warn_num,
+ (SUM(t1.inbound_num) - IFNULL(SUM(t4.total_outbound_num), 0)) AS availableStock
+ FROM procurement_record_storage 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 (
+ SELECT
+ procurement_record_storage_id,
+ SUM(inbound_num) AS total_outbound_num
+ FROM procurement_record_out
+ WHERE type = 2
+ GROUP BY procurement_record_storage_id
+ ) t4 ON t1.id = t4.procurement_record_storage_id
<where>
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},'%')
</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>
<if test="req.reportDate != null">
and t1.create_time >= #{req.reportDate} and t1.create_time < DATE_ADD(#{req.reportDate}, INTERVAL 1 DAY)
@@ -309,7 +355,11 @@
and t1.create_time <= #{req.endDate}
</if>
</where>
- group by t2.product_category,t2.specification_model
- order by t1.create_time desc
+ GROUP BY
+ t2.product_category,
+ t2.specification_model,
+ t1.unit_price
+ HAVING availableStock > 0
+ ORDER BY create_time DESC
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3