瀏覽代碼

aps-大屏

sucheng 7 月之前
父節點
當前提交
7d810721b7

+ 14 - 6
cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProductionOrderServiceImpl.java

@@ -1169,7 +1169,7 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
                 resInsertList.addAll(list);
             }
         });
-        if (ObjectUtil.isNotEmpty(resInsertList)){
+        if (ObjectUtil.isNotEmpty(resInsertList)) {
             apsReportThProcessPhotoService.remove(new LambdaQueryWrapper<ApsReportThProcessPhoto>().eq(ApsReportThProcessPhoto::getDeleted, "0"));
             apsReportThProcessPhotoService.saveBatch(resInsertList);
         }
@@ -1189,7 +1189,7 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
                 resInsertList.addAll(list);
             }
         });
-        if (ObjectUtil.isNotEmpty(resInsertList)){
+        if (ObjectUtil.isNotEmpty(resInsertList)) {
             apsReportThProcessTableService.remove(new LambdaQueryWrapper<ApsReportThProcessTable>().eq(ApsReportThProcessTable::getDeleted, "0"));
             apsReportThProcessTableService.saveBatch(resInsertList);
         }
@@ -1445,8 +1445,10 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
                 //计算比例,保留4位小数,以便百分比保留两位小数
                 item.setPlanordernumyearpercent(
                         new BigDecimal(item.getActualordernumyear()).divide(new BigDecimal(item.getPlanordernumyear()), 4, RoundingMode.HALF_UP).toString());
-            } else {
+            } else if (new BigDecimal(item.getActualordernumyear()).compareTo(BigDecimal.ZERO) == 0) {
                 item.setPlanordernumyearpercent("0");
+            } else {
+                item.setPlanordernumyearpercent("1");
             }
             //拼接展示字段
             String pre = new BigDecimal(item.getPlanordernumyearpercent()).multiply(BigDecimal.valueOf(100)).toString();
@@ -1462,8 +1464,10 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
                 //计算比例,保留4位小数,以便百分比保留两位小数
                 item.setActualfinishnumyearpercent(
                         new BigDecimal(item.getActualfinishnumyear()).divide(new BigDecimal(item.getActualordernumyear()), 4, RoundingMode.HALF_UP).toString());
-            } else {
+            } else if (new BigDecimal(item.getActualfinishnumyear()).compareTo(BigDecimal.ZERO) == 0) {
                 item.setActualfinishnumyearpercent("0");
+            } else {
+                item.setActualfinishnumyearpercent("1");
             }
             //拼接展示字段
             String pre = new BigDecimal(item.getActualfinishnumyearpercent()).multiply(BigDecimal.valueOf(100)).toString();
@@ -1515,8 +1519,10 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
                 //计算比例,保留4位小数,以便百分比保留两位小数
                 item.setPlanordernummonthpercent(
                         new BigDecimal(item.getActualordernummonth()).divide(new BigDecimal(item.getPlanordernummonth()), 4, RoundingMode.HALF_UP).toString());
-            } else {
+            } else if (new BigDecimal(item.getActualordernummonth()).compareTo(BigDecimal.ZERO) == 0) {
                 item.setPlanordernummonthpercent("0");
+            } else {
+                item.setPlanordernummonthpercent("1");
             }
             //拼接展示字段
             String pre = new BigDecimal(item.getPlanordernummonthpercent()).multiply(BigDecimal.valueOf(100)).toString();
@@ -1532,8 +1538,10 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
                 //计算比例,保留4位小数,以便百分比保留两位小数
                 item.setActualfinishnummonthpercent(
                         new BigDecimal(item.getActualfinishnummonth()).divide(new BigDecimal(item.getActualordernummonth()), 4, RoundingMode.HALF_UP).toString());
-            } else {
+            } else if (new BigDecimal(item.getActualfinishnummonth()).compareTo(BigDecimal.ZERO) == 0) {
                 item.setActualfinishnummonthpercent("0");
+            } else {
+                item.setActualfinishnummonthpercent("1");
             }
             //拼接展示字段
             String pre = new BigDecimal(item.getActualfinishnummonthpercent()).multiply(BigDecimal.valueOf(100)).toString();

+ 80 - 80
cx-aps/cx-aps-common/src/main/resources/mybatis/ApsProductionOrderDao.xml

@@ -439,7 +439,7 @@
             resultType="com.rongwei.bsentity.domain.ApsReportYearAndMonth">
         select
         apro.TENANTID AS 'tenantid',
