From 3e5e22f5358156ff7430ee117546123ffe042611 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期日, 20 九月 2026 20:23:52 +0800
Subject: [PATCH] feat(stock): 实现出品出库绑定销售台账功能
---
src/main/resources/mapper/sales/ShippingInfoMapper.xml | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/sales/ShippingInfoMapper.xml b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
index fe60cdc..02815fc 100644
--- a/src/main/resources/mapper/sales/ShippingInfoMapper.xml
+++ b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
@@ -66,7 +66,7 @@
UNION ALL
SELECT
o.id,
- NULL as sales_ledger_id,
+ o.sales_ledger_id,
o.out_date as shipping_date,
o.truck_plate_no as shipping_car_number,
NULL as express_number,
@@ -79,7 +79,7 @@
o.create_user,
o.update_user,
NULL as tenant_id,
- NULL as sales_contract_no,
+ sl2.sales_contract_no,
pm2.model as specification_model,
pm2.unit,
p2.product_name,
@@ -99,11 +99,13 @@
FROM stock_out_record o
left join product_model pm2 on pm2.id = o.product_model_id
left join product p2 on p2.id = pm2.product_id
+ <!-- 缁戝畾浜嗛攢鍞彴璐︾殑娌瑰搧鍑哄簱甯﹀嚭鍚堝悓鍙凤紱娌＄粦鐨勮璇ュ垪浠嶄负绌� -->
+ left join sales_ledger sl2 on sl2.id = o.sales_ledger_id
WHERE o.out_category = '閿�鍞�' AND o.approval_status = 1
- <!-- 娌瑰搧鍑哄簱娌℃湁鍚堝悓鍙�/蹇�掑崟锛屾寜杩欎袱椤圭瓫閫夋椂涓嶅簲杩斿洖浠讳綍娌瑰搧琛� -->
<if test="req.salesContractNo != null and req.salesContractNo != ''">
- AND 1=0
+ AND sl2.sales_contract_no LIKE CONCAT('%',#{req.salesContractNo},'%')
</if>
+ <!-- 娌瑰搧鍑哄簱娌℃湁蹇�掑崟锛屾寜蹇�掑崟鍙风瓫閫夋椂涓嶅簲杩斿洖浠讳綍娌瑰搧琛� -->
<if test="req.expressNumber != null and req.expressNumber != ''">
AND 1=0
</if>
--
Gitblit v1.9.3