Browse Source

2025.04.25 优化

master
jiayang yue 9 months ago
parent
commit
5b8c7a3df3
  1. 2
      src/main/resources/mapper/pms/QcMapper.xml
  2. 2
      src/main/resources/mapper/pms/QcReportMapper.xml
  3. 2
      src/main/resources/mapper/production/OperatorGroupMapper.xml

2
src/main/resources/mapper/pms/QcMapper.xml

@ -2048,7 +2048,7 @@
AND #{query.endDate2} >= a.task_date AND #{query.endDate2} >= a.task_date
</if> </if>
<if test = "query.workCenterNo != null and query.workCenterNo != ''"> <if test = "query.workCenterNo != null and query.workCenterNo != ''">
AND a.work_center_no = #{query.workCenterNo}
AND a.work_center_no like #{query.workCenterNo}
</if> </if>
<if test = "query.shiftDesc != null and query.shiftDesc != ''"> <if test = "query.shiftDesc != null and query.shiftDesc != ''">
AND c.shiftdesc = #{query.shiftDesc} AND c.shiftdesc = #{query.shiftDesc}

2
src/main/resources/mapper/pms/QcReportMapper.xml

@ -255,7 +255,7 @@
AND #{query.endDate2} >= a.task_date AND #{query.endDate2} >= a.task_date
</if> </if>
<if test = "query.workCenterNo != null and query.workCenterNo != ''"> <if test = "query.workCenterNo != null and query.workCenterNo != ''">
AND a.work_center_no = #{query.workCenterNo}
AND a.work_center_no like #{query.workCenterNo}
</if> </if>
<if test = "query.itemResult != null and query.itemResult != ''"> <if test = "query.itemResult != null and query.itemResult != ''">
AND b.item_result = #{query.itemResult} AND b.item_result = #{query.itemResult}

2
src/main/resources/mapper/production/OperatorGroupMapper.xml

@ -70,7 +70,7 @@
</select> </select>
<select id="getOperatorGroupDefault" resultType="com.xujie.sys.modules.production.data.OperatorGroupPlanDetailData"> <select id="getOperatorGroupDefault" resultType="com.xujie.sys.modules.production.data.OperatorGroupPlanDetailData">
select a.site, a.Member_OperatorID OperatorID,b.operatorName,null as workTime ,1 as WagesRate
select a.site, a.Member_OperatorID OperatorID,b.operatorName,10.5 as workTime ,1 as WagesRate
from Operator_group_member a left join Operator b on a.Member_OperatorID=b.OperatorID and a.site=b.site from Operator_group_member a left join Operator b on a.Member_OperatorID=b.OperatorID and a.site=b.site
where a.OperatorID =#{operatorGroupId} and b.Active='Y' and a.site=#{site} where a.OperatorID =#{operatorGroupId} and b.Active='Y' and a.site=#{site}
</select> </select>

Loading…
Cancel
Save