-        ifnull(sum((apope.PLANPROCESSRALL-apope.CANCELROLL)*apoom.PLANPRODROLLNUM/apo.PLANPROCESSRALL*apoom.SINGLEROLLWEIGHT),0) AS 'actualordernummonth' -- 本月实际接单量
+        ifnull(ROUND(sum((apope.PLANPROCESSRALL-apope.CANCELROLL)*apoom.PLANPRODROLLNUM/apo.PLANPROCESSRALL*apoom.SINGLEROLLWEIGHT),2),0) AS 'actualordernummonth' -- 本月实际接单量
         from
         aps_process_operation_process_equ apope
         join aps_process_operation apo on apo.ID = apope.PROCESSID
@@ -463,7 +463,7 @@
     <select id="selectNowMonthActualProduceNum" resultType="com.rongwei.bsentity.domain.ApsReportYearAndMonth">
         select
             apro.TENANTID AS 'tenantid',
-            ifnull(sum(aro.WEIGHT),0) AS 'actualfinishnummonth'
+            ifnull(ROUND(sum(aro.WEIGHT),2),0) AS 'actualfinishnummonth'
         from
             aps_process_operation_process_equ apope
                 join aps_process_operation apo on apo.ID = apope.PROCESSID
@@ -549,22 +549,22 @@
         select
         plan.PROCESSWORKSHOPID
         ,plan.PROCESSWORKSHOP
-        ,IFNULL(plan.PLANPRODUCEVOLUME,0) AS 'PLANPRODUCEVOLUME' -- 本月计划完成(吨)
-        ,IFNULL(actual.ACTUALPRODUCEVOLUME,0) AS 'ACTUALPRODUCEVOLUME' -- 本月实际已完成(吨)
-        ,IFNULL(actual.YACTUALPRODUCEVOLUME,0) AS 'YACTUALPRODUCEVOLUME' -- 昨日实际已完成(吨)
-        ,if(plan.PLANPRODUCEVOLUME is null or plan.PLANPRODUCEVOLUME = 0,
-        1, actual.ACTUALPRODUCEVOLUME/plan.PLANPRODUCEVOLUME) COMPLETIONRATIO -- 本月实际已完成比例
+        ,IFNULL(ROUND(plan.PLANPRODUCEVOLUME,2),0) AS 'PLANPRODUCEVOLUME' -- 本月计划完成(吨)
+        ,IFNULL(ROUND(actual.ACTUALPRODUCEVOLUME,2),0) AS 'ACTUALPRODUCEVOLUME' -- 本月实际已完成(吨)
+        ,IFNULL(ROUND(actual.YACTUALPRODUCEVOLUME,2),0) AS 'YACTUALPRODUCEVOLUME' -- 昨日实际已完成(吨)
+        ,concat(if(plan.PLANPRODUCEVOLUME is null or plan.PLANPRODUCEVOLUME = 0,
+        1, ROUND(actual.ACTUALPRODUCEVOLUME/plan.PLANPRODUCEVOLUME*100,2)),'%') COMPLETIONRATIO -- 本月实际已完成比例
         from
         plan left join actual on plan.PROCESSWORKSHOPID=actual.PROCESSWORKSHOPID
         union -- mysql 该版本不支持full join,通过left join 和right join配合
         select
         plan.PROCESSWORKSHOPID
         ,plan.PROCESSWORKSHOP
-        ,IFNULL(plan.PLANPRODUCEVOLUME,0) AS 'PLANPRODUCEVOLUME' -- 本月计划完成(吨)
-        ,IFNULL(actual.ACTUALPRODUCEVOLUME,0) AS 'ACTUALPRODUCEVOLUME' -- 本月实际已完成(吨)
-        ,IFNULL(actual.YACTUALPRODUCEVOLUME,0) AS 'YACTUALPRODUCEVOLUME' -- 昨日实际已完成(吨)
-        ,if(plan.PLANPRODUCEVOLUME is null or plan.PLANPRODUCEVOLUME = 0,
-        1, actual.ACTUALPRODUCEVOLUME/plan.PLANPRODUCEVOLUME) COMPLETIONRATIO -- 本月实际已完成比例
+        ,IFNULL(ROUND(plan.PLANPRODUCEVOLUME,2),0) AS 'PLANPRODUCEVOLUME' -- 本月计划完成(吨)
+        ,IFNULL(ROUND(actual.ACTUALPRODUCEVOLUME,2),0) AS 'ACTUALPRODUCEVOLUME' -- 本月实际已完成(吨)
+        ,IFNULL(ROUND(actual.YACTUALPRODUCEVOLUME,2),0) AS 'YACTUALPRODUCEVOLUME' -- 昨日实际已完成(吨)
+        ,concat(if(plan.PLANPRODUCEVOLUME is null or plan.PLANPRODUCEVOLUME = 0,
+        1, ROUND(actual.ACTUALPRODUCEVOLUME/plan.PLANPRODUCEVOLUME*100,2)),'%') COMPLETIONRATIO -- 本月实际已完成比例
         from
         plan right join actual on plan.PROCESSWORKSHOPID=actual.PROCESSWORKSHOPID
     </select>
