diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java index 350c3b29..67ea1d9e 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java @@ -106,6 +106,8 @@ public interface ReportMapper { List> projectScheduleShow(@Param("user") String user); + List> projectScheduleShowBoard(@Param("user") String user); + List> projectPlanningProgress(@Param("user") String user); /** diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java index 13cfc2a6..ba9d00eb 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java @@ -1708,7 +1708,7 @@ public class ReportServiceImpl implements ReportService { user = String.valueOf(paramMap.get("career")); } result.put("career", user); - List> projectScheduleList = reportMapper.projectScheduleShow(user); + List> projectScheduleList = reportMapper.projectScheduleShowBoard(user); //项目进度圆圈circle ArrayList> projectCircleList = new ArrayList<>(); diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml index 2f3acdfe..c8a7c477 100644 --- a/anomaly/src/main/resources/mapper/ReportMapper.xml +++ b/anomaly/src/main/resources/mapper/ReportMapper.xml @@ -1310,14 +1310,15 @@ ELSE 100 END, '990.99') "planRate", --计划进度 MAX(OWIP.endPlanTime) "endPlanDate", MIN(OWIP.PLANNED_START_DATE) "startDate" - FROM (SELECT cf.VALUE item,--项目号 - cf2.VALUE workOrder,--工作令 + FROM (SELECT cf.VALUE item,--项目号 + cf2.VALUE workOrder,--工作令 zsd.SFC, - MIN(zsd.DISPATCH_QTY) shopOrderQTY,--订单数量 + SUM(zsd.PROD_HOURS * zsd.DISPATCH_QTY) ALL_PROD_HOURS, + MIN(zsd.DISPATCH_QTY) shopOrderQTY,--订单数量 MIN(CASE WHEN zsd.DISPATCH_STATUS = 'COMPLETE' OR zsd.DISPATCH_STATUS = 'CANCEL' THEN zsd.DISPATCH_QTY - ELSE 0 END) doneQTY, --已完成数量 + ELSE 0 END) doneQTY, --已完成数量 TO_CHAR( DECODE(SUM(CASE WHEN zsd.DISPATCH_STATUS = 'COMPLETE' OR zsd.DISPATCH_STATUS = 'CANCEL' @@ -1329,9 +1330,9 @@ zsd.PROD_HOURS * zsd.DISPATCH_QTY ELSE 0 END) / SUM(zsd.PROD_HOURS * zsd.DISPATCH_QTY)) - * 100, '99990.99') rate,--进度(工时百分比) - MAX(zsd.PLANNED_COMP_DATE) endPlanTime, --计划最终交付时间 - MIN(zsd.PLANNED_START_DATE) PLANNED_START_DATE--计划开始时间 + * 100, '99990.99') rate,--进度(工时百分比) + MAX(zsd.PLANNED_COMP_DATE) endPlanTime, --计划最终交付时间 + MIN(zsd.PLANNED_START_DATE) PLANNED_START_DATE--计划开始时间 FROM Z_SFC_DISPATCH zsd LEFT JOIN SFC s ON s.SFC = zsd.SFC AND s.SITE = zsd.SITE LEFT JOIN SHOP_ORDER so ON so.SHOP_ORDER = zsd.SHOP_ORDER AND so.SITE = zsd.SITE @@ -1342,6 +1343,7 @@ AND cf2.VALUE IS NOT NULL GROUP BY zsd.SITE, cf.VALUE, cf2.VALUE, zsd.SHOP_ORDER, zsd.SFC ) OWIP + where OWIP.ALL_PROD_HOURS != 0 GROUP BY OWIP.item, OWIP.workOrder ) WIP @@ -3202,7 +3204,7 @@ SELECT zab.CREATED_DATE_TIME, AND ZUP."shopOrderQTY" != ZUP."doneQTY" - AND ZUP."item" like '%${item}%' + AND ZUP."item" = #{item} @@ -3215,6 +3217,15 @@ SELECT zab.CREATED_DATE_TIME, AND V."descripion" = #{workCenter} + \ No newline at end of file