From d9c27819282ae859dd9d69a59584bd8e106c9d54 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Wed, 11 Mar 2026 16:14:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E9=94=99=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erf/service/impl/ErfExpApplyServiceImpl.java     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfExpApplyServiceImpl.java b/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfExpApplyServiceImpl.java
index e1e9fe15..19835266 100644
--- a/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfExpApplyServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/erf/service/impl/ErfExpApplyServiceImpl.java
@@ -519,6 +519,10 @@ public class ErfExpApplyServiceImpl extends ServiceImpl<ErfExpApplyMapper, ErfEx
     public void plannerSchedule(ErfPlannerScheduleData data) {
         log.info("=== 计划员排产 === 试验单: {}, 工单号: {}, 排产日期: {}",
             data.getApplyNo(), data.getWorkOrderNo(), data.getScheduledDate());
+        ErfExpApply entity = this.getById(data.getApplyNo());
+        if (entity == null) {
+            throw new XJException("试验单"+data.getApplyNo()+"不存在");
+        }
         QueryWrapper<ErfFlowNodeInstance> nodeQuery = new QueryWrapper<>();
         nodeQuery.eq("apply_no", data.getApplyNo())
                 .eq("node_code", "计划员排产")
@@ -538,15 +542,11 @@ public class ErfExpApplyServiceImpl extends ServiceImpl<ErfExpApplyMapper, ErfEx
                 ErfFlowNodeInstance otherNode = erfFlowNodeInstanceMapper.selectOne(otherNodeQuery);
                 if (otherNode != null) {
                     String otherPlannerName = otherNode.getAssigneeName();
-                    throw new XJException("排产失败，已被计划员 " + otherPlannerName + " 处理");
+                    throw new XJException("已被计划员 " + otherPlannerName + " 处理");
                 } else {
-                    throw new XJException("排产失败，当前用户没有权限或已被其他人处理");
+                    throw new XJException("当前用户没有权限或已被其他人处理");
                 }
         }
-        ErfExpApply entity = this.getById(data.getApplyNo());
-        if (entity == null) {
-            throw new XJException("试验单不存在");
-        }
 
         // 更新工单号、排产日期和计划员信息（updateTime由MyBatis-Plus自动填充）
         entity.setWorkOrderNo(data.getWorkOrderNo());