@@ -628,8 +628,8 @@
         )
         -- 计划完成订单量月平均值,实际已完成订单量月平均值
         select
-        IFNULL(AVG(plan.PLANPRODUCEVOLUME),0) AVGPLANPRODUCEVOLUME, -- 计划完成订单量月平均
-        IFNULL(AVG(actual.ACTUALPRODUCEVOLUME),0) AVGACTUALPRODUCEVOLUME -- 实际已完成订单量月平均
+        IFNULL(ROUND(AVG(plan.PLANPRODUCEVOLUME),2),0) AVGPLANPRODUCEVOLUME, -- 计划完成订单量月平均
+        IFNULL(ROUND(AVG(actual.ACTUALPRODUCEVOLUME),2),0) AVGACTUALPRODUCEVOLUME -- 实际已完成订单量月平均
         from
         months
         LEFT JOIN plan ON plan.month_year = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m')
@@ -696,8 +696,8 @@
         )
         select
             DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m') yearmonth,
-            IFNULL(plan.PLANPRODUCEVOLUME,0) AS 'PLANPRODUCEVOLUME', -- 计划完成订单量
-            IFNULL(actual.ACTUALPRODUCEVOLUME,0) AS 'ACTUALPRODUCEVOLUME' -- 实际已完成订单量
+            IFNULL(ROUND(plan.PLANPRODUCEVOLUME,2),0) AS 'PLANPRODUCEVOLUME', -- 计划完成订单量
+            IFNULL(ROUND(actual.ACTUALPRODUCEVOLUME,2),0) AS 'ACTUALPRODUCEVOLUME' -- 实际已完成订单量
         from
             months
                 LEFT JOIN plan ON plan.month_year = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m')
@@ -759,24 +759,24 @@
         select
             plan.PROCESSWORKSHOPID
              ,plan.PROCESSWORKSHOP
-             ,IFNULL(plan.PLANPRODUCEVOLUME,0) AS 'PLANPRODUCEVOLUME' -- 本月计划加工(吨)
-             ,IFNULL(plan.YPLANPRODUCEVOLUME,0) AS 'YPLANPRODUCEVOLUME' -- 昨日计划加工(吨)
-             ,IFNULL(actual.ACTUALPRODUCEVOLUME,0) AS 'ACTUALPRODUCEVOLUME' -- 本月实际已加工(吨)
-             ,IFNULL(actual.YACTUALPRODUCEVOLUME,0) AS 'YACTUALPRODUCEVOLUME' -- 昨日实际已加工(吨)
-             ,if(plan.PLANPRODUCEVOLUME is null or plan.PLANPRODUCEVOLUME = 0,
-                 1, actual.ACTUALPRODUCEVOLUME/plan.PLANPRODUCEVOLUME) COMPLETIONRATIO -- 本月实际已完成比例
+             ,IFNULL(ROUND(plan.PLANPRODUCEVOLUME,2),0) AS 'PLANPRODUCEVOLUME' -- 本月计划加工(吨)
+             ,IFNULL(ROUND(plan.YPLANPRODUCEVOLUME,2),0) AS 'YPLANPRODUCEVOLUME' -- 昨日计划加工(吨)
+             ,IFNULL(ROUND(actual.ACTUALPRODUCEVOLUME,2),0) AS 'ACTUALPRODUCEVOLUME' -- 本月实际已加工(吨)
+             ,IFNULL(ROUND(actual.YACTUALPRODUCEVOLUME,2),0) AS 'YACTUALPRODUCEVOLUME' -- 昨日实际已加工(吨)
+             ,ROUND(if(plan.PLANPRODUCEVOLUME is null or plan.PLANPRODUCEVOLUME = 0,
+                 1, actual.ACTUALPRODUCEVOLUME/plan.PLANPRODUCEVOLUME),2) COMPLETIONRATIO -- 本月实际已完成比例
         from
             plan left join actual on plan.PROCESSWORKSHOPID=actual.PROCESSWORKSHOPID
         union -- mysql 该版本不支持full join,通过left join 和right join配合
         select
             plan.PROCESSWORKSHOPID
              ,plan.PROCESSWORKSHOP
