From 6b39b27a2807f4fb60e3b8ac12a1bb5deaad7775 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 14 一月 2026 14:04:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy

---
 src/main/resources/mapper/sales/SalesLedgerProductMapper.xml |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
index ec8d8d4..395ce1b 100644
--- a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
@@ -11,7 +11,7 @@
         t3.shipping_date
         FROM
         sales_ledger_product T1
-        left join shipping_info t3 on T1.id = t3.sales_ledger_id
+        left join shipping_info t3 on T1.id = t3.sales_ledger_product_id
         <where>
             1=1
             <if test="salesLedgerProduct.salesLedgerId != null and salesLedgerProduct.salesLedgerId != '' ">
@@ -22,4 +22,15 @@
             </if>
         </where>
     </select>
+    <select id="selectSalesLedgerProductByMainId" resultType="com.ruoyi.sales.pojo.SalesLedgerProduct">
+        select slp.*
+        from quality_inspect qi
+                 left join production_product_main ppm on qi.product_main_id = ppm.id
+                 left join product_work_order pwo on ppm.work_order_id = pwo.id
+                 left join product_order  po on pwo.product_order_id = po.id
+                 left join sales_ledger_product slp on po.product_model_id = slp.id
+        where qi.product_main_id = #{productMainId}
+
+
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3