aps-大屏

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

@@ -1837,7 +1837,7 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
                     && new BigDecimal(item.getActualfinishnumweek()).compareTo(BigDecimal.ZERO) != 0) {
                 //计算比例，保留4位小数，以便百分比保留两位小数
                 item.setActualfinishnumweekhpercent(
-                        new BigDecimal(item.getActualfinishnumweek()).multiply(BigDecimal.valueOf(100)).divide(new BigDecimal(item.getActualordernummonth()), 2, RoundingMode.HALF_UP).toString());
+                        new BigDecimal(item.getActualfinishnumweek()).multiply(BigDecimal.valueOf(100)).divide(new BigDecimal(item.getActualordernumweek()), 2, RoundingMode.HALF_UP).toString());
             } else if (new BigDecimal(item.getActualfinishnumweek()).compareTo(BigDecimal.ZERO) == 0) {
                 item.setActualfinishnumweekhpercent("0");
             } else {

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

@@ -708,7 +708,7 @@
                 apope.PROCESSWORKSHOPID,
             DATE(apope.PLANENDDATE) PROCESSDAY,
             max(apope.PROCESSWORKSHOP) PROCESSWORKSHOP,
-            sum(if(YEAR(apope.PLANENDDATE) = YEAR(CURRENT_DATE) and WEEK(apope.PLANENDDATE) = WEEK(CURRENT_DATE), -- 本周
+            sum(if(YEARWEEK(apope.PLANENDDATE,1)=YEARWEEK(CURRENT_DATE,1), -- 本周
            (apope.PLANPROCESSRALL-apope.CANCELROLL)*apo.SINGLEROLLWEIGHT,null)) PLANPRODUCEVOLUME, -- 本周计划加工量
             sum(if(DATE(apope.PLANENDDATE) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY), -- 昨日
            (apope.PLANPROCESSRALL-apope.CANCELROLL)*apo.SINGLEROLLWEIGHT,null)) YPLANPRODUCEVOLUME -- 昨日计划加工量
@@ -721,7 +721,7 @@
           and app.PROCESSCATEGORY='10' -- 铸轧
           and apo.PROCESSSTATUS in ('30','40','50') -- 已发布
           and (apope.PLANPROCESSRALL-apope.CANCELROLL)>0 -- 计划加工卷数- 已取消卷数合计
-          and (YEAR(apope.PLANENDDATE) = YEAR(CURRENT_DATE) and WEEK(apope.PLANENDDATE) = WEEK(CURRENT_DATE) -- 本周
+          and (YEARWEEK(apope.PLANENDDATE,1)=YEARWEEK(CURRENT_DATE,1) -- 本周
            or DATE(apope.PLANENDDATE) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY)) -- 昨日
           and apo.TENANTID=#{tenantId}
         group by
@@ -734,7 +734,7 @@
             apope.PROCESSWORKSHOPID,
             DATE(arr.REPORTWORKTIME) PROCESSDAY,
             max(apope.PROCESSWORKSHOP) PROCESSWORKSHOP,
-            sum(if(YEAR(arr.REPORTWORKTIME) = YEAR(CURRENT_DATE) and WEEK(arr.REPORTWORKTIME) = WEEK(CURRENT_DATE), -- 本周
+            sum(if(YEARWEEK(arr.REPORTWORKTIME,1)=YEARWEEK(CURRENT_DATE,1), -- 本周
             apo.SINGLEROLLWEIGHT,null)) ACTUALPRODUCEVOLUME, -- 本周实际已加工量
             sum(if(DATE(arr.REPORTWORKTIME) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY), -- 昨日
             apo.SINGLEROLLWEIGHT,null)) YACTUALPRODUCEVOLUME -- 昨日实际已加工量
@@ -747,7 +747,7 @@
             apope.deleted='0' and apo.DELETED='0' and arr.deleted='0'
           and app.PROCESSCATEGORY='10' -- 铸轧
           and arr.REPORTWORKSTATUS='已报工'
-          and (YEAR(arr.REPORTWORKTIME) = YEAR(CURRENT_DATE) and WEEK(arr.REPORTWORKTIME) = WEEK(CURRENT_DATE) -- 本周
+          and (YEARWEEK(arr.REPORTWORKTIME,1)=YEARWEEK(CURRENT_DATE,1) -- 本周
            or DATE(arr.REPORTWORKTIME) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY)) -- 昨日
           and apo.TENANTID=#{tenantId}
         group by
@@ -756,9 +756,9 @@
         select
             plan.PROCESSWORKSHOPID
              ,plan.PROCESSWORKSHOP
-             ,IFNULL(ROUND(sum(if(YEAR(plan.PROCESSDAY) = YEAR(CURRENT_DATE) and WEEK(plan.PROCESSDAY) = WEEK(CURRENT_DATE),plan.PLANPRODUCEVOLUME,null)),2),0) AS 'WEEKPLANPRODUCEVOLUME' -- 本周计划加工（吨）
+             ,IFNULL(ROUND(sum(if(YEARWEEK(plan.PROCESSDAY,1)=YEARWEEK(CURRENT_DATE,1),plan.PLANPRODUCEVOLUME,null)),2),0) AS 'WEEKPLANPRODUCEVOLUME' -- 本周计划加工（吨）
              ,IFNULL(ROUND(sum(if(DATE(plan.PROCESSDAY) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY),plan.YPLANPRODUCEVOLUME,null)),2),0) AS 'YPLANPRODUCEVOLUME' -- 昨日计划加工（吨）
-             ,IFNULL(ROUND(sum(if(YEAR(actual.PROCESSDAY) = YEAR(CURRENT_DATE) and WEEK(actual.PROCESSDAY) = WEEK(CURRENT_DATE),actual.ACTUALPRODUCEVOLUME,null)),2),0) AS 'WEEKACTUALPRODUCEVOLUME' -- 本周实际已加工（吨）
+             ,IFNULL(ROUND(sum(if(YEARWEEK(actual.PROCESSDAY,1)=YEARWEEK(CURRENT_DATE,1),actual.ACTUALPRODUCEVOLUME,null)),2),0) AS 'WEEKACTUALPRODUCEVOLUME' -- 本周实际已加工（吨）
              ,IFNULL(ROUND(sum(if(DATE(actual.PROCESSDAY) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY),actual.YACTUALPRODUCEVOLUME,null)),2),0) AS 'YACTUALPRODUCEVOLUME' -- 昨日实际已加工（吨）
         --              ,ROUND(if(plan.PLANPRODUCEVOLUME is null or plan.PLANPRODUCEVOLUME = 0,
 --                  1, actual.ACTUALPRODUCEVOLUME/plan.PLANPRODUCEVOLUME),2) COMPLETIONRATIO -- 本周实际已完成比例
@@ -769,9 +769,9 @@
         select
             actual.PROCESSWORKSHOPID
              ,actual.PROCESSWORKSHOP
-             ,IFNULL(ROUND(sum(if(YEAR(plan.PROCESSDAY) = YEAR(CURRENT_DATE) and WEEK(plan.PROCESSDAY) = WEEK(CURRENT_DATE),plan.PLANPRODUCEVOLUME,null)),2),0) AS 'WEEKPLANPRODUCEVOLUME' -- 本周计划加工（吨）
+             ,IFNULL(ROUND(sum(if(YEARWEEK(plan.PROCESSDAY,1)=YEARWEEK(CURRENT_DATE,1),plan.PLANPRODUCEVOLUME,null)),2),0) AS 'WEEKPLANPRODUCEVOLUME' -- 本周计划加工（吨）
              ,IFNULL(ROUND(sum(if(DATE(plan.PROCESSDAY) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY),plan.YPLANPRODUCEVOLUME,null)),2),0) AS 'YPLANPRODUCEVOLUME' -- 昨日计划加工（吨）