-             ,IFNULL(plan.PLANPRODUCEVOLUME,0) AS 'PLANPRODUCEVOLUME' -- 本月计划加工(吨)
-             ,IFNULL(plan.YPLANPRODUCEVOLUME,0) AS 'YPLANPRODUCEVOLUME' -- 昨日计划加工(吨)
-             ,IFNULL(actual.ACTUALPRODUCEVOLUME,0) AS 'ACTUALPRODUCEVOLUME' -- 本月实际已加工(吨)
-             ,IFNULL(actual.YACTUALPRODUCEVOLUME,0) AS 'YACTUALPRODUCEVOLUME' -- 昨日实际已加工(吨)
-             ,if(plan.PLANPRODUCEVOLUME is null or plan.PLANPRODUCEVOLUME = 0,
-                 1, actual.ACTUALPRODUCEVOLUME/plan.PLANPRODUCEVOLUME) COMPLETIONRATIO -- 本月实际已完成比例
+             ,IFNULL(ROUND(plan.PLANPRODUCEVOLUME,2),0) AS 'PLANPRODUCEVOLUME' -- 本月计划加工(吨)
+             ,IFNULL(ROUND(plan.YPLANPRODUCEVOLUME,2),0) AS 'YPLANPRODUCEVOLUME' -- 昨日计划加工(吨)
+             ,IFNULL(ROUND(actual.ACTUALPRODUCEVOLUME,2),0) AS 'ACTUALPRODUCEVOLUME' -- 本月实际已加工(吨)
+             ,IFNULL(ROUND(actual.YACTUALPRODUCEVOLUME,2),0) AS 'YACTUALPRODUCEVOLUME' -- 昨日实际已加工(吨)
+             ,ROUND(if(plan.PLANPRODUCEVOLUME is null or plan.PLANPRODUCEVOLUME = 0,
+                    1, actual.ACTUALPRODUCEVOLUME/plan.PLANPRODUCEVOLUME),2) COMPLETIONRATIO -- 本月实际已完成比例
         from
             plan right join actual on plan.PROCESSWORKSHOPID=actual.PROCESSWORKSHOPID
     </select>
@@ -825,8 +825,8 @@
              )
         -- 计划加工量月平均值,实际已加工量月平均值
         select
-            IFNULL(AVG(plan.PLANPRODUCEVOLUME),0) AVGPLANPRODUCEVOLUME, -- 计划加工量月平均
-            IFNULL(AVG(actual.ACTUALPRODUCEVOLUME),0) AVGACTUALPRODUCEVOLUME -- 实际已加工量月平均
+            IFNULL(ROUND(AVG(plan.PLANPRODUCEVOLUME),2),0) AVGPLANPRODUCEVOLUME, -- 计划加工量月平均
+            IFNULL(ROUND(AVG(actual.ACTUALPRODUCEVOLUME),2),0) AVGACTUALPRODUCEVOLUME -- 实际已加工量月平均
         from
             months
                 LEFT JOIN plan ON plan.month_year = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m')
@@ -877,8 +877,8 @@
              )
         select
             DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m') yearmonth,
-            IFNULL(plan.PLANPRODUCEVOLUME,0) AS 'PLANPRODUCEVOLUME', -- 计划加工量
-            IFNULL(actual.ACTUALPRODUCEVOLUME,0) AS 'ACTUALPRODUCEVOLUME' -- 实际已加工量
+            IFNULL(ROUND(plan.PLANPRODUCEVOLUME,2),0) AS 'PLANPRODUCEVOLUME', -- 计划加工量
+            IFNULL(ROUND(actual.ACTUALPRODUCEVOLUME,2),0) AS 'ACTUALPRODUCEVOLUME' -- 实际已加工量
         from
             months
                 LEFT JOIN plan ON plan.month_year = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m')
@@ -940,24 +940,24 @@
         select
             plan.PROCESSWORKSHOPID
              ,plan.PROCESSWORKSHOP
