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

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

@@ -553,7 +553,10 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
                     throw new RuntimeException("执行流程失败，请刷新页面后重试");
                 }
             }
-        } finally {
+        }catch (Exception e){
+            log.error("异常信息：",e);
+        }
+        finally {
             log.debug("校验-订单提交完毕，从map中清空当前订单锁，订单ID:{}", id);
             productOrderLock.remove(id);
         }

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

@@ -1289,7 +1289,7 @@
             select
                 PROCESSWORKSHOPID,
                 max(PROCESSWORKSHOP) PROCESSWORKSHOP,
-            DATE(PLANENDDATE) PROCESSDAY,
+            DATE(PLANSTARTDATE) PROCESSDAY,
             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), -- 昨日
@@ -1299,9 +1299,9 @@
             select
             max(apope.PROCESSWORKSHOPID) PROCESSWORKSHOPID,
             max(apope.PROCESSWORKSHOP) PROCESSWORKSHOP,
-            apope.PROCESSDEVICEID+apope.PLANSTARTDATE HEATNUMBER, -- 炉次(设备ID+计划开工时间)
-            max(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE)) PROCESSDAY,
-            IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE) AS PLANENDDATE
+            concat(apope.PROCESSDEVICEID,apope.PLANSTARTDATE) HEATNUMBER, -- 炉次(设备ID+计划开工时间)
+            max(apope.PLANSTARTDATE) PROCESSDAY,
+            apope.PLANSTARTDATE
             from
             aps_process_operation_process_equ apope
             join aps_process_operation apo on apo.ID = apope.PROCESSID
@@ -1311,11 +1311,11 @@
             and app.PROCESSCATEGORY='30' -- 退火
             and apo.PROCESSSTATUS in ('30','40','50') -- 已发布
             and (apope.PLANPROCESSRALL-apope.CANCELROLL)>0 -- 计划加工卷数- 已取消卷数合计
-            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 (YEARWEEK(apope.PLANSTARTDATE,1)=YEARWEEK(CURRENT_DATE,1) -- 本周
+            or DATE(apope.PLANSTARTDATE) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY)) -- 昨日
             and apo.TENANTID=#{tenantId}
             group by
-                apope.PROCESSDEVICEID+apope.PLANSTARTDATE -- 计划炉次
+                concat(apope.PROCESSDEVICEID,apope.PLANSTARTDATE) -- 计划炉次
             ) heat
         group by PROCESSWORKSHOPID
             ),
@@ -1324,18 +1324,18 @@
         select
             PROCESSWORKSHOPID,
             max(PROCESSWORKSHOP) PROCESSWORKSHOP,
-            DATE(REPORTWORKTIME) PROCESSDAY,
+            DATE(STARTWORKTIME) PROCESSDAY,
             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 -- 昨日实际已加工（炉次）
         from(
             select
-            apope.PROCESSDEVICEID+apope.PLANSTARTDATE HEATNUMBER, -- 炉次
-            max(DATE(arr.REPORTWORKTIME)) PROCESSDAY,
+            concat(apope.PROCESSDEVICEID,arr.STARTWORKTIME,arr.HEATNUMBER) HEATNUMBER, -- 炉次
+            max(DATE(arr.STARTWORKTIME)) PROCESSDAY,
             max(apope.PROCESSWORKSHOPID) PROCESSWORKSHOPID,
             max(apope.PROCESSWORKSHOP) PROCESSWORKSHOP,
-            arr.REPORTWORKTIME
+            arr.STARTWORKTIME
             from
             aps_report_records arr
             join aps_process_operation_process_equ apope  on apope.id=arr.PROCESSEQUID
@@ -1345,11 +1345,11 @@
             apope.deleted='0' and apo.DELETED='0' and arr.deleted='0'
             and app.PROCESSCATEGORY='30' -- 退火
             and arr.REPORTWORKSTATUS='已报工'
-            and (YEARWEEK(arr.REPORTWORKTIME,1)=YEARWEEK(CURRENT_DATE,1) -- 本周
-            or DATE(arr.REPORTWORKTIME) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY)) -- 昨日
+            and (YEARWEEK(arr.STARTWORKTIME,1)=YEARWEEK(CURRENT_DATE,1) -- 本周
+            or DATE(arr.STARTWORKTIME) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY)) -- 昨日
             and apo.TENANTID=#{tenantId}
             group by
-            apope.PROCESSDEVICEID,apope.PROCESSDEVICEID+apope.PLANSTARTDATE
+            apope.PROCESSDEVICEID,concat(apope.PROCESSDEVICEID,arr.STARTWORKTIME,arr.HEATNUMBER)
             ) heat
         group by PROCESSWORKSHOPID
             )
@@ -1394,8 +1394,8 @@
                  from (
                           -- 按照车间分组统计本月退火工序类别计划加工量
                           select
-                              apope.PROCESSDEVICEID+apope.PLANSTARTDATE HEATNUMBER, -- 炉次(设备ID+计划开工时间)
-                              max(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE)) PROCESSDAY
+                              concat(apope.PROCESSDEVICEID,apope.PLANSTARTDATE) HEATNUMBER, -- 炉次(设备ID+计划开工时间)
+                              max(apope.PLANSTARTDATE) PROCESSDAY
                           from
                               aps_process_operation_process_equ apope
                                   join aps_process_operation apo on apo.ID = apope.PROCESSID
