From 83a2ac0bbf44d550a4d0add970d14623298a8574 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 08 一月 2026 16:10:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sqd' into sqd
---
src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
index 6119edd..a17d3e4 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
@@ -50,7 +50,10 @@
t1.create_time,
t1.update_time,
t1.create_by,
- t2.warn_num
+ t2.warn_num,
+ t1.box_num,
+ t1.carton_specifications,
+ t1.dollar_price
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
@@ -123,6 +126,7 @@
t3.purchase_contract_number,
t2.product_category,
t1.id,
+ GROUP_CONCAT(t1.id) as ids,
t1.sales_ledger_product_id,
t1.create_user,
t2.specification_model,
@@ -140,7 +144,10 @@
t1.create_time,
t1.update_time,
t1.create_by,
- t2.warn_num
+ t2.warn_num,
+ t1.box_num,
+ t1.carton_specifications,
+ t1.dollar_price
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
@@ -195,7 +202,10 @@
t1.update_time,
t1.create_time as cTime,
t1.update_time as uTime,
- t1.create_by
+ t1.create_by,
+ t1.box_num,
+ t1.carton_specifications,
+ t1.dollar_price
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
@@ -279,6 +289,7 @@
t3.customer_name,
t2.product_category,
t1.id,
+ group_concat(t1.id) as ids,
t1.sales_ledger_product_id,
t1.create_user,
t2.specification_model,
--
Gitblit v1.9.3