From 7b0d59dbd16a0f90eec1ad35eff64cf40d3b97e7 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 10 十二月 2024 11:34:23 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 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 2ac2c08..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>
@@ -373,13 +376,14 @@
</select>
<delete id="deleteReplenishMp">
- delete from pp.patch_log where patch_id=#{patchId}
+ delete from pp.patch_log where id=#{id}
</delete>
- <update id="updatePatchDdMp">
- update pp.damage_details set patch_status=0,quantity=quantity-#{qualityInspector}
+ <delete id="updatePatchDdMp">
+ delete from pp.damage_details
where reporting_work_id=#{reportingWorkId} and order_number=#{orderSort} and technology_number=#{technologyNumber}
- </update>
+ and breakage_reason=#{patchReason}
+ </delete>
<update id="updatePatchBgMp">
update pp.reporting_work_detail set patch_status=0
--
Gitblit v1.8.0