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/approve/ApprovalInstanceMapper.xml |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/approve/ApprovalInstanceMapper.xml b/src/main/resources/mapper/approve/ApprovalInstanceMapper.xml
index 612f457..f3720c2 100644
--- a/src/main/resources/mapper/approve/ApprovalInstanceMapper.xml
+++ b/src/main/resources/mapper/approve/ApprovalInstanceMapper.xml
@@ -29,6 +29,9 @@
         left join sys_user su on ai.create_user = su.user_id
         <where>
             deleted = 0
+            <if test="ew.id != null">
+                and ai.id = #{ew.id}
+            </if>
             <if test="ew.instanceNo != null">
                 and ai.instance_no like concat('%',#{ew.instanceNo},'%')
             </if>
@@ -52,7 +55,7 @@
                 and ai.applicant_name = #{ew.applicantName}
             </if>
         </where>
-        order by ai.id desc
+        order by ai.create_time desc
     </select>
 
 </mapper>

--
Gitblit v1.9.3