-             ,IFNULL(ROUND(sum(if(YEAR(actual.PROCESSDAY) = YEAR(CURRENT_DATE) and WEEK(actual.PROCESSDAY) = WEEK(CURRENT_DATE),actual.ACTUALPRODUCEVOLUME,null)),2),0) AS 'WEEKACTUALPRODUCEVOLUME' -- 本周实际已加工（吨）
+             ,IFNULL(ROUND(sum(if(YEARWEEK(actual.PROCESSDAY,1)=YEARWEEK(CURRENT_DATE,1),actual.ACTUALPRODUCEVOLUME,null)),2),0) AS 'WEEKACTUALPRODUCEVOLUME' -- 本周实际已加工（吨）
              ,IFNULL(ROUND(sum(if(DATE(actual.PROCESSDAY) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY),actual.YACTUALPRODUCEVOLUME,null)),2),0) AS 'YACTUALPRODUCEVOLUME' -- 昨日实际已加工（吨）
         --              ,ROUND(if(plan.PLANPRODUCEVOLUME is null or plan.PLANPRODUCEVOLUME = 0,
 --                  1, actual.ACTUALPRODUCEVOLUME/plan.PLANPRODUCEVOLUME),2) COMPLETIONRATIO -- 本周实际已完成比例
@@ -893,7 +893,7 @@
                 apope.PROCESSWORKSHOPID,
             DATE(apope.PLANENDDATE) PROCESSDAY,
             max(apope.PROCESSWORKSHOP) PROCESSWORKSHOP,
