From 3ab330b8aefb3cd781c9b8730b4ab7ac65e7e9d7 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 07 三月 2025 09:14:08 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 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 5d3fedf..9719ff7 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -2858,7 +2858,7 @@
     </select>
 
     <select id="flowCardToOptimizeCount">
-        select count(*) from pp.flow_card where order_id = #{orderId} and engineering_occupancy=1
+        select count(*) from pp.flow_card where order_id = #{orderId} and project_no is not null
     </select>
 
     <select id="getFlowCardDetail" >
@@ -2899,13 +2899,28 @@
     
     <select id="getOrderDetailByProductionId">
         select * from (select a.*,
+                              a.quantity as 'baiscQuantity',
+                              #{glassThickness} as 'thickness',
         IF(a.height >= a.width, a.height, a.width) as 'long',
         IF(a.height &lt; a.width, a.height, a.width) as 'short'
         from sd.order_detail as a
         left join sd.order_glass_detail as b
         on a.order_id = b.order_id and a.order_number = b.order_number
         where a.order_id = #{orderId} and b.production_id = #{productionId}
+
         group by a.order_number) as c
+        <if test="type=='scope'">
+            where  c.`long` &lt;= #{inLenMax}
+                and c.`long` >= #{inLenMin}
+                and c.`short` >= #{inShortMin}
+                and c.`short` &lt;= #{inShortMax}
+        </if>
+        <if test="type=='notScope'">
+            where  !(c.`long` &lt;= #{inLenMax}
+            and c.`long` >= #{inLenMin}
+            and c.`short` >= #{inShortMin}
+            and c.`short` &lt;= #{inShortMax})
+        </if>
         order by c.`long` desc
     </select>
 
@@ -2938,7 +2953,7 @@
                JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01'))                  AS glassNumber,
                od.order_number,
                ogd.child_width as width,
-               ogd.child_height as height,
+               ogd.child_height as height
         from sd.order_glass_detail as ogd
                  left join sd.order_detail as od on od.order_id = ogd.order_id and od.order_number = ogd.order_number
                  left join sd.`order` as o on o.order_id = ogd.order_id

--
Gitblit v1.8.0