From e50fa16b6dbc4e7c50d5fbdbc04d2a556ca01c4e Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 02 十二月 2024 11:26:36 +0800
Subject: [PATCH] 补片流程卡调整

---
 north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml b/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
index eff0aa6..26e6485 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
@@ -436,6 +436,10 @@
         select quantity from sd.`delivery`  where delivery_id=#{deliveryId}
     </select>
 
+    <select id="findOrderDelivery" >
+        select * from sd.`delivery`  where order_id=#{orderId}
+    </select>
+
     <select id="findDeliverydetailsum"  >
         select ifnull(sum(quantity),0) from sd.`delivery_detail`  where delivery_id=#{deliveryId} and delivery_detail_state=#{deliveryDetailState}
     </select>
@@ -543,6 +547,13 @@
     <select id="findOrderNumberd" >
         select *
         from  mm.`finished_goods_inventory`
+        where order_number = #{orderNumber} and order_id=#{orderId};
+
+    </select>
+
+    <select id="findOrderDetailNumberd" >
+        select *
+        from  sd.`order_detail`
         where order_number = #{orderNumber} and order_id=#{orderId};
 
     </select>
@@ -770,7 +781,7 @@
             </if>
 
         </where>
-        order by fgi.id desc
+        order by fgi.update_time desc
 
         limit #{offset},#{pageSize};
     </select>
@@ -845,7 +856,7 @@
 
         </where>
 
-        order by fgi.id desc
+        order by fgi.update_time desc
         limit #{offset},#{pageSize}
         ;
     </select>

--
Gitblit v1.8.0