From f1a496f4b53e3de34bdf82dab0faa40d2a29bc11 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 24 六月 2024 09:02:36 +0800
Subject: [PATCH] 其他金额设置筛选类型

---
 north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
index 9bc991c..b7cef34 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -615,7 +615,7 @@
                order_type,
                order_classify,
                batch,
-               icon,
+               o.icon,
                pack_type,
                delivery_date,
                al_type,
@@ -625,15 +625,23 @@
                contacts,
                delivery_address,
                od.processing_note,
-               width,
-               height,
-               od.quantity
+                width,
+                height,
+               od.quantity,
+               od.order_number,
+               fc.technology_number
 
         from sd.order as o
                  left join sd.order_detail as od on o.order_id = od.order_id
-        where o.order_id = #{orderId}
-          and od.order_number = #{orderNumber}
+        left join flow_card as fc on o.order_id = fc.order_id and
+                                                    od.order_number = fc.order_number
+        where fc.process_id = #{processId}
+        and fc.technology_number=#{technologyNumber}
+       group by od.order_number,width,height
 
+    </select>
+
+    <select id="getPrintLabelCount">
 
     </select>
 

--
Gitblit v1.8.0