-            sum(if(YEAR(apope.PLANENDDATE) = YEAR(CURRENT_DATE) and WEEK(apope.PLANENDDATE) = WEEK(CURRENT_DATE), -- 本周
+            sum(if(YEARWEEK(apope.PLANENDDATE,1)=YEARWEEK(CURRENT_DATE,1), -- 本周
            (apope.PLANPROCESSRALL-apope.CANCELROLL)*apo.SINGLEROLLWEIGHT,null)) PLANPRODUCEVOLUME, -- 本周计划加工量
             sum(if(DATE(apope.PLANENDDATE) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY), -- 昨日
            (apope.PLANPROCESSRALL-apope.CANCELROLL)*apo.SINGLEROLLWEIGHT,null)) YPLANPRODUCEVOLUME -- 昨日计划加工量
@@ -906,7 +906,7 @@
           and app.PROCESSCATEGORY='40' -- 精整
           and apo.PROCESSSTATUS in ('30','40','50') -- 已发布
           and (apope.PLANPROCESSRALL-apope.CANCELROLL)>0 -- 计划加工卷数- 已取消卷数合计
-          and (YEAR(apope.PLANENDDATE) = YEAR(CURRENT_DATE) and WEEK(apope.PLANENDDATE) = WEEK(CURRENT_DATE) -- 本周
+          and (YEARWEEK(apope.PLANENDDATE,1)=YEARWEEK(CURRENT_DATE,1) -- 本周
            or DATE(apope.PLANENDDATE) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY)) -- 昨日
           and apo.TENANTID=#{tenantId}
         group by
@@ -919,7 +919,7 @@
             apope.PROCESSWORKSHOPID,
             DATE(arr.REPORTWORKTIME) PROCESSDAY,
             max(apope.PROCESSWORKSHOP) PROCESSWORKSHOP,
-            sum(if(YEAR(arr.REPORTWORKTIME) = YEAR(CURRENT_DATE) and WEEK(arr.REPORTWORKTIME) = WEEK(CURRENT_DATE), -- 本周
+            sum(if(YEARWEEK(arr.REPORTWORKTIME,1)=YEARWEEK(CURRENT_DATE,1), -- 本周
             (LENGTH(trim( BOTH ',' FROM arr.BATCHNUMBER))-LENGTH(REPLACE(trim( BOTH ',' FROM arr.BATCHNUMBER), ',', '')) + 1) * IFNULL(arr.ACTUALROLLWEIGHT,apo.SINGLEROLLWEIGHT),null)) ACTUALPRODUCEVOLUME, -- 本周实际已加工量=报工批次号数量*实际输入单卷重
             sum(if(DATE(arr.REPORTWORKTIME) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY), -- 昨日
             (LENGTH(trim( BOTH ',' FROM arr.BATCHNUMBER))-LENGTH(REPLACE(trim( BOTH ',' FROM arr.BATCHNUMBER), ',', '')) + 1) * IFNULL(arr.ACTUALROLLWEIGHT,apo.SINGLEROLLWEIGHT),null)) YACTUALPRODUCEVOLUME -- 昨日实际已加工量=报工批次号数量*实际输入单卷重
@@ -932,7 +932,7 @@
             apope.deleted='0' and apo.DELETED='0' and arr.deleted='0'
           and app.PROCESSCATEGORY='40' -- 精整
           and arr.REPORTWORKSTATUS='已报工'
-          and (YEAR(arr.REPORTWORKTIME) = YEAR(CURRENT_DATE) and WEEK(arr.REPORTWORKTIME) = WEEK(CURRENT_DATE) -- 本周
+          and (YEARWEEK(arr.REPORTWORKTIME,1)=YEARWEEK(CURRENT_DATE,1) -- 本周
            or DATE(arr.REPORTWORKTIME) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY)) -- 昨日
           and apo.TENANTID=#{tenantId}
         group by
@@ -941,9 +941,9 @@
         select
             plan.PROCESSWORKSHOPID
              ,plan.PROCESSWORKSHOP
-             ,IFNULL(ROUND(sum(if(YEAR(plan.PROCESSDAY) = YEAR(CURRENT_DATE) and WEEK(plan.PROCESSDAY) = WEEK(CURRENT_DATE),plan.PLANPRODUCEVOLUME,null)),2),0) AS 'WEEKPLANPRODUCEVOLUME' -- 本周计划加工（吨）
+             ,IFNULL(ROUND(sum(if(YEARWEEK(plan.PROCESSDAY,1)=YEARWEEK(CURRENT_DATE,1),plan.PLANPRODUCEVOLUME,null)),2),0) AS 'WEEKPLANPRODUCEVOLUME' -- 本周计划加工（吨）
              ,IFNULL(ROUND(sum(if(DATE(plan.PROCESSDAY) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY),plan.YPLANPRODUCEVOLUME,null)),2),0) AS 'YPLANPRODUCEVOLUME' -- 昨日计划加工（吨）
-             ,IFNULL(ROUND(sum(if(YEAR(actual.PROCESSDAY) = YEAR(CURRENT_DATE) and WEEK(actual.PROCESSDAY) = WEEK(CURRENT_DATE),actual.ACTUALPRODUCEVOLUME,null)),2),0) AS 'WEEKACTUALPRODUCEVOLUME' -- 本周实际已加工（吨）
+             ,IFNULL(ROUND(sum(if(YEARWEEK(actual.PROCESSDAY,1)=YEARWEEK(CURRENT_DATE,1),actual.ACTUALPRODUCEVOLUME,null)),2),0) AS 'WEEKACTUALPRODUCEVOLUME' -- 本周实际已加工（吨）
              ,IFNULL(ROUND(sum(if(DATE(actual.PROCESSDAY) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY),actual.YACTUALPRODUCEVOLUME,null)),2),0) AS 'YACTUALPRODUCEVOLUME' -- 昨日实际已加工（吨）
         --              ,ROUND(if(plan.PLANPRODUCEVOLUME is null or plan.PLANPRODUCEVOLUME = 0,
 --                  1, actual.ACTUALPRODUCEVOLUME/plan.PLANPRODUCEVOLUME),2) COMPLETIONRATIO -- 本周实际已完成比例
