add机加车间零部件工序效率报表

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java

@@ -456,6 +456,20 @@ public class ReportController {
         }
     }
 
+    /**
+     * 机加车间零部件工序效率报表
+     * @param paramMap
+     * @return
+     */
+    @GetMapping("/JJComponentProcessEfficiencyReport")
+    public R JJComponentProcessEfficiencyReport(@RequestParam(required = false) Map paramMap){
+        try{
+            return R.ok(reportService.JJComponentProcessEfficiencyReport(paramMap));
+        }catch (Exception e){
+            return R.failed(e.getMessage());
+        }
+    }
+
     /**
      * 工时统计报表
      * @param paramMap

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java

@@ -261,4 +261,11 @@ public interface ReportMapper {
      * @return
      */
     List<Map<String, String>> projectAlignmentRateReport(Map paramMap);
+
+    /**
+     * 机加车间零部件工序效率报表
+     * @param paramMap
+     * @return
+     */
+    List<Map<String, String>> JJComponentProcessEfficiencyReport(Map paramMap);
 }

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java

@@ -272,4 +272,11 @@ public interface ReportService {
      */
     List<Map<String, String>> projectAlignmentRateReport(Map paramMap);
 
+    /**
+     * 机加车间零部件工序效率报表
+     * @param paramMap
+     * @return
+     */
+    List<Map<String, String>> JJComponentProcessEfficiencyReport(Map paramMap);
+
 }

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java

@@ -1484,6 +1484,19 @@ public class ReportServiceImpl implements ReportService {
         return reportMapper.projectAlignmentRateReport(paramMap);
     }
 
