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/staff/StaffSchedulingMapper.xml | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/staff/StaffSchedulingMapper.xml b/src/main/resources/mapper/staff/StaffSchedulingMapper.xml
index 1a32ef1..5bc5e4a 100644
--- a/src/main/resources/mapper/staff/StaffSchedulingMapper.xml
+++ b/src/main/resources/mapper/staff/StaffSchedulingMapper.xml
@@ -6,7 +6,7 @@
<resultMap id="BaseResultMap" type="com.ruoyi.staff.pojo.StaffScheduling">
<id property="id" column="id" jdbcType="INTEGER"/>
- <result property="staffId" column="staff_id" jdbcType="INTEGER"/>
+ <result property="staffId" column="staff_id" jdbcType="VARCHAR"/>
<result property="department" column="department" jdbcType="INTEGER"/>
<result property="shiftType" column="shift_type" jdbcType="INTEGER"/>
<result property="workDate" column="work_date" jdbcType="DATE"/>
@@ -31,12 +31,11 @@
</sql>
<select id="listPage" resultType="com.ruoyi.staff.dto.StaffSchedulingDto">
SELECT
- t1.*,t2.staff_name as 'staff_name' ,t2.staff_no as 'staff_no'
+ t1.*
FROM staff_scheduling t1
- left join staff_join_leave_record t2 on t1.staff_id = t2.id
where 1=1
<if test="vo.staffName != null and vo.staffName != '' ">
- AND t2.staff_name LIKE CONCAT('%', #{vo.staffName}, '%')
+ AND t1.staff_name LIKE CONCAT('%', #{vo.staffName}, '%')
</if>
<if test="vo.shiftType != null and vo.shiftType != '' ">
AND t1.shift_type = #{vo.shiftType}
--
Gitblit v1.9.3