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/lavorissue/LavorIssueMapper.xml |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/lavorissue/LavorIssueMapper.xml b/src/main/resources/mapper/lavorissue/LavorIssueMapper.xml
index fabf558..5d447e1 100644
--- a/src/main/resources/mapper/lavorissue/LavorIssueMapper.xml
+++ b/src/main/resources/mapper/lavorissue/LavorIssueMapper.xml
@@ -10,7 +10,7 @@
                t3.dict_label as dictName,
                t4.dict_label as dictTypeName
         from labor_issue t1
-        left join staff_join_leave_record t2 on t1.staff_id = t2.id
+        left join staff_on_job t2 on t1.staff_id = t2.id
         left join sys_dict_data t3 on t1.dict_id = t3.dict_value
         left join sys_dict_data t4 on t1.dict_type = t4.dict_value
         <where>
@@ -45,7 +45,7 @@
             t3.dict_label as dictName,
             t4.dict_label as dictTypeName
         from labor_issue t1
-                 left join staff_join_leave_record t2 on t1.staff_id = t2.id
+                 left join staff_on_job t2 on t1.staff_id = t2.id
                  left join sys_dict_data t3 on t1.dict_id = t3.dict_value
                  left join sys_dict_data t4 on t1.dict_type = t4.dict_value
         <where>
@@ -53,7 +53,25 @@
                 and t1.adopted_date is null
             </if>
             <if test="req.issueDate != null">
-                and t1.issue_date &lt; #{req.issueDate}
+                and (t1.issue_date &gt;= #{req.startDate} and t1.issue_date &lt;= #{req.endDate})
+            </if>
+            <if test="req.staffId != null">
+                and t1.staff_id = #{req.staffId}
+            </if>
+            <if test="req.season != null and req.season != ''">
+                and (t1.issue_date &gt;= #{req.startDate} and t1.issue_date &lt;= #{req.endDate})
+            </if>
+            <if test="req.status != null and req.status == 1">
+                and t1.adopted_date is not null
+            </if>
+            <if test="req.status != null and req.status == 2">
+                and t1.adopted_date is null
+            </if>
+            <if test="req.status != null and req.status == 3">
+                and t1.adopted_date is not null and t1.issue_date &lt; t1.adopted_date
+            </if>
+            <if test="req.status != null and req.status == 4">
+                and t1.adopted_date is null and t1.issue_date &lt; current_date()
             </if>
         </where>
     </select>

--
Gitblit v1.9.3