From a04d735ab3f2e9c52ebf52c35dfa1506d86d416d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 24 七月 2025 17:01:57 +0800
Subject: [PATCH] 修改流程卡打印获取第一个工序不正确问题,在制品汇总报表添加批次

---
 north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml
index 1122a2f..f399425 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml
@@ -129,6 +129,7 @@
         from order_process_detail as a
         left join `order` as b on a.order_id=b.order_id
         where b.create_time BETWEEN #{selectTime1} and #{selectTime2}
+          and position(#{orderId} in b.order_id)
         group by process
 
     </select>
@@ -144,11 +145,12 @@
                    left join sd.`order` o2 on c.order_id = o2.order_id,
                    (SELECT @i:=-1) as d
               where o2.create_time BETWEEN #{selectTime1} and #{selectTime2}
+                and position(#{orderId} in o2.order_id)
               GROUP BY order_number
              ) as b
              on b.order_number = a.order_number
         left join sd.`order` o on a.order_id = o.order_id
-        where o.create_time BETWEEN #{selectTime1} and #{selectTime2}
+        where o.create_time BETWEEN #{selectTime1} and #{selectTime2} and position(#{orderId} in o.order_id)
         group by a.order_number
     </select>
     
@@ -157,10 +159,12 @@
                               (select id,process from sd.order_process_detail
                                   where process_id=#{processId}
                                     and technology_number=#{technologyNumber}
+                                    and order_number=#{orderNumber}
                                     and process=#{thisProcess}
                                 group by process) as b
         where a.id = b.id + 1
         and a.process_id=#{processId}
+        and a.order_number=#{orderNumber}
         and a.technology_number=#{technologyNumber}
 
     </select>

--
Gitblit v1.8.0