@@ -954,9 +954,9 @@
         select
             actual.PROCESSWORKSHOPID
              ,actual.PROCESSWORKSHOP
-             ,IFNULL(ROUND(sum(if(YEAR(plan.PROCESSDAY) = YEAR(CURRENT_DATE) and WEEK(plan.PROCESSDAY) = WEEK(CURRENT_DATE),plan.PLANPRODUCEVOLUME,null)),2),0) AS 'WEEKPLANPRODUCEVOLUME' -- 本周计划加工（吨）
+             ,IFNULL(ROUND(sum(if(YEARWEEK(plan.PROCESSDAY,1)=YEARWEEK(CURRENT_DATE,1),plan.PLANPRODUCEVOLUME,null)),2),0) AS 'WEEKPLANPRODUCEVOLUME' -- 本周计划加工（吨）
              ,IFNULL(ROUND(sum(if(DATE(plan.PROCESSDAY) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY),plan.YPLANPRODUCEVOLUME,null)),2),0) AS 'YPLANPRODUCEVOLUME' -- 昨日计划加工（吨）
-             ,IFNULL(ROUND(sum(if(YEAR(actual.PROCESSDAY) = YEAR(CURRENT_DATE) and WEEK(actual.PROCESSDAY) = WEEK(CURRENT_DATE),actual.ACTUALPRODUCEVOLUME,null)),2),0) AS 'WEEKACTUALPRODUCEVOLUME' -- 本周实际已加工（吨）
+             ,IFNULL(ROUND(sum(if(YEARWEEK(actual.PROCESSDAY,1)=YEARWEEK(CURRENT_DATE,1),actual.ACTUALPRODUCEVOLUME,null)),2),0) AS 'WEEKACTUALPRODUCEVOLUME' -- 本周实际已加工（吨）
              ,IFNULL(ROUND(sum(if(DATE(actual.PROCESSDAY) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY),actual.YACTUALPRODUCEVOLUME,null)),2),0) AS 'YACTUALPRODUCEVOLUME' -- 昨日实际已加工（吨）
         --              ,ROUND(if(plan.PLANPRODUCEVOLUME is null or plan.PLANPRODUCEVOLUME = 0,
 --                        1, actual.ACTUALPRODUCEVOLUME/plan.PLANPRODUCEVOLUME),2) COMPLETIONRATIO -- 本周实际已完成比例
