项目进度报表数据修改

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

@@ -89,6 +89,11 @@ public class EquipmentAssetDetailsController {
 
                 .orderByAsc("BELONG_WORKSHOP","TEAM","ASSET_CLASSES","ASSET_DESCRIPTION");
         result = equipmentAssetDetailsService.page(frontPage.getPagePlus(), queryWrapper);
+        for (int i = 0; i < result.getRecords().size(); i++) {
+            EquipmentAssetDetails assetDetails =  (EquipmentAssetDetails) result.getRecords().get(i);
+            assetDetails.setSEQ((frontPage.getPage() - 1) * frontPage.getRows() + i + 1);
+            result.getRecords().set(i,assetDetails);
+        }
         return R.ok(result);
     }
 

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

@@ -442,6 +442,20 @@ public class ReportController {
         }
     }
 
+    /**
+     * 工作令有效生产报表
+     * @param paramMap
+     * @return
+     */
+    @GetMapping("/workOrderEffectiveProductionReport")
+    public R workOrderEffectiveProductionReport(@RequestParam(required = false) Map paramMap){
+        try{
+            return R.ok(reportService.workOrderEffectiveProductionReport(paramMap));
+        }catch (Exception e){
+            return R.failed(e.getMessage());
+        }
+    }
+
     /**
      * 工时统计报表
      * @param paramMap

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

@@ -225,4 +225,11 @@ public interface ReportMapper {
      * @return
      */
     List<Map<String, Object>> qualityProblemsInfoReport(Map paramMap);
+
+    /**
+     * 工作令有效生产报表
+     * @param paramMap
+     * @return
+     */
+    List<Map<String, Object>> workOrderEffectiveProductionReport(Map paramMap);
 }

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

@@ -236,4 +236,11 @@ public interface ReportService {
      * @return
      */
     List<Map<String, Object>> qualityProblemsInfoReport(Map paramMap);
+
+    /**
+     * 工作令有效生产报表
+     * @param paramMap
+     * @return
+     */
+    List<Map<String, Object>> workOrderEffectiveProductionReport(Map paramMap);
 }

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

@@ -1262,6 +1262,18 @@ public class ReportServiceImpl implements ReportService {
         paramMap.put("locale", LocaleContextHolder.getLocale().getLanguage());
         return reportMapper.assignedWorkersOrdersReport(paramMap);
     }
