From 441dfbd1908affc1accc52006a2fe81a5067052d Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 22 六月 2026 09:28:09 +0800
Subject: [PATCH] 废品库存的批号如果有多个,则需要展示多个

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

diff --git a/src/main/resources/mapper/sales/ShippingProductDetailMapper.xml b/src/main/resources/mapper/sales/ShippingProductDetailMapper.xml
index 464af10..06451ab 100644
--- a/src/main/resources/mapper/sales/ShippingProductDetailMapper.xml
+++ b/src/main/resources/mapper/sales/ShippingProductDetailMapper.xml
@@ -9,14 +9,23 @@
         <result column="batch_no" property="batchNo" />
         <result column="quantity" property="quantity" />
         <result column="shipping_info_id" property="shippingInfoId" />
+        <result column="product_model_id" property="productModelId" />
+        <result column="stock_type" property="stockType" />
     </resultMap>
     <select id="getDetail" resultType="com.ruoyi.sales.dto.ShippingProductDetailDto">
-        select si.batch_no, pm.model as specification_model, p.product_name, spd.quantity as delivery_quantity
+        select spd.batch_no, pm.model as specification_model, p.product_name, spd.quantity as delivery_quantity
         from shipping_product_detail spd
-                 left join stock_inventory si on si.id = spd.stock_inventory_id
-                 left join product_model pm on pm.id = si.product_model_id
+                 left join product_model pm on pm.id = spd.product_model_id
                  left join product p on p.id = pm.product_id
         where spd.shipping_info_id = #{id}
     </select>
+    <select id="getDateilByShippingNo" resultType="com.ruoyi.sales.dto.ShippingProductDetailDto">
+         select spd.batch_no, pm.model as specification_model, p.product_name, spd.quantity as delivery_quantity
+         from shipping_product_detail spd
+                  left join shipping_info sp on sp.id = spd.shipping_info_id
+                  left join product_model pm on pm.id = spd.product_model_id
+                  left join product p on p.id = pm.product_id
+         where sp.shipping_no = #{shippingNo}
+    </select>
 
 </mapper>

--
Gitblit v1.9.3