aps-冲突bug修复

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

@@ -759,16 +759,18 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
         //查询坯料计划信息
         ApsBlankOrderDo apsBlankOrderDo = apsBlankOrderService.getById(apsProcessOperationProcessEquDo.getBlankid());
         //如果作业明细计划完工时间超出订单期望交货期，记录警告：完工时间超出订单交货期
-        //警告
         String newSoftconflictdes = apsProcessOperationProcessEquDo.getSoftconflictdes();
-        if (apsProcessOperationProcessEquDo.getPlanenddate().compareTo(apsBlankOrderDo.getDeliverydate()) > 0) {
-            apsConflictLogService.recordLog(apsProcessOperationProcessEquDo.getId(),
-                    "作业明细计划完工时间:" + apsProcessOperationProcessEquDo.getPlanenddate() + ",坯料计划期望交货期：" + apsBlankOrderDo.getDeliverydate(), PLAN_END_DATE_AFTER_DELIVERY_DATE, 1, null);
-            newSoftconflictdes = addNewConflictsDesc(newSoftconflictdes, PLAN_END_DATE_AFTER_DELIVERY_DATE);
-        } else {
-            apsConflictLogService.recordLog(apsProcessOperationProcessEquDo.getId(),
-                    "作业明细计划完工时间:" + apsProcessOperationProcessEquDo.getPlanenddate() + ",坯料计划期望交货期：" + apsBlankOrderDo.getDeliverydate(), PLAN_END_DATE_AFTER_DELIVERY_DATE, 2, null);
-            newSoftconflictdes = removeConflictsDesc(newSoftconflictdes, PLAN_END_DATE_AFTER_DELIVERY_DATE);
+        //警告
+        if (ObjectUtil.isNotEmpty(apsBlankOrderDo.getDeliverydate())) {
+            if (apsProcessOperationProcessEquDo.getPlanenddate().compareTo(apsBlankOrderDo.getDeliverydate()) > 0) {
+                apsConflictLogService.recordLog(apsProcessOperationProcessEquDo.getId(),
+                        "作业明细计划完工时间:" + apsProcessOperationProcessEquDo.getPlanenddate() + ",坯料计划期望交货期：" + apsBlankOrderDo.getDeliverydate(), PLAN_END_DATE_AFTER_DELIVERY_DATE, 1, null);
+                newSoftconflictdes = addNewConflictsDesc(newSoftconflictdes, PLAN_END_DATE_AFTER_DELIVERY_DATE);
+            } else {
+                apsConflictLogService.recordLog(apsProcessOperationProcessEquDo.getId(),
+                        "作业明细计划完工时间:" + apsProcessOperationProcessEquDo.getPlanenddate() + ",坯料计划期望交货期：" + apsBlankOrderDo.getDeliverydate(), PLAN_END_DATE_AFTER_DELIVERY_DATE, 2, null);
+                newSoftconflictdes = removeConflictsDesc(newSoftconflictdes, PLAN_END_DATE_AFTER_DELIVERY_DATE);
+            }
         }
         //如果该作业不是铸轧，并且作业明细计划完工时间-该坯料计划非铸轧作业明细的最早计划开工时间>坯料计划冷轧交货天数，记录警告：不满足冷轧交货天数
         if (!apsProcessOperationDo.getProcess().equals("铸轧")) {