+    /**
+     * 工作令有效生产报表
+     * @param paramMap
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> workOrderEffectiveProductionReport(Map paramMap) {
+        String site = CommonMethods.getSite();
+        paramMap.put("site", site);
+        paramMap.put("locale", LocaleContextHolder.getLocale().getLanguage());
+        return reportMapper.workOrderEffectiveProductionReport(paramMap);
+    }
 
     /**
      * 工时统计报表
@@ -1381,6 +1393,8 @@ public class ReportServiceImpl implements ReportService {
         return qualityInspectionReport;
     }
 
+
+
     /**
      * 事业部质量看板数据接口
      * @param user

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

@@ -2080,55 +2080,7 @@
     </select>
     <select id="projectIdleTimeStatisticsReport"  resultType="java.util.Map" parameterType="java.util.HashMap">
         --项目空闲时间统计报表
-        SELECT WIP.WORK_CENTER_DESCRIPTION,
+        SELECT * FROM project_IdleTime_Statistics_Report WIP
-        WIP.ITEM_NUMBER,
-        WIP.WORK_ORDER,
-        WIP.SHOP_ORDER,
-        WIP.SFC,
-        WIP.ITEM,
-        WIP.ITEM_DESCRIPTION,
-        MAX(WIP.QTY)                                                              QTY,
-        TO_CHAR(DECODE(SUM(WIP.ACTUAL_PROCESS_TIME), 0, 0, SUM(WIP.ACTUAL_PROCESS_TIME)),
-        '99990.99')                                                       ACTUAL_PROCESS_TIME,
-        TO_CHAR(DECODE(SUM(WIP.WAIT_TIME), 0, 0, SUM(WIP.WAIT_TIME)), '99990.99') WAIT_TIME,
-        TO_CHAR(DECODE((SUM(WIP.WAIT_TIME) + SUM(WIP.ACTUAL_PROCESS_TIME)), 0, 0,
-        (SUM(WIP.ACTUAL_PROCESS_TIME) / (SUM(WIP.WAIT_TIME) +
-        SUM(WIP.ACTUAL_PROCESS_TIME))) * 100),
-        '99990.99') || '%'                                                ACTUAL_TATE,
-        MIN(WIP.ACTUAL_START_DATE)     MIN_START_DATE,
-        MAX(WIP.ACTUAL_COMPLETE_DATE)  MAX_COMPLETE_DATE
-        FROM (SELECT wct.DESCRIPTION                                                                                                                        WORK_CENTER_DESCRIPTION,
-        cf.VALUE                                                                                                                               ITEM_NUMBER,
-        cf2.VALUE                                                                                                                              WORK_ORDER,
-        zsd.SHOP_ORDER                                                                                                                         SHOP_ORDER,
-        s.SFC                                                                                                                                  SFC,
-        i.ITEM                                                                                                                                 ITEM,
-        it.DESCRIPTION                                                                                                                         ITEM_DESCRIPTION,
-        zsd.DISPATCH_QTY                                                                                                                       QTY,
-        zsd.DISPATCH_SEQ,
-        DECODE(zsd.ACTUAL_COMPLETE_DATE - zsd.ACTUAL_START_DATE, null, 0,
-        (zsd.ACTUAL_COMPLETE_DATE - zsd.ACTUAL_START_DATE) * 24)                                                                        ACTUAL_PROCESS_TIME,
-        DECODE(zsd.ACTUAL_COMPLETE_DATE - LAG(zsd.ACTUAL_COMPLETE_DATE, 1)
-        OVER (partition by cf.VALUE,cf2.VALUE,zsd.SHOP_ORDER,s.SFC ORDER BY cf.VALUE,cf2.VALUE,zsd.SHOP_ORDER,s.SFC,zsd.ACTUAL_START_DATE),
-        NULL, 0,
-        (zsd.ACTUAL_START_DATE - LAG(zsd.ACTUAL_COMPLETE_DATE, 1)
-        OVER (partition by cf.VALUE,cf2.VALUE,zsd.SHOP_ORDER,s.SFC ORDER BY cf.VALUE,cf2.VALUE,zsd.SHOP_ORDER,s.SFC,zsd.ACTUAL_START_DATE)) *
-        24)                                                                                                                             WAIT_TIME,
-        LAG(zsd.ACTUAL_COMPLETE_DATE, 1)
-        OVER (partition by cf.VALUE,cf2.VALUE,zsd.SHOP_ORDER,s.SFC ORDER BY cf.VALUE,cf2.VALUE,zsd.SHOP_ORDER,s.SFC,zsd.ACTUAL_START_DATE) NEXT_COMPLETE,
-        zsd.ACTUAL_START_DATE                                                                                                                  ACTUAL_START_DATE,
-        zsd.ACTUAL_COMPLETE_DATE                                                                                                               ACTUAL_COMPLETE_DATE
-        FROM Z_SFC_DISPATCH zsd
-        INNER JOIN WORK_CENTER wc ON wc.WORK_CENTER = zsd.WORK_CENTER AND wc.SITE = zsd.SITE
-        LEFT JOIN WORK_CENTER_T wct ON wct.WORK_CENTER_BO = wc.HANDLE AND wct.LOCALE = 'zh'
-        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
-        LEFT JOIN CUSTOM_FIELDS cf ON cf.HANDLE = so.HANDLE AND cf."ATTRIBUTE" = 'ITEM_NUMBER'
-        LEFT JOIN CUSTOM_FIELDS cf2 ON cf2.HANDLE = so.HANDLE AND cf2."ATTRIBUTE" = 'WORK_ORDER'
-        LEFT JOIN ITEM i On i.HANDLE = so.ITEM_BO AND I.SITE = SO.SITE
-        LEFT JOIN ITEM_T it ON it.ITEM_BO = i.HANDLE
-        WHERE zsd.DISPATCH_STATUS != 'CANCEL'
-        ORDER BY cf.VALUE, cf2.VALUE, zsd.SHOP_ORDER, s.SFC, zsd.ACTUAL_START_DATE) WIP
         <where>
         1=1
             <if test="sfc != null and sfc != ''">
@@ -2152,11 +2104,7 @@
             <if test="workOrder != null and workOrder != ''">
                 AND WIP.WORK_ORDER like '%${workOrder}%'
             </if>
-
         </where>
-        GROUP BY WIP.WORK_CENTER_DESCRIPTION, WIP.ITEM_NUMBER, WIP.WORK_ORDER, WIP.SHOP_ORDER, WIP.SFC, WIP.ITEM,
-                 WIP.ITEM_DESCRIPTION
-        ORDER BY WIP.WORK_CENTER_DESCRIPTION, WIP.ITEM_NUMBER, WIP.WORK_ORDER, WIP.SHOP_ORDER, WIP.SFC
     </select>
     <select id="projectProcessingCycleReport" resultType="java.util.Map" parameterType="java.util.HashMap">
         --项目加工周期报表
@@ -2503,5 +2451,22 @@ SELECT zab.CREATED_DATE_TIME,
         znu2.FULL_NAME, dflt2.DATA_TAG, zabd.ROUTER_BO
         ORDER BY zab.CREATED_DATE_TIME DESC
     </select>
+    <select id="workOrderEffectiveProductionReport" resultType="java.util.Map">
+        --工作令有效生产报表
+        SELECT * FROM WORKORDER_EFFECTIVE_PRODUCTION_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>