aps-大屏中计划开工时间和计划完工时间需要更换，如果有原计划时间用原计划时间

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

@@ -379,7 +379,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 YEAR(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE)) = YEAR(CURRENT_DATE)
         GROUP BY apro.TENANTID
     </select>
     <select id="selectNowYearActualProduceNum" resultType="com.rongwei.bsentity.domain.ApsReportYearAndMonth">
@@ -454,8 +454,8 @@
         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 MONTH(apope.PLANENDDATE) = MONTH(CURRENT_DATE)
+        and YEAR(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE)) = YEAR(CURRENT_DATE)
+        and MONTH(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE)) = MONTH(CURRENT_DATE)
         GROUP BY apro.TENANTID
     </select>
     <select id="selectNowMonthActualProduceNum" resultType="com.rongwei.bsentity.domain.ApsReportYearAndMonth">
@@ -505,7 +505,7 @@
               and abo.PRODUCTSTATUS in ('30','40','50')
               and (apope.PLANPROCESSRALL-apope.CANCELROLL)>0
               and apoom.PLANPRODROLLNUM>0
-              and YEARWEEK(apope.PLANENDDATE) = YEARWEEK(CURRENT_DATE)
+              and YEARWEEK(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE)) = YEARWEEK(CURRENT_DATE)
               and apro.TENANTID=#{tenantId}
             group by
                 apope.PROCESSWORKSHOPID
@@ -572,7 +572,7 @@
         plan as (
         -- 近12个月计划完成订单量
         select
-        DATE_FORMAT(apope.PLANENDDATE, '%Y-%m') month_year,
+        DATE_FORMAT(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE), '%Y-%m') month_year,
         sum((apope.PLANPROCESSRALL-apope.CANCELROLL)*apoom.PLANPRODROLLNUM/apo.PLANPROCESSRALL*apoom.SINGLEROLLWEIGHT) PLANPRODUCEVOLUME -- 当月计划完成订单量
         from
         aps_process_operation_process_equ apope
@@ -589,7 +589,7 @@
         and abo.PRODUCTSTATUS in ('30','40','50')
         and (apope.PLANPROCESSRALL-apope.CANCELROLL)>0
         and apoom.PLANPRODROLLNUM>0
-        and apope.PLANENDDATE between DATE_FORMAT(DATE_SUB(CURRENT_DATE, INTERVAL 11 MONTH), '%Y-%m-01') and DATE_FORMAT(LAST_DAY(CURRENT_DATE()),'%Y-%m-%d 23:59:59') -- 近12个月计划
+        and IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE) between DATE_FORMAT(DATE_SUB(CURRENT_DATE, INTERVAL 11 MONTH), '%Y-%m-01') and DATE_FORMAT(LAST_DAY(CURRENT_DATE()),'%Y-%m-%d 23:59:59') -- 近12个月计划
         and apro.TENANTID=#{tenantId}
         group by
         month_year
@@ -639,7 +639,7 @@
         plan as (
         -- 近12个月计划完成订单量
         select
-        DATE_FORMAT(apope.PLANENDDATE, '%Y-%m') month_year,
+        DATE_FORMAT(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE), '%Y-%m') month_year,
         sum((apope.PLANPROCESSRALL-apope.CANCELROLL)*apoom.PLANPRODROLLNUM/apo.PLANPROCESSRALL*apoom.SINGLEROLLWEIGHT) PLANPRODUCEVOLUME -- 当月计划完成订单量
         from
         aps_process_operation_process_equ apope
@@ -656,7 +656,7 @@
         and abo.PRODUCTSTATUS in ('30','40','50')
         and (apope.PLANPROCESSRALL-apope.CANCELROLL)>0
         and apoom.PLANPRODROLLNUM>0
