aps-退火大屏修改炉号逻辑

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

@@ -1299,7 +1299,7 @@
             select
             max(apope.PROCESSWORKSHOPID) PROCESSWORKSHOPID,
             max(apope.PROCESSWORKSHOP) PROCESSWORKSHOP,
-            apope.PROCESSDEVICEID+IFNULL(apope.OLDPLANSTARTDATE,apope.PLANSTARTDATE) HEATNUMBER, -- 炉次(设备ID+计划开工时间)
+            apope.PROCESSDEVICEID+apope.PLANSTARTDATE HEATNUMBER, -- 炉次(设备ID+计划开工时间)
             max(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE)) PROCESSDAY,
             IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE) AS PLANENDDATE
             from
@@ -1315,7 +1315,7 @@
             or DATE(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE)) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY)) -- 昨日
             and apo.TENANTID=#{tenantId}
             group by
-            HEATNUMBER -- 计划炉次
+                apope.PROCESSDEVICEID+apope.PLANSTARTDATE -- 计划炉次
             ) heat
         group by PROCESSWORKSHOPID
             ),
@@ -1331,7 +1331,7 @@
             HEATNUMBER,null)) YACTUALPRODUCEVOLUME -- 昨日实际已加工（炉次）
         from(
             select
-            apope.PROCESSDEVICEID+arr.HEATNUMBER HEATNUMBER, -- 炉次
+            apope.PROCESSDEVICEID+apope.PLANSTARTDATE HEATNUMBER, -- 炉次
             max(DATE(arr.REPORTWORKTIME)) PROCESSDAY,
             max(apope.PROCESSWORKSHOPID) PROCESSWORKSHOPID,
             max(apope.PROCESSWORKSHOP) PROCESSWORKSHOP,
@@ -1349,7 +1349,7 @@
             or DATE(arr.REPORTWORKTIME) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY)) -- 昨日
             and apo.TENANTID=#{tenantId}
             group by
-            apope.PROCESSDEVICEID,arr.HEATNUMBER
+            apope.PROCESSDEVICEID,apope.PROCESSDEVICEID+apope.PLANSTARTDATE
             ) heat
         group by PROCESSWORKSHOPID
             )
@@ -1394,7 +1394,7 @@
                  from (
                           -- 按照车间分组统计本月退火工序类别计划加工量
                           select
-                              apope.PROCESSDEVICEID+IFNULL(apope.OLDPLANSTARTDATE,apope.PLANSTARTDATE) HEATNUMBER, -- 炉次(设备ID+计划开工时间)
+                              apope.PROCESSDEVICEID+apope.PLANSTARTDATE HEATNUMBER, -- 炉次(设备ID+计划开工时间)
                               max(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE)) PROCESSDAY
                           from
                               aps_process_operation_process_equ apope
@@ -1409,7 +1409,7 @@
                               or DATE(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE)) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY)) -- 昨日
                             and apo.TENANTID=#{tenantId}
                           group by
-                              HEATNUMBER -- 计划炉次
+                              apope.PROCESSDEVICEID+apope.PLANSTARTDATE -- 计划炉次
                       ) heat
                  group by month_year
              ),
@@ -1421,7 +1421,7 @@
                  from(
                          -- 按照车间分组统计本月退火工序类别实际加工量
                          select
-                             apope.PROCESSDEVICEID+arr.HEATNUMBER HEATNUMBER, -- 炉次
+                             apope.PROCESSDEVICEID+apope.PLANSTARTDATE HEATNUMBER, -- 炉次
                              max(DATE(arr.REPORTWORKTIME)) PROCESSDAY
                          from
                              aps_report_records arr
@@ -1434,7 +1434,7 @@
                            and arr.REPORTWORKSTATUS='已报工'
                            and apo.TENANTID=#{tenantId}
                          group by
-                             apope.PROCESSDEVICEID,arr.HEATNUMBER
+                             apope.PROCESSDEVICEID,apope.PROCESSDEVICEID+apope.PLANSTARTDATE
                      ) heat
                  group by month_year
              )
@@ -1462,7 +1462,7 @@
                  from (
                           -- 按照车间分组统计本月退火工序类别计划加工量
                           select
-                              apope.PROCESSDEVICEID+IFNULL(apope.OLDPLANSTARTDATE,apope.PLANSTARTDATE) HEATNUMBER, -- 炉次(设备ID+计划开工时间)
+                              apope.PROCESSDEVICEID+apope.PLANSTARTDATE HEATNUMBER, -- 炉次(设备ID+计划开工时间)
                               max(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE)) PROCESSDAY
                           from
                               aps_process_operation_process_equ apope
@@ -1477,7 +1477,7 @@
                               or DATE(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE)) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY)) -- 昨日
                             and apo.TENANTID=#{tenantId}
                           group by
-                              HEATNUMBER -- 计划炉次
+                              apope.PROCESSDEVICEID+apope.PLANSTARTDATE -- 计划炉次
                       ) heat
                  group by month_year
              ),
@@ -1489,7 +1489,7 @@
                  from(
                          -- 按照车间分组统计本月退火工序类别实际加工量
                          select
-                             apope.PROCESSDEVICEID+arr.HEATNUMBER HEATNUMBER, -- 炉次
+                             apope.PROCESSDEVICEID+apope.PLANSTARTDATE HEATNUMBER, -- 炉次
                              max(DATE(arr.REPORTWORKTIME)) PROCESSDAY
                          from
                              aps_report_records arr
@@ -1502,7 +1502,7 @@
                            and arr.REPORTWORKSTATUS='已报工'
                            and apo.TENANTID=#{tenantId}
                          group by
-                             apope.PROCESSDEVICEID,arr.HEATNUMBER
+                             apope.PROCESSDEVICEID,apope.PROCESSDEVICEID+apope.PLANSTARTDATE
                      ) heat
                  group by month_year
              )