-             ,IFNULL(plan.PLANPRODUCEVOLUME,0) AS 'PLANPRODUCEVOLUME' -- 本月计划加工(吨)
-             ,IFNULL(plan.YPLANPRODUCEVOLUME,0) AS 'YPLANPRODUCEVOLUME' -- 昨日计划加工(吨)
-             ,IFNULL(actual.ACTUALPRODUCEVOLUME,0) AS 'ACTUALPRODUCEVOLUME' -- 本月实际已加工(吨)
-             ,IFNULL(actual.YACTUALPRODUCEVOLUME,0) AS 'YACTUALPRODUCEVOLUME' -- 昨日实际已加工(吨)
-             ,if(plan.PLANPRODUCEVOLUME is null or plan.PLANPRODUCEVOLUME = 0,
-                 1, actual.ACTUALPRODUCEVOLUME/plan.PLANPRODUCEVOLUME) COMPLETIONRATIO -- 本月实际已完成比例
+             ,IFNULL(ROUND(plan.PLANPRODUCEVOLUME,2),0) AS 'PLANPRODUCEVOLUME' -- 本月计划加工(吨)
+             ,IFNULL(ROUND(plan.YPLANPRODUCEVOLUME,2),0) AS 'YPLANPRODUCEVOLUME' -- 昨日计划加工(吨)
+             ,IFNULL(ROUND(actual.ACTUALPRODUCEVOLUME,2),0) AS 'ACTUALPRODUCEVOLUME' -- 本月实际已加工(吨)
+             ,IFNULL(ROUND(actual.YACTUALPRODUCEVOLUME,2),0) AS 'YACTUALPRODUCEVOLUME' -- 昨日实际已加工(吨)
+             ,ROUND(if(plan.PLANPRODUCEVOLUME is null or plan.PLANPRODUCEVOLUME = 0,
+                 1, actual.ACTUALPRODUCEVOLUME/plan.PLANPRODUCEVOLUME),2) COMPLETIONRATIO -- 本月实际已完成比例
         from
             plan left join actual on plan.PROCESSWORKSHOPID=actual.PROCESSWORKSHOPID
         union -- mysql 该版本不支持full join,通过left join 和right join配合
         select
             plan.PROCESSWORKSHOPID
              ,plan.PROCESSWORKSHOP
-             ,IFNULL(plan.PLANPRODUCEVOLUME,0) AS 'PLANPRODUCEVOLUME' -- 本月计划加工(吨)
-             ,IFNULL(plan.YPLANPRODUCEVOLUME,0) AS 'YPLANPRODUCEVOLUME' -- 昨日计划加工(吨)
-             ,IFNULL(actual.ACTUALPRODUCEVOLUME,0) AS 'ACTUALPRODUCEVOLUME' -- 本月实际已加工(吨)
-             ,IFNULL(actual.YACTUALPRODUCEVOLUME,0) AS 'YACTUALPRODUCEVOLUME' -- 昨日实际已加工(吨)
-             ,if(plan.PLANPRODUCEVOLUME is null or plan.PLANPRODUCEVOLUME = 0,
-                 1, actual.ACTUALPRODUCEVOLUME/plan.PLANPRODUCEVOLUME) COMPLETIONRATIO -- 本月实际已完成比例
+             ,IFNULL(ROUND(plan.PLANPRODUCEVOLUME,2),0) AS 'PLANPRODUCEVOLUME' -- 本月计划加工(吨)
+             ,IFNULL(ROUND(plan.YPLANPRODUCEVOLUME,2),0) AS 'YPLANPRODUCEVOLUME' -- 昨日计划加工(吨)
+             ,IFNULL(ROUND(actual.ACTUALPRODUCEVOLUME,2),0) AS 'ACTUALPRODUCEVOLUME' -- 本月实际已加工(吨)
+             ,IFNULL(ROUND(actual.YACTUALPRODUCEVOLUME,2),0) AS 'YACTUALPRODUCEVOLUME' -- 昨日实际已加工(吨)
+             ,ROUND(if(plan.PLANPRODUCEVOLUME is null or plan.PLANPRODUCEVOLUME = 0,
+                       1, actual.ACTUALPRODUCEVOLUME/plan.PLANPRODUCEVOLUME),2) COMPLETIONRATIO -- 本月实际已完成比例
         from
             plan right join actual on plan.PROCESSWORKSHOPID=actual.PROCESSWORKSHOPID
     </select>
@@ -1006,8 +1006,8 @@
              )
         -- 计划加工量月平均值,实际已加工量月平均值
         select
-            IFNULL(AVG(plan.PLANPRODUCEVOLUME),0) AVGPLANPRODUCEVOLUME, -- 计划加工量月平均
-            IFNULL(AVG(actual.ACTUALPRODUCEVOLUME),0) AVGACTUALPRODUCEVOLUME -- 实际已加工量月平均
+            IFNULL(ROUND(AVG(plan.PLANPRODUCEVOLUME),2),0) AVGPLANPRODUCEVOLUME, -- 计划加工量月平均
+            IFNULL(ROUND(AVG(actual.ACTUALPRODUCEVOLUME),2),0) AVGACTUALPRODUCEVOLUME -- 实际已加工量月平均
         from
             months
                 LEFT JOIN plan ON plan.month_year = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m')