-        and apope.PLANENDDATE between DATE_FORMAT(DATE_SUB(CURRENT_DATE, INTERVAL 11 MONTH), '%Y-%m-01') and DATE_FORMAT(LAST_DAY(CURRENT_DATE()),'%Y-%m-%d 23:59:59') -- 近12个月计划
+        and IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE) between DATE_FORMAT(DATE_SUB(CURRENT_DATE, INTERVAL 11 MONTH), '%Y-%m-01') and DATE_FORMAT(LAST_DAY(CURRENT_DATE()),'%Y-%m-%d 23:59:59') -- 近12个月计划
         and apro.TENANTID=#{tenantId}
         group by
         month_year
@@ -705,11 +705,11 @@
             select
                 apo.TENANTID,
                 apope.PROCESSWORKSHOPID,
-            DATE(apope.PLANENDDATE) PROCESSDAY,
+            DATE(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE)) PROCESSDAY,
             max(apope.PROCESSWORKSHOP) PROCESSWORKSHOP,
-            sum(if(YEARWEEK(apope.PLANENDDATE,1)=YEARWEEK(CURRENT_DATE,1), -- 本周
+            sum(if(YEARWEEK(IFNULL(apope.OLDPLANENDDATE,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), -- 昨日
+            sum(if(DATE(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE)) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY), -- 昨日
            (apope.PLANPROCESSRALL-apope.CANCELROLL)*apo.SINGLEROLLWEIGHT,null)) YPLANPRODUCEVOLUME -- 昨日计划加工量
         from
             aps_process_operation_process_equ apope
@@ -720,8 +720,8 @@
           and app.PROCESSCATEGORY='10' -- 铸轧
           and apo.PROCESSSTATUS in ('30','40','50') -- 已发布
           and (apope.PLANPROCESSRALL-apope.CANCELROLL)>0 -- 计划加工卷数- 已取消卷数合计
-          and (YEARWEEK(apope.PLANENDDATE,1)=YEARWEEK(CURRENT_DATE,1) -- 本周
-           or DATE(apope.PLANENDDATE) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY)) -- 昨日
+          and (YEARWEEK(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE),1)=YEARWEEK(CURRENT_DATE,1) -- 本周
+           or DATE(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE)) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY)) -- 昨日
           and apo.TENANTID=#{tenantId}
         group by
             apope.PROCESSWORKSHOPID,PROCESSDAY
@@ -795,7 +795,7 @@
              plan as (
                  -- 近12个月铸轧计划加工量
                  select
-                     DATE_FORMAT(apope.PLANENDDATE, '%Y-%m') month_year,
+                     DATE_FORMAT(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE), '%Y-%m') month_year,
                      sum((apope.PLANPROCESSRALL-apope.CANCELROLL)*apo.SINGLEROLLWEIGHT) PLANPRODUCEVOLUME -- 当月计划加工量
                  from
                      aps_process_operation_process_equ apope
@@ -806,7 +806,7 @@
                    and app.PROCESSCATEGORY='10' -- 铸轧
                    and apo.PROCESSSTATUS in ('30','40','50') -- 已发布
                    and (apope.PLANPROCESSRALL-apope.CANCELROLL)>0 -- 计划加工卷数- 已取消卷数合计
-                   and apope.PLANENDDATE between DATE_FORMAT(DATE_SUB(CURRENT_DATE, INTERVAL 11 MONTH), '%Y-%m-01') and DATE_FORMAT(LAST_DAY(CURRENT_DATE()),'%Y-%m-%d 23:59:59') -- 近12个月计划
+                   and IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE) between DATE_FORMAT(DATE_SUB(CURRENT_DATE, INTERVAL 11 MONTH), '%Y-%m-01') and DATE_FORMAT(LAST_DAY(CURRENT_DATE()),'%Y-%m-%d 23:59:59') -- 近12个月计划
                    and apo.TENANTID=#{tenantId}
                  group by
                      month_year
