From 6416b165e4a3c8ecc2d547ceef0fb3962d3c7b56 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 12 一月 2026 14:58:45 +0800
Subject: [PATCH] 1.查询产品信息列表接口，销售台账查询其产品的状态 2.增添不合格现象字段，取消生产状态字段 3.修改发货审批接口,发货审批通过，生产该订单出库记录 4.存在质检记录并已提交的销售台账删除时做出限制 5.生产报工投入，产出2:1调整
---
src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml | 97 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 91 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
index 3f059e7..fe9b9f8 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
@@ -42,6 +42,8 @@
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,
@@ -57,10 +59,14 @@
<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>
+ order by t1.create_time desc
</select>
<select id="list" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDto">
select
@@ -84,6 +90,32 @@
from procurement_record_storage 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.ProcurementPageDto">
+ select
+ t3.customer_contract_no,
+ t3.sales_contract_no,
+ t3.customer_name,
+ t2.product_category,
+ t1.id,
+ t2.specification_model,
+ t2.unit,
+ t2.quantity,
+ t2.quantity as quantity0,
+ t2.tax_rate,
+ t2.tax_inclusive_unit_price,
+ t2.tax_inclusive_total_price,
+ t2.tax_exclusive_total_price,
+ t1.inbound_batches,
+ t1.inbound_num,
+ t1.create_time,
+ t1.create_time as time,
+ t1.create_by
+ from procurement_record_storage 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="listPageCopy" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">
select
@@ -101,6 +133,8 @@
t2.tax_inclusive_total_price,
t2.tax_exclusive_total_price,
t1.inbound_batches,
+ t1.unit_price as unitPrice,
+ sum(t1.total_price) as totalPrice,
sum(t1.inbound_num) as inboundNum,
sum(t1.inbound_num) as inboundNum0,
t1.inbound_num as totalInboundNum,
@@ -115,6 +149,9 @@
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},'%')
@@ -135,7 +172,8 @@
and t1.create_time <= #{req.endDate}
</if>
</where>
- group by t3.supplier_name,t2.product_category,t2.specification_model
+ group by t3.supplier_name,t2.product_category,t2.specification_model,t1.unit_price
+ order by t1.create_time desc
</select>
<select id="listCopy" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">
select
@@ -160,8 +198,39 @@
t1.update_time as uTime,
t1.create_by
from procurement_record_storage t1
- left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
+ 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
+ where t1.type = 1
+ group by t3.supplier_name,t2.product_category,t2.specification_model
+ </select>
+ <select id="listCopyOne" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">
+ 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,
+ t2.unit,
+ t2.tax_rate,
+ t2.tax_inclusive_unit_price,
+ t2.tax_inclusive_total_price,
+ t2.tax_exclusive_total_price,
+ t1.inbound_batches,
+ t1.inbound_num,
+ t1.inbound_num as inboundNum0,
+ t1.create_time,
+ t1.update_time,
+ t1.create_time as cTime,
+ t1.update_time as uTime,
+ t1.create_by
+ 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
+ where t1.type = 2
+ group by t3.customer_name,t2.product_category,t2.specification_model
</select>
<select id="listPageByProduction" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDto">
select
@@ -178,13 +247,16 @@
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,
+ t2.product_id
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
@@ -193,10 +265,14 @@
<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>
+ order by t1.create_time desc
</select>
<select id="listPageCopyByProduction" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">
select
@@ -215,13 +291,15 @@
t2.tax_inclusive_total_price,
t2.tax_exclusive_total_price,
t1.inbound_batches,
+ sum(t1.total_price) as totalPrice,
+ t1.unit_price,
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
+ t2.warn_num,
+ t2.product_id
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
@@ -230,8 +308,14 @@
<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>
+ <if test="req.salesLedgerProductId != null and req.salesLedgerProductId != ''">
+ and t1.sales_ledger_product_id = #{req.salesLedgerProductId}
</if>
<if test="req.reportDate != null">
and t1.create_time >= #{req.reportDate} and t1.create_time < DATE_ADD(#{req.reportDate}, INTERVAL 1 DAY)
@@ -249,6 +333,7 @@
and t1.create_time <= #{req.endDate}
</if>
</where>
- group by t3.customer_name,t2.product_category,t2.specification_model
+ group by t2.product_category,t2.specification_model,t1.unit_price
+ order by t1.create_time desc
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3