@@ -1058,8 +1058,8 @@
              )
         select
             DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m') yearmonth,
-            IFNULL(plan.PLANPRODUCEVOLUME,0) AS 'PLANPRODUCEVOLUME', -- 计划加工量
-            IFNULL(actual.ACTUALPRODUCEVOLUME,0) AS 'ACTUALPRODUCEVOLUME' -- 实际已加工量
+            IFNULL(ROUND(plan.PLANPRODUCEVOLUME,2),0) AS 'PLANPRODUCEVOLUME', -- 计划加工量
+            IFNULL(ROUND(actual.ACTUALPRODUCEVOLUME,2),0) AS 'ACTUALPRODUCEVOLUME' -- 实际已加工量
         from
             months
                 LEFT JOIN plan ON plan.month_year = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m')
@@ -1121,24 +1121,24 @@
         select
             plan.PROCESSWORKSHOPID
              ,plan.PROCESSWORKSHOP
-             ,ifnull(plan.PLANPRODUCEVOLUME,0) PLANPRODUCEVOLUME -- 本月计划加工(道次)
-             ,ifnull(plan.YPLANPRODUCEVOLUME,0) YPLANPRODUCEVOLUME -- 昨日计划加工(道次)
-             ,ifnull(actual.ACTUALPRODUCEVOLUME,0) YPLANPRODUCEVOLUME  -- 本月实际已加工(道次)
-             ,ifnull(actual.YACTUALPRODUCEVOLUME,0) YPLANPRODUCEVOLUME  -- 昨日实际已加工(道次)
-             ,if(plan.PLANPRODUCEVOLUME is null or plan.PLANPRODUCEVOLUME = 0,
-                 1, actual.ACTUALPRODUCEVOLUME/plan.PLANPRODUCEVOLUME) COMPLETIONRATIO -- 本月实际已完成比例
+             ,ifnull(ROUND(plan.PLANPRODUCEVOLUME,2),0) PLANPRODUCEVOLUME -- 本月计划加工(道次)
+             ,ifnull(ROUND(plan.YPLANPRODUCEVOLUME,2),0) YPLANPRODUCEVOLUME -- 昨日计划加工(道次)
+             ,ifnull(ROUND(actual.ACTUALPRODUCEVOLUME,2),0) ACTUALPRODUCEVOLUME  -- 本月实际已加工(道次)
+             ,ifnull(ROUND(actual.YACTUALPRODUCEVOLUME,2),0) YACTUALPRODUCEVOLUME  -- 昨日实际已加工(道次)
+             ,ROUND(if(plan.PLANPRODUCEVOLUME is null or plan.PLANPRODUCEVOLUME = 0,
+                 1, actual.ACTUALPRODUCEVOLUME/plan.PLANPRODUCEVOLUME),2) COMPLETIONRATIO -- 本月实际已完成比例
         from
             plan left join actual on plan.PROCESSWORKSHOPID=actual.PROCESSWORKSHOPID
         union -- mysql 该版本不支持full join,通过left join 和right join配合
         select
             plan.PROCESSWORKSHOPID
              ,plan.PROCESSWORKSHOP
-             ,ifnull(plan.PLANPRODUCEVOLUME,0) PLANPRODUCEVOLUME -- 本月计划加工(道次)
-             ,ifnull(plan.YPLANPRODUCEVOLUME,0) YPLANPRODUCEVOLUME -- 昨日计划加工(道次)
-             ,ifnull(actual.ACTUALPRODUCEVOLUME,0) YPLANPRODUCEVOLUME  -- 本月实际已加工(道次)
-             ,ifnull(actual.YACTUALPRODUCEVOLUME,0) YPLANPRODUCEVOLUME  -- 昨日实际已加工(道次)
-             ,if(plan.PLANPRODUCEVOLUME is null or plan.PLANPRODUCEVOLUME = 0,
-                 1, actual.ACTUALPRODUCEVOLUME/plan.PLANPRODUCEVOLUME) COMPLETIONRATIO -- 本月实际已完成比例
+             ,ifnull(ROUND(plan.PLANPRODUCEVOLUME,2),0) PLANPRODUCEVOLUME -- 本月计划加工(道次)
+             ,ifnull(ROUND(plan.YPLANPRODUCEVOLUME,2),0) YPLANPRODUCEVOLUME -- 昨日计划加工(道次)
+             ,ifnull(ROUND(actual.ACTUALPRODUCEVOLUME,2),0) ACTUALPRODUCEVOLUME  -- 本月实际已加工(道次)
+             ,ifnull(ROUND(actual.YACTUALPRODUCEVOLUME,2),0) YACTUALPRODUCEVOLUME  -- 昨日实际已加工(道次)
+             ,ROUND(if(plan.PLANPRODUCEVOLUME is null or plan.PLANPRODUCEVOLUME = 0,
+                       1, actual.ACTUALPRODUCEVOLUME/plan.PLANPRODUCEVOLUME),2) COMPLETIONRATIO -- 本月实际已完成比例
         from
             plan right join actual on plan.PROCESSWORKSHOPID=actual.PROCESSWORKSHOPID
     </select>