@@ -847,7 +847,7 @@
              plan as (
                  -- 近12个月铸轧计划加工量
                  select
-                     DATE_FORMAT(apope.PLANENDDATE, '%Y-%m') month_year,
+                     DATE_FORMAT(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE), '%Y-%m') month_year,
                      sum((apope.PLANPROCESSRALL-apope.CANCELROLL)*apo.SINGLEROLLWEIGHT) PLANPRODUCEVOLUME -- 当月计划加工量
                  from
                      aps_process_operation_process_equ apope
@@ -858,7 +858,7 @@
                    and app.PROCESSCATEGORY='10' -- 铸轧
                    and apo.PROCESSSTATUS in ('30','40','50') -- 已发布
                    and (apope.PLANPROCESSRALL-apope.CANCELROLL)>0 -- 计划加工卷数- 已取消卷数合计
-                   and apope.PLANENDDATE between DATE_FORMAT(DATE_SUB(CURRENT_DATE, INTERVAL 11 MONTH), '%Y-%m-01') and DATE_FORMAT(LAST_DAY(CURRENT_DATE()),'%Y-%m-%d 23:59:59') -- 近12个月计划
+                   and IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE) between DATE_FORMAT(DATE_SUB(CURRENT_DATE, INTERVAL 11 MONTH), '%Y-%m-01') and DATE_FORMAT(LAST_DAY(CURRENT_DATE()),'%Y-%m-%d 23:59:59') -- 近12个月计划
                    and apo.TENANTID=#{tenantId}
                  group by
                      month_year
@@ -899,11 +899,11 @@
             select
                 apo.TENANTID,
                 apope.PROCESSWORKSHOPID,
-            DATE(apope.PLANENDDATE) PROCESSDAY,
+            DATE(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE)) PROCESSDAY,
             max(apope.PROCESSWORKSHOP) PROCESSWORKSHOP,
-            sum(if(YEARWEEK(apope.PLANENDDATE,1)=YEARWEEK(CURRENT_DATE,1), -- 本周
+            sum(if(YEARWEEK(IFNULL(apope.OLDPLANENDDATE,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), -- 昨日
+            sum(if(DATE(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE)) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY), -- 昨日
            (apope.PLANPROCESSRALL-apope.CANCELROLL)*apo.SINGLEROLLWEIGHT,null)) YPLANPRODUCEVOLUME -- 昨日计划加工量
         from
             aps_process_operation_process_equ apope
@@ -914,8 +914,8 @@
           and app.PROCESSCATEGORY='40' -- 精整
           and apo.PROCESSSTATUS in ('30','40','50') -- 已发布
           and (apope.PLANPROCESSRALL-apope.CANCELROLL)>0 -- 计划加工卷数- 已取消卷数合计
-          and (YEARWEEK(apope.PLANENDDATE,1)=YEARWEEK(CURRENT_DATE,1) -- 本周
-           or DATE(apope.PLANENDDATE) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY)) -- 昨日
+          and (YEARWEEK(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE),1)=YEARWEEK(CURRENT_DATE,1) -- 本周
+           or DATE(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE)) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY)) -- 昨日
           and apo.TENANTID=#{tenantId}
         group by
             apope.PROCESSWORKSHOPID,PROCESSDAY
@@ -990,7 +990,7 @@
              plan as (
                  -- 近12个月精整计划加工量
                  select
-                     DATE_FORMAT(apope.PLANENDDATE, '%Y-%m') month_year,
+                     DATE_FORMAT(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE), '%Y-%m') month_year,
                      sum((apope.PLANPROCESSRALL-apope.CANCELROLL)*apo.SINGLEROLLWEIGHT) PLANPRODUCEVOLUME -- 当月计划加工量
                  from
                      aps_process_operation_process_equ apope
@@ -1001,7 +1001,7 @@
                    and app.PROCESSCATEGORY='40' -- 精整
                    and apo.PROCESSSTATUS in ('30','40','50') -- 已发布
                    and (apope.PLANPROCESSRALL-apope.CANCELROLL)>0 -- 计划加工卷数- 已取消卷数合计