+    /**
+     * 机加车间零部件工序效率报表
+     * @param paramMap
+     * @return
+     */
+    @Override
+    public List<Map<String, String>> JJComponentProcessEfficiencyReport(Map paramMap) {
+        String site = CommonMethods.getSite();
+        paramMap.put("site", site);
+        paramMap.put("locale", LocaleContextHolder.getLocale().getLanguage());
+        return reportMapper.JJComponentProcessEfficiencyReport(paramMap);
+    }
+
     /**
      * 工时统计报表
      * @param paramMap

anomaly/src/main/resources/mapper/ReportMapper.xml

@@ -2465,84 +2465,84 @@ SELECT zab.CREATED_DATE_TIME,
         FROM DUAL)
         SELECT O.OPERATION         "operation",
         OT.DESCRIPTION      "operationDescription",
-        SUM(CASE
+        ROUND(SUM(CASE
         WHEN ZSD.DISPATCH_STATUS != 'CANCEL' AND ZSD.DISPATCH_STATUS != 'PAUSE' AND
         ZSD.DISPATCH_STATUS != 'COMPLETE'
         THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
-        ELSE 0 END) "tardinessWork",
+        ELSE 0 END),2) "tardinessWork",
-        SUM(CASE
+        ROUND(SUM(CASE
         WHEN ZSD.DISPATCH_STATUS = 'COMPLETE' AND
         (ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) >= TO_DATE(MONTH.month0) AND
         (ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) <
             TO_DATE(MONTH.month1)
         THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
-        ELSE 0 END) "workHours1",
+        ELSE 0 END),2) "workHours1",
-        SUM(CASE
+        ROUND(SUM(CASE
         WHEN ZSD.DISPATCH_STATUS = 'COMPLETE' AND
         (ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) >= TO_DATE(MONTH.month1) AND
         (ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) < TO_DATE(MONTH.month2)
         THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
-        ELSE 0 END) "workHours2",
+        ELSE 0 END),2) "workHours2",
-        SUM(CASE
+        ROUND(SUM(CASE
         WHEN ZSD.DISPATCH_STATUS = 'COMPLETE' AND
         (ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) >= TO_DATE(MONTH.month2) AND
         (ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) < TO_DATE(MONTH.month3)
         THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
-        ELSE 0 END) "workHours3",
+        ELSE 0 END),2) "workHours3",
-        SUM(CASE
+        ROUND(SUM(CASE
         WHEN ZSD.DISPATCH_STATUS = 'COMPLETE' AND
         (ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) >= TO_DATE(MONTH.month3) AND
         (ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) < TO_DATE(MONTH.month4)
         THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
-        ELSE 0 END) "workHours4",
+        ELSE 0 END),2) "workHours4",
-        SUM(CASE
+        ROUND(SUM(CASE
         WHEN ZSD.DISPATCH_STATUS = 'COMPLETE' AND
         (ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) >= TO_DATE(MONTH.month4) AND
         (ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) < TO_DATE(MONTH.month5)
         THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
-        ELSE 0 END) "workHours5",
+        ELSE 0 END),2) "workHours5",
-        SUM(CASE
+        ROUND(SUM(CASE
         WHEN ZSD.DISPATCH_STATUS = 'COMPLETE' AND
         (ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) >= TO_DATE(MONTH.month5) AND
         (ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) < TO_DATE(MONTH.month6)
         THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
-        ELSE 0 END) "workHours6",
+        ELSE 0 END),2) "workHours6",
-        SUM(CASE
+        ROUND(SUM(CASE
         WHEN ZSD.DISPATCH_STATUS = 'COMPLETE' AND
         (ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) >= TO_DATE(MONTH.month6) AND
         (ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) < TO_DATE(MONTH.month7)
         THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
-        ELSE 0 END) "workHours7",
+        ELSE 0 END),2) "workHours7",
-        SUM(CASE
+        ROUND(SUM(CASE
         WHEN ZSD.DISPATCH_STATUS = 'COMPLETE' AND
         (ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) >= TO_DATE(MONTH.month7) AND
         (ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) < TO_DATE(MONTH.month8)
         THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
-        ELSE 0 END) "workHours8",
+        ELSE 0 END),2) "workHours8",
-        SUM(CASE
+        ROUND(SUM(CASE
         WHEN ZSD.DISPATCH_STATUS = 'COMPLETE' AND
         (ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) >= TO_DATE(MONTH.month8) AND
         (ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) < TO_DATE(MONTH.month9)
         THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
-        ELSE 0 END) "workHours9",
+        ELSE 0 END),2) "workHours9",
-        SUM(CASE
+        ROUND(SUM(CASE
         WHEN ZSD.DISPATCH_STATUS = 'COMPLETE' AND
         (ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) >= TO_DATE(MONTH.month9) AND
         (ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) < TO_DATE(MONTH.month10)
         THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
-        ELSE 0 END) "workHours10",
+        ELSE 0 END),2) "workHours10",
-        SUM(CASE
+        ROUND(SUM(CASE
         WHEN ZSD.DISPATCH_STATUS = 'COMPLETE' AND
         (ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) >= TO_DATE(MONTH.month10) AND
         (ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) < TO_DATE(MONTH.month11)
         THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
-        ELSE 0 END) "workHours11",
+        ELSE 0 END),2) "workHours11",
-        SUM(CASE
+        ROUND(SUM(CASE
         WHEN ZSD.DISPATCH_STATUS = 'COMPLETE' AND
         (ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) >= TO_DATE(MONTH.month11) AND
         (ZSD.ACTUAL_COMPLETE_DATE + 8 / 24) < TO_DATE(MONTH.month12)
         THEN ZSD.DISPATCH_QTY * ZSD.PROD_HOURS
-        ELSE 0 END) "workHours12",
+        ELSE 0 END),2) "workHours12",
         WCT.DESCRIPTION     WORK_CENTER_DESCRIPTION,
         RT.DESCRIPTION      RESOURCE_TYPE_DESCRIPTION
         FROM Z_SFC_DISPATCH ZSD
@@ -2798,5 +2798,22 @@ SELECT zab.CREATED_DATE_TIME,
             </if>
         </where>
     </select>
+    <select id="JJComponentProcessEfficiencyReport" resultType="java.util.Map" parameterType="java.util.HashMap">
+        --机加车间零部件工序效率报表
+        SELECT * FROM JJ_COMPONENT_PE_REPORT WIP
+        WHERE 1=1
+        <if test="workOrder != null and workOrder != ''">
+            AND WIP.WORK_ORDER like '%${workOrder}%'
+        </if>
+        <if test="shopOrder != null and shopOrder != ''">
+            AND WIP.SHOP_ORDER like '%${shopOrder}%'
+        </if>
+        <if test="itemCode != null and itemCode != ''">
+            AND WIP.ITEM like '%${itemCode}%'
+        </if>
+        <if test="itemDescription != null and itemDescription != ''">
+            AND WIP.ITEM_DESCRIPTION like '%${itemDescription}%'
+        </if>
+    </select>
 
 </mapper>