From ca83a37c04d4d4029eaffa7a7d11578c26ad74b8 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 20 二月 2025 14:32:30 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml b/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml
index e332834..19bb99a 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml
@@ -37,7 +37,7 @@
r.quality_inspector,
r.patch_processes,
r.reviewer,
- date(r.create_time) as create_time,
+ r.create_time as create_time,
date(r.update_time) as update_time,
JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS glassNumber
from pp.patch_log r left join sd.order_detail od on r.order_id=od.order_id and r.order_sort=od.order_number
@@ -213,15 +213,18 @@
and r.reviewer regexp #{patchLog.reviewer}
</if>
</where>
- ) as zu
- limit #{offset},#{pageSize};
+ ) as zu
</select>
<select id="getMaximum" >
- select count(*) from pp.patch_log where date(create_time)=CURDATE()
+ SELECT IFNULL(patch_id,'00')
+ FROM patch_log
+ WHERE DATE(create_time) = CURDATE()
+ ORDER BY create_time DESC
+ LIMIT 1;
</select>
--
Gitblit v1.8.0