-                   and apope.PLANENDDATE between DATE_FORMAT(DATE_SUB(CURRENT_DATE, INTERVAL 11 MONTH), '%Y-%m-01') and DATE_FORMAT(LAST_DAY(CURRENT_DATE()),'%Y-%m-%d 23:59:59') -- 近12个月计划
+                   and IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE) between DATE_FORMAT(DATE_SUB(CURRENT_DATE, INTERVAL 11 MONTH), '%Y-%m-01') and DATE_FORMAT(LAST_DAY(CURRENT_DATE()),'%Y-%m-%d 23:59:59') -- 近12个月计划
                    and apo.TENANTID=#{tenantId}
                  group by
                      month_year
@@ -1042,7 +1042,7 @@
              plan as (
                  -- 近12个月精整计划加工量
                  select
-                     DATE_FORMAT(apope.PLANENDDATE, '%Y-%m') month_year,
+                     DATE_FORMAT(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE), '%Y-%m') month_year,
                      sum((apope.PLANPROCESSRALL-apope.CANCELROLL)*apo.SINGLEROLLWEIGHT) PLANPRODUCEVOLUME -- 当月计划加工量
                  from
                      aps_process_operation_process_equ apope
@@ -1053,7 +1053,7 @@
                    and app.PROCESSCATEGORY='40' -- 精整
                    and apo.PROCESSSTATUS in ('30','40','50') -- 已发布
                    and (apope.PLANPROCESSRALL-apope.CANCELROLL)>0 -- 计划加工卷数- 已取消卷数合计
-                   and apope.PLANENDDATE between DATE_FORMAT(DATE_SUB(CURRENT_DATE, INTERVAL 11 MONTH), '%Y-%m-01') and DATE_FORMAT(LAST_DAY(CURRENT_DATE()),'%Y-%m-%d 23:59:59') -- 近12个月计划
+                   and IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE) between DATE_FORMAT(DATE_SUB(CURRENT_DATE, INTERVAL 11 MONTH), '%Y-%m-01') and DATE_FORMAT(LAST_DAY(CURRENT_DATE()),'%Y-%m-%d 23:59:59') -- 近12个月计划
                    and apo.TENANTID=#{tenantId}
                  group by
                      month_year
@@ -1094,11 +1094,11 @@
             select
                 apo.TENANTID,
                 apope.PROCESSWORKSHOPID,
-            DATE(apope.PLANENDDATE) PROCESSDAY,
+            DATE(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE)) PROCESSDAY,
             max(apope.PROCESSWORKSHOP) PROCESSWORKSHOP,
-            sum(if(YEARWEEK(apope.PLANENDDATE,1)=YEARWEEK(CURRENT_DATE,1), -- 本周
+            sum(if(YEARWEEK(IFNULL(apope.OLDPLANENDDATE,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), -- 昨日
+            sum(if(DATE(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE)) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY), -- 昨日
             apope.PLANPROCESSRALL-apope.CANCELROLL,null)) YPLANPRODUCEVOLUME -- 昨日计划加工量
         from
             aps_process_operation_process_equ apope
@@ -1109,8 +1109,8 @@
           and app.PROCESSCATEGORY='20' -- 轧机
           and apo.PROCESSSTATUS in ('30','40','50') -- 已发布
           and (apope.PLANPROCESSRALL-apope.CANCELROLL)>0 -- 计划加工卷数- 已取消卷数合计
-          and (YEARWEEK(apope.PLANENDDATE,1)=YEARWEEK(CURRENT_DATE,1) -- 本周
-           or DATE(apope.PLANENDDATE) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY)) -- 昨日
+          and (YEARWEEK(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE),1)=YEARWEEK(CURRENT_DATE,1) -- 本周
+           or DATE(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE)) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY)) -- 昨日
           and apo.TENANTID=#{tenantId}
         group by
             apope.PROCESSWORKSHOPID,PROCESSDAY
