|
@@ -86,11 +86,11 @@
|
|
|
fwdl.product_id,
|
|
|
CONVERT (sum(COALESCE(fws.qualified_number,0)), DECIMAL ( 15, 1 ) ) qualified_number,
|
|
|
DATE_FORMAT(fws.final_time,'%Y-%m-%d') final_time,
|
|
|
- CONVERT ( (fwdl.standard_working_hours_z*latest_completed_quantity) / sum(fws.working_hours), DECIMAL ( 15, 1 ) ) * 100 AS productionEfficiency,
|
|
|
+ CONVERT ( (fwdl.standard_working_hours_z*sum(COALESCE(fws.qualified_number,0))) / sum(fws.working_hours), DECIMAL ( 15, 1 ) ) * 100 AS productionEfficiency,
|
|
|
CONVERT ( sum(fws.qualified_number) / fwdl.number_of_tasks, DECIMAL ( 15, 1 ) ) * 100 AS achievementRate,
|
|
|
fwdl.number_of_tasks number_of_tasks,
|
|
|
CONVERT (sum(fws.working_hours), DECIMAL ( 15, 1 ) ) man_hours_completed,
|
|
|
- CONVERT (fwdl.standard_working_hours, DECIMAL ( 15, 1 )) standard_working_hours,
|
|
|
+ CONVERT (COALESCE((fwdl.standard_working_hours_z*sum(COALESCE(fws.qualified_number,0))),0), DECIMAL ( 15, 1 )) standard_working_hours,
|
|
|
fwdl.standard_working_hours_z
|
|
|
FROM
|
|
|
fbs_workshop_dispatch_list fwdl
|
|
@@ -269,14 +269,38 @@
|
|
|
fwdl.del_flag = '0'
|
|
|
and DATE_FORMAT(now( ),#{dateString}) <![CDATA[ >= ]]> DATE_FORMAT(fwdl.planned_start_time,#{dateString})
|
|
|
and DATE_FORMAT(now( ),#{dateString}) <![CDATA[ <= ]]> DATE_FORMAT(fwdl.planned_end_time,#{dateString})-->
|
|
|
- SELECT CONVERT
|
|
|
+ <!-- SELECT CONVERT
|
|
|
( sum( standard_working_hours ) / sum( man_hours_completed ), DECIMAL ( 15, 2 ) ) * 100
|
|
|
FROM
|
|
|
fbs_workshop_dispatch_list
|
|
|
WHERE
|
|
|
del_flag = '0'
|
|
|
and DATE_FORMAT(now( ),#{dateString}) <![CDATA[ >= ]]> DATE_FORMAT(planned_start_time,#{dateString})
|
|
|
- and DATE_FORMAT(now( ),#{dateString}) <![CDATA[ <= ]]> DATE_FORMAT(planned_end_time,#{dateString})
|
|
|
+ and DATE_FORMAT(now( ),#{dateString}) <![CDATA[ <= ]]> DATE_FORMAT(planned_end_time,#{dateString}) -->
|
|
|
+ select CONVERT
|
|
|
+ ( sum(w.workingB) / sum(w.workingS), DECIMAL ( 15, 2 ) ) * 100 as rate
|
|
|
+ FROM(
|
|
|
+ SELECT
|
|
|
+ CONVERT (( fwdl.standard_working_hours_z * sum( COALESCE ( fws.qualified_number, 0 ) ) ), DECIMAL ( 15, 1 ) ) AS workingB,
|
|
|
+ CONVERT ( COALESCE ( sum( working_hours ), 0 ), DECIMAL ( 15, 1 ) ) workingS
|
|
|
+ FROM
|
|
|
+ fbs_workshop_dispatch_list fwdl
|
|
|
+ LEFT JOIN fbs_working_statistics fws ON fwdl.id = fws.pk_workshop_dispatch_list
|
|
|
+ WHERE
|
|
|
+ fwdl.del_flag = '0'
|
|
|
+ AND fws.del_flag = '0'
|
|
|
+ AND fwdl.standard_working_hours_z>0
|
|
|
+ <if test="dateString =='%Y-%m-%d'">
|
|
|
+ AND date_format( fws.final_time, '%Y-%m-%d' ) = DATE_FORMAT( date_sub(curdate(),interval 1 day), '%Y-%m-%d' )
|
|
|
+ </if>
|
|
|
+ <if test="dateString =='%Y-%m'">
|
|
|
+ AND date_format( fws.final_time, '%Y-%m' ) = DATE_FORMAT( now( ), '%Y-%m' )
|
|
|
+ </if>
|
|
|
+ GROUP BY
|
|
|
+ fwdl.production_order_number_name,
|
|
|
+ fwdl.product
|
|
|
+ HAVING sum( COALESCE ( fws.qualified_number, 0 ) )>0
|
|
|
+ ) as w
|
|
|
</select>
|
|
|
|
|
|
<select id="getAchievementRate" resultType="java.util.HashMap">
|