diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesLineMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesLineMapper.xml index 1159895c..759a4318 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesLineMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesLineMapper.xml @@ -10,6 +10,7 @@ + @@ -28,12 +29,12 @@ select id, line_code, product_code,product_name,use_man, efficiency, attr1, attr2, attr3, attr4, create_by, - create_time, update_by, update_time, factory_code, del_flag from mes_line_product + create_time, update_by, update_time, factory_code, del_flag,hour_efficiency from mes_line_product select mlp.use_man standarMan, - ROUND(mlp.efficiency/bp.umrez,2) AS standarXl + ROUND(mlp.hour_efficiency/bp.umrez,2) AS standarXl from mes_line_product mlp left join base_product bp on bp.product_code=mlp.product_code where mlp.line_code = #{equCode} and mlp.product_code = #{productCode} diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml index 99524e47..2dedd3c5 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml @@ -698,7 +698,7 @@ FROM( select CONVERT(varchar(7),qct.create_time, 120) AS ymdms, qct.sample_quality from qc_check_task qct - where check_type = #{checkType} + where check_type = #{checkType} and check_status = 2 and CONVERT(varchar(4),qct.create_time, 120) = #{incomeTimeStr} and del_flag = '0' ) t @@ -711,7 +711,7 @@ FROM( select CONVERT(varchar(10),qct.create_time, 120) AS ymdms, check_result from qc_check_task qct - where check_type = #{checkType} + where check_type = #{checkType} and check_status = 2 and CONVERT(varchar(7),qct.create_time, 120) = #{incomeTimeStr} and del_flag = '0' ) t @@ -724,7 +724,7 @@ FROM( select DATEPART(HOUR, qct.create_time) AS ymdms,check_result from qc_check_task qct - where check_type = #{checkType} + where check_type = #{checkType} and check_status = 2 and CONVERT(varchar(10),qct.create_time, 120) = #{incomeTimeStr} and del_flag = '0' ) t