@@ -1078,7 +1078,7 @@
                 apope.PROCESSWORKSHOPID,
             DATE(apope.PLANENDDATE) PROCESSDAY,
             max(apope.PROCESSWORKSHOP) PROCESSWORKSHOP,
-            sum(if(YEAR(apope.PLANENDDATE) = YEAR(CURRENT_DATE) and WEEK(apope.PLANENDDATE) = WEEK(CURRENT_DATE), -- 本周
+            sum(if(YEARWEEK(apope.PLANENDDATE,1)=YEARWEEK(CURRENT_DATE,1), -- 本周
             apope.PLANPROCESSRALL-apope.CANCELROLL,null)) PLANPRODUCEVOLUME, -- 本周计划加工量
             sum(if(DATE(apope.PLANENDDATE) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY), -- 昨日
             apope.PLANPROCESSRALL-apope.CANCELROLL,null)) YPLANPRODUCEVOLUME -- 昨日计划加工量
@@ -1091,7 +1091,7 @@
           and app.PROCESSCATEGORY='20' -- 轧机
           and apo.PROCESSSTATUS in ('30','40','50') -- 已发布
           and (apope.PLANPROCESSRALL-apope.CANCELROLL)>0 -- 计划加工卷数- 已取消卷数合计
-          and (YEAR(apope.PLANENDDATE) = YEAR(CURRENT_DATE) and WEEK(apope.PLANENDDATE) = WEEK(CURRENT_DATE) -- 本周
+          and (YEARWEEK(apope.PLANENDDATE,1)=YEARWEEK(CURRENT_DATE,1) -- 本周
            or DATE(apope.PLANENDDATE) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY)) -- 昨日
           and apo.TENANTID=#{tenantId}
         group by
@@ -1104,7 +1104,7 @@
             apope.PROCESSWORKSHOPID,
             DATE(arr.REPORTWORKTIME) PROCESSDAY,
             max(apope.PROCESSWORKSHOP) PROCESSWORKSHOP,
-            sum(if(YEAR(arr.REPORTWORKTIME) = YEAR(CURRENT_DATE) and WEEK(arr.REPORTWORKTIME) = WEEK(CURRENT_DATE), -- 本周
+            sum(if(YEARWEEK(arr.REPORTWORKTIME,1)=YEARWEEK(CURRENT_DATE,1), -- 本周
             1,null)) ACTUALPRODUCEVOLUME, -- 本周实际已加工量
             sum(if(DATE(arr.REPORTWORKTIME) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY), --  昨日
             1,null)) YACTUALPRODUCEVOLUME -- 昨日实际已加工量
@@ -1117,7 +1117,7 @@
             apope.deleted='0' and apo.DELETED='0' and arr.deleted='0'
           and app.PROCESSCATEGORY='20' -- 轧机
           and arr.REPORTWORKSTATUS='已报工'
-          and (YEAR(arr.REPORTWORKTIME) = YEAR(CURRENT_DATE) and WEEK(arr.REPORTWORKTIME) = WEEK(CURRENT_DATE) -- 本周
+          and (YEARWEEK(arr.REPORTWORKTIME,1)=YEARWEEK(CURRENT_DATE,1) -- 本周
            or DATE(arr.REPORTWORKTIME) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY)) -- 昨日
           and apo.TENANTID=#{tenantId}
         group by
@@ -1126,9 +1126,9 @@
         select
             plan.PROCESSWORKSHOPID
              ,plan.PROCESSWORKSHOP
-             ,IFNULL(ROUND(sum(if(YEAR(plan.PROCESSDAY) = YEAR(CURRENT_DATE) and WEEK(plan.PROCESSDAY) = WEEK(CURRENT_DATE),plan.PLANPRODUCEVOLUME,null)),2),0) AS 'WEEKPLANPRODUCEVOLUME' -- 本周计划加工（吨）
+             ,IFNULL(ROUND(sum(if(YEARWEEK(plan.PROCESSDAY,1)=YEARWEEK(CURRENT_DATE,1),plan.PLANPRODUCEVOLUME,null)),2),0) AS 'WEEKPLANPRODUCEVOLUME' -- 本周计划加工（吨）
              ,IFNULL(ROUND(sum(if(DATE(plan.PROCESSDAY) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY),plan.YPLANPRODUCEVOLUME,null)),2),0) AS 'YPLANPRODUCEVOLUME' -- 昨日计划加工（吨）
-             ,IFNULL(ROUND(sum(if(YEAR(actual.PROCESSDAY) = YEAR(CURRENT_DATE) and WEEK(actual.PROCESSDAY) = WEEK(CURRENT_DATE),actual.ACTUALPRODUCEVOLUME,null)),2),0) AS 'WEEKACTUALPRODUCEVOLUME' -- 本周实际已加工（吨）
+             ,IFNULL(ROUND(sum(if(YEARWEEK(actual.PROCESSDAY,1)=YEARWEEK(CURRENT_DATE,1),actual.ACTUALPRODUCEVOLUME,null)),2),0) AS 'WEEKACTUALPRODUCEVOLUME' -- 本周实际已加工（吨）
              ,IFNULL(ROUND(sum(if(DATE(actual.PROCESSDAY) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY),actual.YACTUALPRODUCEVOLUME,null)),2),0) AS 'YACTUALPRODUCEVOLUME' -- 昨日实际已加工（吨）
         --              ,ROUND(if(plan.PLANPRODUCEVOLUME is null or plan.PLANPRODUCEVOLUME = 0,
 --                  1, actual.ACTUALPRODUCEVOLUME/plan.PLANPRODUCEVOLUME),2) COMPLETIONRATIO -- 本周实际已完成比例
