From 18c919819ba263a03783afa38d1294436584c842 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期二, 30 十二月 2025 18:04:24 +0800
Subject: [PATCH] 删除已开票的销售台账时，同步删除开票台账记录，修改出库台账导出
---
src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml | 36 ++++++++++++++++++++++++------------
1 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml
index 708e983..c8290fe 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml
@@ -19,7 +19,10 @@
t1.create_by,
t2.warn_num,
t4.unit_price,
- t4.unit_price * t1.inbound_num as totalPrice
+ t4.unit_price * t1.inbound_num as totalPrice,
+ t4.box_num,
+ t4.carton_specifications,
+ t4.dollar_price
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
@@ -52,11 +55,15 @@
t1.inbound_num,
t1.create_time,
t1.create_time as time,
- t1.create_by
+ t1.create_by,
+ t4.box_num,
+ t4.carton_specifications,
+ t4.dollar_price
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
+ left join procurement_record_storage t4 on t4.id = t1.procurement_record_storage_id
+ where t1.type = 1
</select>
<select id="listOne" resultType="com.ruoyi.procurementrecord.dto.ProcurementRecordOutPageDto">
@@ -84,20 +91,23 @@
<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.`code`,
+ t3.supplier_name,
+ t2.product_category,
+ 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 = 3
</select>
<select id="listPageByProduct" resultType="com.ruoyi.procurementrecord.dto.ProcurementRecordOutPageDto">
@@ -154,7 +164,9 @@
t1.create_by,
t2.item_type,
t2.box_num,
- t2.carton_specifications
+ t2.carton_specifications,
+ t2.dollar_price,
+ t2.url
from procurement_record_out t1
left join custom_storage t2 on t2.id = t1.procurement_record_storage_id
<where>
--
Gitblit v1.9.3