@@ -1184,7 +1184,7 @@
              plan as (
                  -- 近12个月轧机计划加工量
                  select
-                     DATE_FORMAT(apope.PLANENDDATE, '%Y-%m') month_year,
+                     DATE_FORMAT(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE), '%Y-%m') month_year,
                      sum(apope.PLANPROCESSRALL-apope.CANCELROLL) PLANPRODUCEVOLUME -- 当月计划加工量
                  from
                      aps_process_operation_process_equ apope
@@ -1195,7 +1195,7 @@
                    and app.PROCESSCATEGORY='20' -- 轧机
                    and apo.PROCESSSTATUS in ('30','40','50') -- 已发布
                    and (apope.PLANPROCESSRALL-apope.CANCELROLL)>0 -- 计划加工卷数- 已取消卷数合计
-                   and apope.PLANENDDATE between DATE_FORMAT(DATE_SUB(CURRENT_DATE, INTERVAL 11 MONTH), '%Y-%m-01') and DATE_FORMAT(LAST_DAY(CURRENT_DATE()),'%Y-%m-%d 23:59:59') -- 近12个月计划
+                   and IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE) between DATE_FORMAT(DATE_SUB(CURRENT_DATE, INTERVAL 11 MONTH), '%Y-%m-01') and DATE_FORMAT(LAST_DAY(CURRENT_DATE()),'%Y-%m-%d 23:59:59') -- 近12个月计划
                    and apo.TENANTID=#{tenantId}
                  group by
                      month_year
@@ -1237,7 +1237,7 @@
              plan as (
                  -- 近12个月轧机计划加工量
                  select
-                     DATE_FORMAT(apope.PLANENDDATE, '%Y-%m') month_year,
+                     DATE_FORMAT(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE), '%Y-%m') month_year,
                      sum(apope.PLANPROCESSRALL-apope.CANCELROLL) PLANPRODUCEVOLUME -- 当月计划加工量
                  from
                      aps_process_operation_process_equ apope
@@ -1248,7 +1248,7 @@
                    and app.PROCESSCATEGORY='20' -- 轧机
                    and apo.PROCESSSTATUS in ('30','40','50') -- 已发布
                    and (apope.PLANPROCESSRALL-apope.CANCELROLL)>0 -- 计划加工卷数- 已取消卷数合计
-                   and apope.PLANENDDATE between DATE_FORMAT(DATE_SUB(CURRENT_DATE, INTERVAL 11 MONTH), '%Y-%m-01') and DATE_FORMAT(LAST_DAY(CURRENT_DATE()),'%Y-%m-%d 23:59:59') -- 近12个月计划
+                   and IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE) between DATE_FORMAT(DATE_SUB(CURRENT_DATE, INTERVAL 11 MONTH), '%Y-%m-01') and DATE_FORMAT(LAST_DAY(CURRENT_DATE()),'%Y-%m-%d 23:59:59') -- 近12个月计划
                    and apo.TENANTID=#{tenantId}
                  group by
                      month_year
@@ -1299,9 +1299,9 @@
             select
             max(apope.PROCESSWORKSHOPID) PROCESSWORKSHOPID,
             max(apope.PROCESSWORKSHOP) PROCESSWORKSHOP,
-            apope.PROCESSDEVICEID+apope.PLANSTARTDATE HEATNUMBER, -- 炉次(设备ID+计划开工时间)
-            max(apope.PLANENDDATE) PROCESSDAY,
-            apope.PLANENDDATE
+            apope.PROCESSDEVICEID+IFNULL(apope.OLDPLANSTARTDATE,apope.PLANSTARTDATE) HEATNUMBER, -- 炉次(设备ID+计划开工时间)
+            max(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE)) PROCESSDAY,
+            IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE) AS PLANENDDATE
             from
             aps_process_operation_process_equ apope
             join aps_process_operation apo on apo.ID = apope.PROCESSID
