排产日期不必填

src/main/java/com/xujie/sys/modules/erf/service/impl/ErfExpApplyServiceImpl.java

@@ -544,13 +544,13 @@ public class ErfExpApplyServiceImpl extends ServiceImpl<ErfExpApplyMapper, ErfEx
 
         // 记录操作日志
         saveApprovalLog(data.getApplyNo(), "已排产", "计划员排产",
-            "排产：工单号=" + data.getWorkOrderNo() + ", 排产日期=" + DateUtils.format(data.getScheduledDate(), "yyyy-MM-dd"),
+            "排产：工单号=" + data.getWorkOrderNo() + ", 排产日期=" +
+                    (data.getScheduledDate()!=null?DateUtils.format(data.getScheduledDate(), "yyyy-MM-dd"):""),
             data.getPlannerUserId(), data.getPlannerName());
 
         // ===== 关键修复：排产完成后自动流转到下一节点 =====
         // 更新当前节点状态为已完成
 
-        if (nodeInstance != null) {
         nodeInstance.setStatus("已完成");
         nodeInstance.setAssigneeUserId(data.getPlannerUserId());
         nodeInstance.setAssigneeName(data.getPlannerName());
@@ -587,7 +587,6 @@ public class ErfExpApplyServiceImpl extends ServiceImpl<ErfExpApplyMapper, ErfEx
         // 调用流程引擎自动流转到下一节点
         erfFlowEngineService.moveToNextNode(data.getApplyNo(), "计划员排产", null);
         log.info("排产完成，已自动流转到下一节点");
-        }
 
         log.info("计划员排产完成");
     }