From acaf8ca38cd32bc474bb46b593db2a8d75b9bfdd Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期六, 12 十月 2024 08:26:23 +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 | 12 ++++++------
1 files changed, 6 insertions(+), 6 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..78fc9a9 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml
@@ -213,8 +213,7 @@
and r.reviewer regexp #{patchLog.reviewer}
</if>
</where>
- ) as zu
- limit #{offset},#{pageSize};
+ ) as zu
</select>
@@ -373,13 +372,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