aps-调度挪动数据sql调整

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

@@ -848,6 +848,9 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
             Integer splitProcessRoll = newProcessEqu.getPlanprocessrall();
             //后道作业明细剩余待开工卷数
             Integer leavewaitworkroll = nextProcessEqu.getLeavewaitworkroll();
+            if (splitProcessRoll == leavewaitworkroll) {
+                return;
+            }
             //待拆分卷数
             int nextWaitSplitRoll = 0;
             if (splitProcessRoll > leavewaitworkroll) {

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

@@ -353,7 +353,7 @@
             if(apope.PROCESSWORKSHOPID!=preapope.PROCESSWORKSHOPID,#{workshopcross}, -- 车间流转时间
             if(apope.PROCESSDEVICEID!=preapope.PROCESSDEVICEID,#{workshopin},0))) MINUTE -- 机台流转时间
             ) < #{chongpaiEndDate} -- 调度结束时间
-        ) -- 计划调度结束时间之后开工
+        )) -- 计划调度结束时间之后开工
           AND (apope.PLANENDDATE!=date_add(apope.PLANENDDATE,
                                            INTERVAL TIMESTAMPdiff(SECOND,
                                                                   apope.PLANSTARTDATE,