From 687c9b21d0c8aedbd0c3f2d64b11cfaad5e38e85 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 23 五月 2025 15:42:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateStandardRequireErrorMapper.xml |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateStandardRequireErrorMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateStandardRequireErrorMapper.xml
index bba08bb..5e8507f 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateStandardRequireErrorMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateStandardRequireErrorMapper.xml
@@ -103,6 +103,22 @@
         </foreach>
     </delete>
     <update id="deleteLastPatch" parameterType="String">
-        update aps_plate_standard_require_error set del_flag = '1' where batch_number = #{batchNumber}
+        update aps_plate_standard_require_error
+        set del_flag = '1'
+        where del_flag = '0' and batch_number != #{batchNumber}
     </update>
+    
+    <insert id="batchInsert" parameterType="java.util.List">
+        insert into aps_plate_standard_require_error(
+            id, batch_number, require_id, doc_num, item_num, org_code, 
+            message, del_flag, create_by, create_time
+        ) values
+        <foreach collection="list" item="item" separator=",">
+            (
+            #{item.id}, #{item.batchNumber}, #{item.requireId}, #{item.docNum}, 
+            #{item.itemNum}, #{item.orgCode}, #{item.message}, #{item.delFlag}, 
+            #{item.createBy}, #{item.createTime}
+            )
+        </foreach>
+    </insert>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3