@@ -1139,9 +1139,9 @@
         select
             actual.PROCESSWORKSHOPID
              ,actual.PROCESSWORKSHOP
-             ,IFNULL(ROUND(sum(if(YEAR(plan.PROCESSDAY) = YEAR(CURRENT_DATE) and WEEK(plan.PROCESSDAY) = WEEK(CURRENT_DATE),plan.PLANPRODUCEVOLUME,null)),2),0) AS 'WEEKPLANPRODUCEVOLUME' -- 本周计划加工（吨）
+             ,IFNULL(ROUND(sum(if(YEARWEEK(plan.PROCESSDAY,1)=YEARWEEK(CURRENT_DATE,1),plan.PLANPRODUCEVOLUME,null)),2),0) AS 'WEEKPLANPRODUCEVOLUME' -- 本周计划加工（吨）
              ,IFNULL(ROUND(sum(if(DATE(plan.PROCESSDAY) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY),plan.YPLANPRODUCEVOLUME,null)),2),0) AS 'YPLANPRODUCEVOLUME' -- 昨日计划加工（吨）
-             ,IFNULL(ROUND(sum(if(YEAR(actual.PROCESSDAY) = YEAR(CURRENT_DATE) and WEEK(actual.PROCESSDAY) = WEEK(CURRENT_DATE),actual.ACTUALPRODUCEVOLUME,null)),2),0) AS 'WEEKACTUALPRODUCEVOLUME' -- 本周实际已加工（吨）
+             ,IFNULL(ROUND(sum(if(YEARWEEK(actual.PROCESSDAY,1)=YEARWEEK(CURRENT_DATE,1),actual.ACTUALPRODUCEVOLUME,null)),2),0) AS 'WEEKACTUALPRODUCEVOLUME' -- 本周实际已加工（吨）
              ,IFNULL(ROUND(sum(if(DATE(actual.PROCESSDAY) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY),actual.YACTUALPRODUCEVOLUME,null)),2),0) AS 'YACTUALPRODUCEVOLUME' -- 昨日实际已加工（吨）
         --              ,ROUND(if(plan.PLANPRODUCEVOLUME is null or plan.PLANPRODUCEVOLUME = 0,
 --                  1, actual.ACTUALPRODUCEVOLUME/plan.PLANPRODUCEVOLUME),2) COMPLETIONRATIO -- 本周实际已完成比例
@@ -1263,7 +1263,7 @@
                 PROCESSWORKSHOPID,
                 max(PROCESSWORKSHOP) PROCESSWORKSHOP,
             DATE(PLANENDDATE) PROCESSDAY,