@@ -1188,8 +1188,8 @@
 
         -- 计划加工量月平均值,实际已加工量月平均值
         select
-            IFNULL(AVG(plan.PLANPRODUCEVOLUME),0) AVGPLANPRODUCEVOLUME, -- 计划加工量月平均
-            IFNULL(AVG(actual.ACTUALPRODUCEVOLUME),0) AVGACTUALPRODUCEVOLUME -- 实际已加工量月平均
+            IFNULL(ROUND(AVG(plan.PLANPRODUCEVOLUME),2),0) AVGPLANPRODUCEVOLUME, -- 计划加工量月平均
+            IFNULL(ROUND(AVG(actual.ACTUALPRODUCEVOLUME),2),0) AVGACTUALPRODUCEVOLUME -- 实际已加工量月平均
         from
             months
                 LEFT JOIN plan ON plan.month_year = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m')
@@ -1240,8 +1240,8 @@
              )
         select
             DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m') yearmonth,
-            IFNULL(plan.PLANPRODUCEVOLUME,0) AS 'PLANPRODUCEVOLUME', -- 计划加工量
-            IFNULL(actual.ACTUALPRODUCEVOLUME,0) AS 'ACTUALPRODUCEVOLUME' -- 实际已加工量
+            IFNULL(ROUND(plan.PLANPRODUCEVOLUME,2),0) AS 'PLANPRODUCEVOLUME', -- 计划加工量
+            IFNULL(ROUND(actual.ACTUALPRODUCEVOLUME,2),0) AS 'ACTUALPRODUCEVOLUME' -- 实际已加工量
         from
             months
                 LEFT JOIN plan ON plan.month_year = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m')
@@ -1303,24 +1303,24 @@
         select
             plan.PROCESSWORKSHOPID
              ,plan.PROCESSWORKSHOP
-             ,IFNULL(plan.PLANPRODUCEVOLUME,0) PLANPRODUCEVOLUME -- 本月计划加工(炉次)
-             ,IFNULL(plan.YPLANPRODUCEVOLUME,0) YPLANPRODUCEVOLUME -- 昨日计划加工(炉次)
-             ,IFNULL(actual.ACTUALPRODUCEVOLUME,0) ACTUALPRODUCEVOLUME -- 本月实际已加工(炉次)
-             ,IFNULL(actual.YACTUALPRODUCEVOLUME,0) YACTUALPRODUCEVOLUME -- 昨日实际已加工(炉次)
-             ,if(plan.PLANPRODUCEVOLUME is null or plan.PLANPRODUCEVOLUME = 0,
-                 1, actual.ACTUALPRODUCEVOLUME/plan.PLANPRODUCEVOLUME) CompletionRatio -- 本月实际已完成比例
+             ,IFNULL(ROUND(plan.PLANPRODUCEVOLUME,2),0) PLANPRODUCEVOLUME -- 本月计划加工(炉次)
+             ,IFNULL(ROUND(plan.YPLANPRODUCEVOLUME,2),0) YPLANPRODUCEVOLUME -- 昨日计划加工(炉次)
+             ,IFNULL(ROUND(actual.ACTUALPRODUCEVOLUME,2),0) ACTUALPRODUCEVOLUME -- 本月实际已加工(炉次)
+             ,IFNULL(ROUND(actual.YACTUALPRODUCEVOLUME,2),0) YACTUALPRODUCEVOLUME -- 昨日实际已加工(炉次)
+             ,ROUND(if(plan.PLANPRODUCEVOLUME is null or plan.PLANPRODUCEVOLUME = 0,
+                 1, actual.ACTUALPRODUCEVOLUME/plan.PLANPRODUCEVOLUME),2) COMPLETIONRATIO -- 本月实际已完成比例
         from
             plan left join actual on plan.PROCESSWORKSHOPID=actual.PROCESSWORKSHOPID
         union -- mysql 该版本不支持full join,通过left join 和right join配合
         select
             plan.PROCESSWORKSHOPID
              ,plan.PROCESSWORKSHOP
