From a76e1d17d67641993dea6335cb8e1465a94df58d Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 21 五月 2026 15:39:05 +0800
Subject: [PATCH] feat(stock): 优化库存管理和成品树结构功能 1- 为ApproveProcessMapper.xml和ProductBomMapper.xml添加排序功能 2- 在ProductionProductMainDto中新增bomInputQty字段用于产品结构投入数量 3- 修改ProductionProductMainServiceImpl中投入数量计算逻辑，使用前端传入的bomInputQty值 4- 在ProductWorkOrderDto中添加bomInputQty字段并在服务实现中计算标准投入数量 5- 更新SalesLedgerMapper.xml查询逻辑，从product_summary获取电压信息 6- 为SalesLedgerProduct添加stockId字段并修改库存扣减逻辑使用具体库存ID 7- 重构StockInventoryController中的成品库存树查询接口和导入导出功能 8- 新增成品和非成品库存导入导出的数据模型和Excel工具类 9- 优化StockInventoryServiceImpl中的库存扣减逻辑，支持按特定库存ID操作 10- 更新库存导入导出功能，区分成品和非成品类型并提供相应模板
---
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 < #{req.issueDate}
+ and (t1.issue_date >= #{req.startDate} and t1.issue_date <= #{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 >= #{req.startDate} and t1.issue_date <= #{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 < t1.adopted_date
+ </if>
+ <if test="req.status != null and req.status == 4">
+ and t1.adopted_date is null and t1.issue_date < current_date()
</if>
</where>
</select>
--
Gitblit v1.9.3