@@ -1405,11 +1405,11 @@
                             and app.PROCESSCATEGORY='30' -- 退火
                             and apo.PROCESSSTATUS in ('30','40','50') -- 已发布
                             and (apope.PLANPROCESSRALL-apope.CANCELROLL)>0 -- 计划加工卷数- 已取消卷数合计
-                            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 (YEAR(apope.PLANSTARTDATE) = YEAR(CURRENT_DATE) and MONTH(apope.PLANSTARTDATE) = MONTH(CURRENT_DATE) -- 本月
+                              or DATE(apope.PLANSTARTDATE) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY)) -- 昨日
                             and apo.TENANTID=#{tenantId}
                           group by
-                              apope.PROCESSDEVICEID+apope.PLANSTARTDATE -- 计划炉次
+                              concat(apope.PROCESSDEVICEID,apope.PLANSTARTDATE) -- 计划炉次
                       ) heat
                  group by month_year
              ),
@@ -1421,8 +1421,8 @@
                  from(
                          -- 按照车间分组统计本月退火工序类别实际加工量
                          select
-                             apope.PROCESSDEVICEID+apope.PLANSTARTDATE HEATNUMBER, -- 炉次
-                             max(DATE(arr.REPORTWORKTIME)) PROCESSDAY
+                             concat(apope.PROCESSDEVICEID,arr.STARTWORKTIME,arr.HEATNUMBER) HEATNUMBER, -- 炉次
+                             max(DATE(arr.STARTWORKTIME)) PROCESSDAY
                          from
                              aps_report_records arr
                                  join aps_process_operation_process_equ apope  on apope.id=arr.PROCESSEQUID
@@ -1434,7 +1434,7 @@
                            and arr.REPORTWORKSTATUS='已报工'
                            and apo.TENANTID=#{tenantId}
                          group by
-                             apope.PROCESSDEVICEID,apope.PROCESSDEVICEID+apope.PLANSTARTDATE
+                             apope.PROCESSDEVICEID,concat(apope.PROCESSDEVICEID,arr.STARTWORKTIME,arr.HEATNUMBER)
                      ) heat
                  group by month_year
              )
@@ -1462,8 +1462,8 @@
                  from (
                           -- 按照车间分组统计本月退火工序类别计划加工量
                           select
-                              apope.PROCESSDEVICEID+apope.PLANSTARTDATE HEATNUMBER, -- 炉次(设备ID+计划开工时间)
-                              max(IFNULL(apope.OLDPLANENDDATE,apope.PLANENDDATE)) PROCESSDAY
+                              concat(apope.PROCESSDEVICEID,apope.PLANSTARTDATE) HEATNUMBER, -- 炉次(设备ID+计划开工时间)
+                              max(apope.PLANSTARTDATE) PROCESSDAY
                           from
                               aps_process_operation_process_equ apope
                                   join aps_process_operation apo on apo.ID = apope.PROCESSID
@@ -1473,11 +1473,11 @@
                             and app.PROCESSCATEGORY='30' -- 退火
                             and apo.PROCESSSTATUS in ('30','40','50') -- 已发布
                             and (apope.PLANPROCESSRALL-apope.CANCELROLL)>0 -- 计划加工卷数- 已取消卷数合计
-                            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 (YEAR(apope.PLANSTARTDATE) = YEAR(CURRENT_DATE) and MONTH(apope.PLANSTARTDATE) = MONTH(CURRENT_DATE) -- 本月
+                              or DATE(apope.PLANSTARTDATE) = DATE_SUB(CURRENT_DATE, INTERVAL 1 DAY)) -- 昨日
                             and apo.TENANTID=#{tenantId}
                           group by
-                              apope.PROCESSDEVICEID+apope.PLANSTARTDATE -- 计划炉次
+                              concat(apope.PROCESSDEVICEID,apope.PLANSTARTDATE) -- 计划炉次
                       ) heat
                  group by month_year
              ),
@@ -1489,8 +1489,8 @@
                  from(
                          -- 按照车间分组统计本月退火工序类别实际加工量
                          select
-                             apope.PROCESSDEVICEID+apope.PLANSTARTDATE HEATNUMBER, -- 炉次
-                             max(DATE(arr.REPORTWORKTIME)) PROCESSDAY
+                             concat(apope.PROCESSDEVICEID,arr.STARTWORKTIME,arr.HEATNUMBER) HEATNUMBER, -- 炉次
+                             max(DATE(arr.STARTWORKTIME)) PROCESSDAY
                          from
                              aps_report_records arr
                                  join aps_process_operation_process_equ apope  on apope.id=arr.PROCESSEQUID
@@ -1502,7 +1502,7 @@
                            and arr.REPORTWORKSTATUS='已报工'
                            and apo.TENANTID=#{tenantId}
                          group by
-                             apope.PROCESSDEVICEID,apope.PROCESSDEVICEID+apope.PLANSTARTDATE
+                             apope.PROCESSDEVICEID,concat(apope.PROCESSDEVICEID,arr.STARTWORKTIME,arr.HEATNUMBER)
                      ) heat
                  group by month_year
              )