aps-调度排程挪动数据sql修改

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

@@ -429,9 +429,14 @@
         </if>
         and apope.WORKSTATUS = '待开工'
         and ifnull(apope.PREVIOUSPROCESSESIDS,'')='' -- 没有前道
-        and (abo.PLANHAVEMATERIALDATE &lt; #{chongpaiEndDate} OR abo.PLANHAVEMATERIALDATE is null)-- 预计来料时间在调度结束时间之前
-        and apope.PLANSTARTDATE between #{chongpaiStartDate} and DATE_ADD(#{chongpaiStartDate}, INTERVAL 5 DAY) -- 调度开始时间+5天内计划开工
-    </update>
+        -- 没有预计来料时间并且计划开工时间小于调度开始时间+5天，或者预计来料时间在调度结束时间之前
+        and (
+            (abo.PLANHAVEMATERIALDATE is null
+                 and apope.PLANSTARTDATE between #{chongpaiStartDate} and DATE_ADD(#{chongpaiStartDate}, INTERVAL 5 DAY)
+                )
+            or abo.PLANHAVEMATERIALDATE &lt; #{chongpaiEndDate}
+            )
+        </update>
     <update id="updateProcessOutputBatchById">
         <foreach collection="list" item="item">
             update aps_process_output_product set OUTPUTPROCESSDES = #{item.outputprocessdes} where ID = #{item.id};