-            count(if(YEAR(heat.PROCESSDAY) = YEAR(CURRENT_DATE) and WEEK(heat.PROCESSDAY) = WEEK(CURRENT_DATE), -- 本周
+            count(if(YEARWEEK(heat.PROCESSDAY,1)=YEARWEEK(CURRENT_DATE,1), -- 本周
             HEATNUMBER,null)) PLANPRODUCEVOLUME, -- 本周计划加工量=炉次的数量
             count(if(DATE(heat.PROCESSDAY) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY), -- 昨日
             HEATNUMBER,null)) YPLANPRODUCEVOLUME -- 昨日计划加工量=炉次的数量
@@ -1284,7 +1284,7 @@
             and app.PROCESSCATEGORY='30' -- 退火
             and apo.PROCESSSTATUS in ('30','40','50') -- 已发布
             and (apope.PLANPROCESSRALL-apope.CANCELROLL)>0 -- 计划加工卷数- 已取消卷数合计
-            and (YEAR(apope.PLANENDDATE) = YEAR(CURRENT_DATE) and WEEK(apope.PLANENDDATE) = WEEK(CURRENT_DATE) -- 本周
+            and (YEARWEEK(apope.PLANENDDATE,1)=YEARWEEK(CURRENT_DATE,1) -- 本周
             or DATE(apope.PLANENDDATE) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY)) -- 昨日
             and apo.TENANTID=#{tenantId}
             group by
@@ -1298,7 +1298,7 @@
             PROCESSWORKSHOPID,
             max(PROCESSWORKSHOP) PROCESSWORKSHOP,
             DATE(REPORTWORKTIME) PROCESSDAY,
-            count(if(YEAR(heat.PROCESSDAY) = YEAR(CURRENT_DATE) and WEEK(heat.PROCESSDAY) = WEEK(CURRENT_DATE), -- 本周
+            count(if(YEARWEEK(heat.PROCESSDAY,1)=YEARWEEK(CURRENT_DATE,1), -- 本周
             HEATNUMBER,null)) ACTUALPRODUCEVOLUME, -- 本周实际已加工（炉次）
             count(if(DATE(heat.PROCESSDAY) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY), -- 昨日
             HEATNUMBER,null)) YACTUALPRODUCEVOLUME -- 昨日实际已加工（炉次）
@@ -1318,7 +1318,7 @@
             apope.deleted='0' and apo.DELETED='0' and arr.deleted='0'
             and app.PROCESSCATEGORY='30' -- 退火
             and arr.REPORTWORKSTATUS='已报工'
-            and (YEAR(arr.REPORTWORKTIME) = YEAR(CURRENT_DATE) and WEEK(arr.REPORTWORKTIME) = WEEK(CURRENT_DATE) -- 本周
+            and (YEARWEEK(arr.REPORTWORKTIME,1)=YEARWEEK(CURRENT_DATE,1) -- 本周
             or DATE(arr.REPORTWORKTIME) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY)) -- 昨日
             and apo.TENANTID=#{tenantId}
             group by
@@ -1329,9 +1329,9 @@
         select
             plan.PROCESSWORKSHOPID
              ,plan.PROCESSWORKSHOP
-             ,IFNULL(ROUND(sum(if(YEAR(plan.PROCESSDAY) = YEAR(CURRENT_DATE) and WEEK(plan.PROCESSDAY) = WEEK(CURRENT_DATE),plan.PLANPRODUCEVOLUME,null)),2),0) AS 'WEEKPLANPRODUCEVOLUME' -- 本周计划加工（吨）
+             ,IFNULL(ROUND(sum(if(YEARWEEK(plan.PROCESSDAY,1)=YEARWEEK(CURRENT_DATE,1),plan.PLANPRODUCEVOLUME,null)),2),0) AS 'WEEKPLANPRODUCEVOLUME' -- 本周计划加工（吨）
              ,IFNULL(ROUND(sum(if(DATE(plan.PROCESSDAY) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY),plan.YPLANPRODUCEVOLUME,null)),2),0) AS 'YPLANPRODUCEVOLUME' -- 昨日计划加工（吨）
-             ,IFNULL(ROUND(sum(if(YEAR(actual.PROCESSDAY) = YEAR(CURRENT_DATE) and WEEK(actual.PROCESSDAY) = WEEK(CURRENT_DATE),actual.ACTUALPRODUCEVOLUME,null)),2),0) AS 'WEEKACTUALPRODUCEVOLUME' -- 本周实际已加工（吨）
+             ,IFNULL(ROUND(sum(if(YEARWEEK(actual.PROCESSDAY,1)=YEARWEEK(CURRENT_DATE,1),actual.ACTUALPRODUCEVOLUME,null)),2),0) AS 'WEEKACTUALPRODUCEVOLUME' -- 本周实际已加工（吨）
              ,IFNULL(ROUND(sum(if(DATE(actual.PROCESSDAY) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY),actual.YACTUALPRODUCEVOLUME,null)),2),0) AS 'YACTUALPRODUCEVOLUME' -- 昨日实际已加工（吨）
         --              ,ROUND(if(plan.PLANPRODUCEVOLUME is null or plan.PLANPRODUCEVOLUME = 0,
 --                  1, actual.ACTUALPRODUCEVOLUME/plan.PLANPRODUCEVOLUME),2) COMPLETIONRATIO -- 本周实际已完成比例
