From 260dd6fe156265832544715192ce1491e9c2afd6 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 26 六月 2026 13:41:13 +0800
Subject: [PATCH] fix(stock): 解决库存管理中的重复键异常问题 - 在采购台账服务中添加净合同金额字段设置 - 在销售台账服务中添加净合同金额字段设置 - 在入库记录服务中为库存插入操作添加重复键异常处理 - 在入库记录服务中为非库存插入操作添加重复键异常处理 - 在库存服务中为库存插入操作添加重复键异常处理 - 统一处理数据库唯一键约束冲突,避免系统错误

---
 src/main/resources/mapper/collaborativeApproval/RulesRegulationsManagementMapper.xml |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/collaborativeApproval/RulesRegulationsManagementMapper.xml b/src/main/resources/mapper/collaborativeApproval/RulesRegulationsManagementMapper.xml
index c34b460..9ae4b8d 100644
--- a/src/main/resources/mapper/collaborativeApproval/RulesRegulationsManagementMapper.xml
+++ b/src/main/resources/mapper/collaborativeApproval/RulesRegulationsManagementMapper.xml
@@ -17,6 +17,9 @@
         from rules_regulations_management rrm
         left join sys_user su on rrm.create_user = su.user_id
         <where>
+            <if test="ew.regulationNum != null and ew.regulationNum != ''">
+                and rrm.regulation_num = #{ew.regulationNum}
+            </if>
             <if test="ew.title != null and ew.title != ''">
                 and rrm.title like concat('%',#{ew.title},'%')
             </if>
@@ -24,5 +27,6 @@
                 and rrm.category = #{ew.category}
             </if>
         </where>
+        order by rrm.id desc
     </select>
-</mapper>
\ No newline at end of file
+</mapper>

--
Gitblit v1.9.3