From f2c7576cbd050824ec78233483e06fc375382bfb Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 02 四月 2026 17:04:03 +0800
Subject: [PATCH] yys 1.客户档案导入-维护人，维护时间默认当前 2.销售报价审核非必填，产品选择方式也要改 3.销售产品增加物料号字段 4.产品维护增加录入时间，修改时间 6.发货审核不需要了 7.BI的生产核算分析不要了，增加生产订单当前工序 3.库存导入模板规格改成图纸编号，产品名称可以为空，加个库位 4.库存管理外购改为标准件 5.bom产品唯一 6.产品根据bom计算子项数量（只统计二级）
---
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