作业延期提醒调整

bs-common/src/main/java/com/rongwei/safecommon/utils/SaveConstans.java

@@ -500,7 +500,7 @@ public class SaveConstans {
         /**
          * 作业延期提醒
          */
-        public static final String PROCESSDELAY_CONTENT = "订单【%s】有作业未按计划完工，请及时调整计划";
+        public static final String PROCESSDELAY_CONTENT = "订单【%s】有作业未按计划开工或完工，请及时调整计划";
         /**
          * 特种设备提醒内容前缀
          */

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/dao/ApsProductionOrderDao.java

@@ -52,7 +52,8 @@ public interface ApsProductionOrderDao extends BaseMapper<ApsProductionOrderDo>
             "\tselect distinct b.PRODUCTIONORDERID from aps_process_operation_process_equ e\n" +
             "\tleft join aps_process_operation p on p.DELETED='0' and p.ID=e.PROCESSID\n" +
             "\tleft join aps_blank_order b on b.DELETED='0' and b.ID=p.BLANKID\n" +
-            "\twhere e.DELETED='0' and (p.PROCESSSTATUS='30' or p.PROCESSSTATUS='40') and (e.WORKSTATUS='待开工' or e.WORKSTATUS='加工中') and TIMESTAMPDIFF(DAY,DATE_FORMAT(NOW(),'%Y-%m-%d'),DATE_FORMAT(e.PLANENDDATE,'%Y-%m-%d'))<0)")
+            "\twhere e.DELETED='0' and (((e.WORKSTATUS='待开工' or e.WORKSTATUS='加工中') and TIMESTAMPDIFF(DAY,DATE_FORMAT(NOW(),'%Y-%m-%d'),DATE_FORMAT(e.PLANENDDATE,'%Y-%m-%d'))<0) \n" +
+            "\t\tor (e.WORKSTATUS='待开工' and TIMESTAMPDIFF(DAY,DATE_FORMAT(NOW(),'%Y-%m-%d'),DATE_FORMAT(e.PLANSTARTDATE,'%Y-%m-%d'))<0)))")
     List<ApsProductionOrderDo> getProcessDelay();
 
     @Select("select po.ID,po.ORDERNO,po.CUSTOMNAME,po.ORDERDATE,b.ID as AUDITORID,o.OUTPUTNUMBER as AUDITOR,p.PROCESS as CUSTOMORDERNO,o.INSEPCTIONLEVEL as CUSTOMORDERTYPE,\n" +