@@ -1342,9 +1342,9 @@
         select
             actual.PROCESSWORKSHOPID
              ,actual.PROCESSWORKSHOP
-             ,IFNULL(ROUND(sum(if(YEAR(plan.PROCESSDAY) = YEAR(CURRENT_DATE) and WEEK(plan.PROCESSDAY) = WEEK(CURRENT_DATE),plan.PLANPRODUCEVOLUME,null)),2),0) AS 'WEEKPLANPRODUCEVOLUME' -- 本周计划加工（吨）
+             ,IFNULL(ROUND(sum(if(YEARWEEK(plan.PROCESSDAY,1)=YEARWEEK(CURRENT_DATE,1),plan.PLANPRODUCEVOLUME,null)),2),0) AS 'WEEKPLANPRODUCEVOLUME' -- 本周计划加工（吨）
              ,IFNULL(ROUND(sum(if(DATE(plan.PROCESSDAY) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY),plan.YPLANPRODUCEVOLUME,null)),2),0) AS 'YPLANPRODUCEVOLUME' -- 昨日计划加工（吨）
-             ,IFNULL(ROUND(sum(if(YEAR(actual.PROCESSDAY) = YEAR(CURRENT_DATE) and WEEK(actual.PROCESSDAY) = WEEK(CURRENT_DATE),actual.ACTUALPRODUCEVOLUME,null)),2),0) AS 'WEEKACTUALPRODUCEVOLUME' -- 本周实际已加工（吨）
+             ,IFNULL(ROUND(sum(if(YEARWEEK(actual.PROCESSDAY,1)=YEARWEEK(CURRENT_DATE,1),actual.ACTUALPRODUCEVOLUME,null)),2),0) AS 'WEEKACTUALPRODUCEVOLUME' -- 本周实际已加工（吨）
              ,IFNULL(ROUND(sum(if(DATE(actual.PROCESSDAY) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY),actual.YACTUALPRODUCEVOLUME,null)),2),0) AS 'YACTUALPRODUCEVOLUME' -- 昨日实际已加工（吨）
         --              ,ROUND(if(plan.PLANPRODUCEVOLUME is null or plan.PLANPRODUCEVOLUME = 0,
 --                  1, actual.ACTUALPRODUCEVOLUME/plan.PLANPRODUCEVOLUME),2) COMPLETIONRATIO -- 本周实际已完成比例
@@ -1509,8 +1509,7 @@
                 and abo.PRODUCTSTATUS in ('30','40','50')
                 and (apope.PLANPROCESSRALL-apope.CANCELROLL)>0
                 and apoom.PLANPRODROLLNUM>0
-                and YEAR(apope.PLANENDDATE) = YEAR(CURRENT_DATE)
-          and WEEK(apope.PLANENDDATE) = WEEK(CURRENT_DATE)
+                and YEARWEEK(apope.PLANENDDATE,1)=YEARWEEK(CURRENT_DATE,1)
         GROUP BY apro.TENANTID
     </select>
     <select id="selectNowWeekActualProduceNum" resultType="com.rongwei.bsentity.domain.ApsReportYearAndMonth">
@@ -1534,8 +1533,7 @@
                 and arr.CHECKSTATUS='已检验'
                 and aro.QUALIFIED='是'
                 and apoom.PLANPRODROLLNUM>0
-                and YEAR(arr.REPORTWORKTIME) = YEAR(CURRENT_DATE)
-          and WEEK(arr.REPORTWORKTIME) = WEEK(CURRENT_DATE)
+                and YEARWEEK(arr.REPORTWORKTIME,1)=YEARWEEK(CURRENT_DATE,1)
         GROUP BY apro.TENANTID
     </select>
     <select id="selectPlanMap" resultType="java.util.Map">