From f692a364cdb559ddadc4f6dac86c25848a1d4f34 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 03 十一月 2025 16:54:53 +0800
Subject: [PATCH] 修改订单首页流程卡终止状态，以及自定义标签打印

---
 north-glass-erp/src/main/resources/mapper/pp/Report.xml |   25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/pp/Report.xml b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
index ddce89e..b314c4f 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -203,7 +203,8 @@
 
 
                ifnull(JSON_UNQUOTE(JSON_EXTRACT(a.other_columns, '$.S01')),'') AS glassNumber,
-               b.`group`
+               b.`group`,
+               c.termination_status
 
         from pp.flow_card as c
                  left join
@@ -282,8 +283,8 @@
                              left join pp.reporting_work as rw on rw.order_id=o.order_id
                              left join pp.damage_details as dd on dd.reporting_work_id=rw.reporting_work_id and dd.order_number=ogd.order_number
             and dd.technology_number=ogd.technology_number
-        where date(rw.reporting_work_time) >= #{startDate}
-          and date(rw.reporting_work_time) &lt;= #{endDate}
+        where (rw.reporting_work_time) >= #{startDate}
+          and (rw.reporting_work_time) &lt;= #{endDate}
           and rw.this_worn_quantity > 0
           and dd.available = 0
           and reviewed_state >-1
@@ -358,8 +359,8 @@
         left join pp.reporting_work as rw on rw.order_id=o.order_id
         left join pp.damage_details as dd on dd.reporting_work_id=rw.reporting_work_id and dd.order_number=ogd.order_number
         and dd.technology_number=ogd.technology_number
-        where date(rw.reporting_work_time) >= #{startDate}
-        and date(rw.reporting_work_time) &lt;= #{endDate}
+        where (rw.reporting_work_time) >= #{startDate}
+        and (rw.reporting_work_time) &lt;= #{endDate}
         and rw.this_worn_quantity > 0
         and dd.available = 0
         and reviewed_state >-1
@@ -421,8 +422,8 @@
                            on ogd.order_id = o.order_id and ogd.order_number = dd.order_number
                                and ogd.technology_number and dd.technology_number
         left join sd.order_detail as od on o.order_id = od.order_id and od.order_number=ogd.order_number
-        where date(rw.reporting_work_time) >= #{startDate}
-          and date(rw.reporting_work_time) &lt;= #{endDate}
+        where (rw.reporting_work_time) >= #{startDate}
+          and (rw.reporting_work_time) &lt;= #{endDate}
           and rw.this_worn_quantity > 0
           and dd.available = 0
           and rw.reviewed_state>=0
@@ -478,8 +479,8 @@
         on ogd.order_id = o.order_id and ogd.order_number = dd.order_number
         and ogd.technology_number and dd.technology_number
         left join sd.order_detail as od on o.order_id = od.order_id and od.order_number=ogd.order_number
-        where date(rw.reporting_work_time) >= #{startDate}
-        and date(rw.reporting_work_time) &lt;= #{endDate}
+        where (rw.reporting_work_time) >= #{startDate}
+        and (rw.reporting_work_time) &lt;= #{endDate}
         and rw.this_worn_quantity > 0
         and dd.available = 0
         and reviewed_state != 2
@@ -785,7 +786,7 @@
         left join sd.order_detail as od on o.order_id = od.order_id and od.order_number=ogd.order_number
         WHERE
         rw.reporting_work_time >= #{selectTime1}
-        AND rw.reporting_work_time &lt;  #{selectTime2}
+        AND rw.reporting_work_time &lt;=  #{selectTime2}
 
         AND dd.available = 0 and rw.reviewed_state>=0
         <if test="damageReportDTO.orderId != null and damageReportDTO.orderId != ''">
@@ -851,7 +852,7 @@
         AND dd.technology_number = ogd.technology_number
         WHERE
         rw.reporting_work_time >= #{selectTime1}
-        AND rw.reporting_work_time &lt;  #{selectTime2}
+        AND rw.reporting_work_time &lt;=  #{selectTime2}
         AND dd.available = 0 and rw.reviewed_state>=0
         <if test="damageReportDTO.orderId != null and damageReportDTO.orderId != ''">
             and o.order_id regexp #{damageReportDTO.orderId}
@@ -2422,7 +2423,7 @@
                 AND od.order_number = ogd.order_number
         WHERE
             rw.reporting_work_time >= #{selectTime1}
-          AND rw.reporting_work_time &lt;  #{selectTime2}
+          AND rw.reporting_work_time &lt;=  #{selectTime2}
           AND dd.available = 0 and rw.reviewed_state>=0
         <if test="damageReportDTO.orderId != null and damageReportDTO.orderId != ''">
             and o.order_id regexp #{damageReportDTO.orderId}

--
Gitblit v1.8.0