-             ,IFNULL(plan.PLANPRODUCEVOLUME,0) PLANPRODUCEVOLUME -- 本月计划加工(炉次)
-             ,IFNULL(plan.YPLANPRODUCEVOLUME,0) YPLANPRODUCEVOLUME -- 昨日计划加工(炉次)
-             ,IFNULL(actual.ACTUALPRODUCEVOLUME,0) ACTUALPRODUCEVOLUME -- 本月实际已加工(炉次)
-             ,IFNULL(actual.YACTUALPRODUCEVOLUME,0) YACTUALPRODUCEVOLUME -- 昨日实际已加工(炉次)
-             ,if(plan.PLANPRODUCEVOLUME is null or plan.PLANPRODUCEVOLUME = 0,
-                 1, actual.ACTUALPRODUCEVOLUME/plan.PLANPRODUCEVOLUME) CompletionRatio -- 本月实际已完成比例
+             ,IFNULL(ROUND(plan.PLANPRODUCEVOLUME,2),0) PLANPRODUCEVOLUME -- 本月计划加工(炉次)
+             ,IFNULL(ROUND(plan.YPLANPRODUCEVOLUME,2),0) YPLANPRODUCEVOLUME -- 昨日计划加工(炉次)
+             ,IFNULL(ROUND(actual.ACTUALPRODUCEVOLUME,2),0) ACTUALPRODUCEVOLUME -- 本月实际已加工(炉次)
+             ,IFNULL(ROUND(actual.YACTUALPRODUCEVOLUME,2),0) YACTUALPRODUCEVOLUME -- 昨日实际已加工(炉次)
+             ,ROUND(if(plan.PLANPRODUCEVOLUME is null or plan.PLANPRODUCEVOLUME = 0,
+                       1, actual.ACTUALPRODUCEVOLUME/plan.PLANPRODUCEVOLUME),2) COMPLETIONRATIO -- 本月实际已完成比例
         from
             plan right join actual on plan.PROCESSWORKSHOPID=actual.PROCESSWORKSHOPID
     </select>
@@ -1369,8 +1369,8 @@
              )
         -- 计划加工量月平均值,实际已加工量月平均值
         select
-            IFNULL(AVG(plan.PLANPRODUCEVOLUME),0) AVGPLANPRODUCEVOLUME, -- 计划加工量月平均
-            IFNULL(AVG(actual.ACTUALPRODUCEVOLUME),0) AVGACTUALPRODUCEVOLUME -- 实际已加工量月平均
+            IFNULL(ROUND(AVG(plan.PLANPRODUCEVOLUME),2),0) AVGPLANPRODUCEVOLUME, -- 计划加工量月平均
+            IFNULL(ROUND(AVG(actual.ACTUALPRODUCEVOLUME),2),0) AVGACTUALPRODUCEVOLUME -- 实际已加工量月平均
         from
             months
                 LEFT JOIN plan ON plan.month_year = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m')
@@ -1421,8 +1421,8 @@
              )
         select
             DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m') yearmonth,
-            IFNULL(plan.PLANPRODUCEVOLUME,0) PLANPRODUCEVOLUME, -- 计划加工量
-            IFNULL(actual.ACTUALPRODUCEVOLUME,0) ACTUALPRODUCEVOLUME -- 实际已加工量
+            IFNULL(ROUND(plan.PLANPRODUCEVOLUME,2),0) PLANPRODUCEVOLUME, -- 计划加工量
+            IFNULL(ROUND(actual.ACTUALPRODUCEVOLUME,2),0) ACTUALPRODUCEVOLUME -- 实际已加工量
         from
             months
                 LEFT JOIN plan ON plan.month_year = DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL months.n MONTH), '%Y-%m')

+ 1 - 0
cx-aps/cx-aps-server/src/main/java/com/rongwei/bsserver/controller/ApsProductionOrderController.java

@@ -187,6 +187,7 @@ public class ApsProductionOrderController {
      * 数据眼报表 定时任务 准备数据
      */
     @GetMapping("/dataEyeReport")
+    @Scheduled(cron = "0 30 11 * * *")
     public R dataEyeReport() {
         log.info("数据眼报表 定时任务 准备数据开始");
         Thread thread = new Thread(() -> apsProductionOrderService.dataEyeReport());