From 053f53f9e0d6d20404c1a00c70d4a01da9a54fd6 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期六, 27 六月 2026 13:59:17 +0800
Subject: [PATCH] fix: 出入库批号生成修改

---
 src/main/resources/mapper/sales/ShippingInfoMapper.xml |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/sales/ShippingInfoMapper.xml b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
index fde05d2..57032c5 100644
--- a/src/main/resources/mapper/sales/ShippingInfoMapper.xml
+++ b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
@@ -23,7 +23,10 @@
         slp.specification_model,
         p.product_name,
         pm.thickness,
-        sl.customer_name
+        sl.customer_name,
+        slp.quantity,
+        slp.width,
+        slp.height
         FROM shipping_info s
         LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
         LEFT JOIN sales_ledger_product slp ON s.sales_ledger_product_id = slp.id and slp.type = 1
@@ -48,7 +51,7 @@
         <if test="req.shippingDateEnd != null and req.shippingDateEnd != ''">
             AND s.shipping_date &lt;= #{req.shippingDateEnd}
         </if>
-        order by create_time DESC
+        order by shipping_no DESC
     </select>
     <select id="listAll" resultType="com.ruoyi.sales.pojo.ShippingInfo">
         SELECT

--
Gitblit v1.9.3