From 82685a4ec94db01c564561582141c03054012ea3 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 07 二月 2025 10:16:38 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 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 3a2adbd..7944b3a 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml
@@ -907,7 +907,32 @@
         where order_number=#{orderNumber}  and order_id=#{orderId} and delivery_id=#{deliveryId} and delivery_detail_state=0
     </select>
 
+    <select id="getSelectDeliveryDetailDeliveryId"  resultMap="selectDelivery">
+        select dd.delivery_id,
+               dd.order_number,
+               dd.order_id,
+               o.project,
+               od.product_id,
+               od.product_name,
+               d.customer_name,
+               od.width,
+               od.height,
+               dd.quantity as dd_quantity,
+               od.warehouse_num,
+               od.delivery_num,
+               d.area,
+               od.building_number,
+               d.creator,
+               dd.delivery_detail_remakes,
+               dd.create_time
+        from sd.delivery_detail dd
+                 left join sd.delivery d on dd.delivery_id = d.delivery_id
+                 left join sd.order_detail od on od.order_id = dd.order_id and dd.order_number = od.order_number
+                 left join sd.`order` o on o.order_id = dd.order_id
 
+        where dd.delivery_id= #{deliveryId}
+
+    </select>
 
 
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0