From 99c61e2e4c5aabe594ff8a463a45f3a6b5cb9add Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期五, 29 五月 2026 17:55:58 +0800
Subject: [PATCH] feat: 调整
---
src/main/resources/mapper/stock/StockOutRecordMapper.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockOutRecordMapper.xml b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
index 9222529..4b0233d 100644
--- a/src/main/resources/mapper/stock/StockOutRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
@@ -28,7 +28,7 @@
WHEN '3' THEN ppm.product_no
WHEN '8' THEN sl.sales_contract_no
WHEN '9' THEN pr.no
- WHEN '13' THEN si.shipping_no
+ WHEN '13' THEN CONCAT(si.shipping_no, IF(sl2.sales_contract_no IS NOT NULL AND sl2.sales_contract_no != '', CONCAT(' / ', sl2.sales_contract_no), ''))
WHEN '1' THEN sor.remark
WHEN '10' THEN sor.remark
ELSE NULL
@@ -41,6 +41,7 @@
LEFT JOIN sales_ledger as sl on sor.record_type = '8' and sor.record_id = sl.id
LEFT JOIN purchase_return_orders as pr on sor.record_type = '9' and sor.record_id = pr.id
LEFT JOIN shipping_info as si on sor.record_type = '13' and sor.record_id = si.id
+ LEFT JOIN sales_ledger as sl2 on sor.record_type = '13' and si.sales_ledger_id = sl2.id
<where>
<if test="params.timeStr != null and params.timeStr != ''">
and sor.create_time like concat('%',#{params.timeStr},'%')
@@ -68,7 +69,7 @@
WHEN '3' THEN ppm.product_no
WHEN '8' THEN sl.sales_contract_no
WHEN '9' THEN pr.no
- WHEN '13' THEN si.shipping_no
+ WHEN '13' THEN CONCAT(si.shipping_no, IF(sl2.sales_contract_no IS NOT NULL AND sl2.sales_contract_no != '', CONCAT(' / ', sl2.sales_contract_no), ''))
WHEN '1' THEN sor.remark
WHEN '10' THEN sor.remark
ELSE NULL
@@ -81,6 +82,7 @@
LEFT JOIN sales_ledger as sl on sor.record_type = '8' and sor.record_id = sl.id
LEFT JOIN purchase_return_orders as pr on sor.record_type = '9' and sor.record_id = pr.id
LEFT JOIN shipping_info as si on sor.record_type = '13' and sor.record_id = si.id
+ LEFT JOIN sales_ledger as sl2 on sor.record_type = '13' and si.sales_ledger_id = sl2.id
<where>
<if test="params.timeStr != null and params.timeStr != ''">
and sor.create_time like concat('%',#{params.timeStr},'%')
--
Gitblit v1.9.3