From bb85dbc5fc9a9ddda99132ae16887fd27959a854 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 06 一月 2025 16:18:48 +0800
Subject: [PATCH] 补充注释、语言，转工单时添加未勾选数据时的弹窗，修改报工新增查询复合工序不能查询出每一层的问题，修改次破报表响应超时问题

---
 north-glass-erp/src/main/resources/mapper/pp/Report.xml |    6 ++++--
 1 files changed, 4 insertions(+), 2 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 2cb890c..87569ad 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -573,7 +573,9 @@
         AND dd.technology_number = ogd.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_FORMAT((rw.reporting_work_time), '%Y-%m-%d') between #{selectTime1} and #{selectTime2}
+        rw.reporting_work_time >= #{selectTime1}
+        AND rw.reporting_work_time &lt;  #{selectTime2}
+
         AND dd.available = 0
         AND LENGTH( rw.process_id )= 14
         <if test="damageReportDTO.orderId != null and damageReportDTO.orderId != ''">
@@ -759,7 +761,7 @@
 
     <select id="productionScheduleMp">
         select a.order_number,
-               if(od.shape='' || ISNULL(od.shape),'鏅舰',if(od.shape = 1, '鏅舰', if(od.shape = 2, '寮傚舰', ''))) as shape,
+               if(a.shape='' || ISNULL(a.shape),'鏅舰',if(a.shape = 1, '鏅舰', if(a.shape = 2, '寮傚舰', ''))) as shape,
                a.product_name,
                b.child_width,
                b.child_height,

--
Gitblit v1.8.0