@@ -1311,8 +1311,8 @@
             and app.PROCESSCATEGORY='30' -- 退火
             and apo.PROCESSSTATUS in ('30','40','50') -- 已发布
             and (apope.PLANPROCESSRALL-apope.CANCELROLL)>0 -- 计划加工卷数- 已取消卷数合计
-            and (YEARWEEK(apope.PLANENDDATE,1)=YEARWEEK(CURRENT_DATE,1) -- 本周
-            or DATE(apope.PLANENDDATE) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY)) -- 昨日
+            and (YEARWEEK(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE),1)=YEARWEEK(CURRENT_DATE,1) -- 本周
+            or DATE(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE)) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY)) -- 昨日
             and apo.TENANTID=#{tenantId}
             group by
             HEATNUMBER -- 计划炉次
@@ -1394,8 +1394,8 @@
                  from (
                           -- 按照车间分组统计本月退火工序类别计划加工量
                           select
-                              apope.PROCESSDEVICEID+apope.PLANSTARTDATE HEATNUMBER, -- 炉次(设备ID+计划开工时间)
-                              max(apope.PLANENDDATE) PROCESSDAY
+                              apope.PROCESSDEVICEID+IFNULL(apope.OLDPLANSTARTDATE,apope.PLANSTARTDATE) HEATNUMBER, -- 炉次(设备ID+计划开工时间)
+                              max(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE)) PROCESSDAY
                           from
                               aps_process_operation_process_equ apope
                                   join aps_process_operation apo on apo.ID = apope.PROCESSID
@@ -1405,8 +1405,8 @@
                             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 MONTH(apope.PLANENDDATE) = MONTH(CURRENT_DATE) -- 本月
-                              or DATE(apope.PLANENDDATE) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY)) -- 昨日
+                            and (YEAR(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE)) = YEAR(CURRENT_DATE) and MONTH(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE)) = MONTH(CURRENT_DATE) -- 本月
+                              or DATE(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE)) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY)) -- 昨日
                             and apo.TENANTID=#{tenantId}
                           group by
                               HEATNUMBER -- 计划炉次
@@ -1462,8 +1462,8 @@
                  from (
                           -- 按照车间分组统计本月退火工序类别计划加工量
                           select
-                              apope.PROCESSDEVICEID+apope.PLANSTARTDATE HEATNUMBER, -- 炉次(设备ID+计划开工时间)
-                              max(apope.PLANENDDATE) PROCESSDAY
+                              apope.PROCESSDEVICEID+IFNULL(apope.OLDPLANSTARTDATE,apope.PLANSTARTDATE) HEATNUMBER, -- 炉次(设备ID+计划开工时间)
+                              max(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE)) PROCESSDAY
                           from
                               aps_process_operation_process_equ apope
                                   join aps_process_operation apo on apo.ID = apope.PROCESSID
@@ -1473,8 +1473,8 @@
                             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 MONTH(apope.PLANENDDATE) = MONTH(CURRENT_DATE) -- 本月
-                              or DATE(apope.PLANENDDATE) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY)) -- 昨日
+                            and (YEAR(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE)) = YEAR(CURRENT_DATE) and MONTH(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE)) = MONTH(CURRENT_DATE) -- 本月
+                              or DATE(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE)) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY)) -- 昨日
                             and apo.TENANTID=#{tenantId}
                           group by
                               HEATNUMBER -- 计划炉次
@@ -1536,7 +1536,7 @@
                 and abo.PRODUCTSTATUS in ('30','40','50')
                 and (apope.PLANPROCESSRALL-apope.CANCELROLL)>0
                 and apoom.PLANPRODROLLNUM>0
-                and YEARWEEK(apope.PLANENDDATE,1)=YEARWEEK(CURRENT_DATE,1)
+                and YEARWEEK(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE),1)=YEARWEEK(CURRENT_DATE,1)
         GROUP BY apro.TENANTID
     </select>
     <select id="selectNowWeekActualProduceNum" resultType="com.rongwei.bsentity.domain.ApsReportYearAndMonth">