From 6e1e8cc78179660eca4dbfbda0a473b1b2d8c47a Mon Sep 17 00:00:00 2001
From: zangzhipeng <lybluers@163.com>
Date: Thu, 4 Jun 2026 20:56:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E8=AE=A2=E5=8D=95=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E3=80=81=E5=A4=96?=
 =?UTF-8?q?=E5=8D=8F=E8=BD=AC=E5=8E=82=E5=86=85=E5=AE=A1=E6=89=B9=E8=BD=A6?=
 =?UTF-8?q?=E9=97=B4=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../springblade/desk/produce/mapper/WorkOrderRunMapper.xml   | 2 +-
 .../desk/produce/service/impl/WorkOrderRunServiceImpl.java   | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkOrderRunMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkOrderRunMapper.xml
index 0bdab46ca..ead16c52e 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkOrderRunMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkOrderRunMapper.xml
@@ -133,7 +133,7 @@
             AND mwor.run_type = #{query.runType}
         </if>
         <if test="query.orderCode != null and query.orderCode != ''">
-            AND mwor.wo_code LIKE CONCAT('%', CONCAT(#{query.orderCode}, '%'))
+            AND two.wo_code LIKE CONCAT('%', CONCAT(#{query.orderCode}, '%'))
         </if>
         <if test="query.partCode != null and query.partCode != ''">
             AND tyo.part_code LIKE CONCAT('%', CONCAT(#{query.partCode}, '%'))
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderRunServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderRunServiceImpl.java
index 5f4e5cfa5..99318e844 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderRunServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderRunServiceImpl.java
@@ -11,10 +11,8 @@ import net.sourceforge.barbecue.BarcodeFactory;
 import net.sourceforge.barbecue.BarcodeImageHandler;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.apache.ibatis.executor.BatchResult;
-import org.springblade.common.exception.BusinessException;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.core.mp.support.Condition;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.DateUtil;
@@ -25,7 +23,6 @@ import org.springblade.desk.basic.mapper.TeamSetMapper;
 import org.springblade.desk.basic.pojo.entity.Oem;
 import org.springblade.desk.basic.pojo.entity.OemCraftAbilityEntity;
 import org.springblade.desk.basic.pojo.entity.TeamSet;
-import org.springblade.desk.basic.pojo.entity.WorkCenter;
 import org.springblade.desk.dashboard.mapper.BsProcessSetMapper;
 import org.springblade.desk.dashboard.pojo.entity.BsProcessSetEntity;
 import org.springblade.desk.oem.pojo.request.*;
@@ -490,6 +487,8 @@ public class WorkOrderRunServiceImpl extends BaseServiceImpl<WorkOrderRunMapper,
                     int days = ProcessCycleEnum.BC_TYPE_CYCLE_HEAT.getValue();
                     Date date = DateUtil.plusDays(wo.getSendDownTime(), days);
                     wo.setPlanEndDate(DateUtil.format(date, DateUtil.PATTERN_DATETIME));
+                    // 车间订单状态修改为【未下达】
+                    wo.setRunStatus(WorkOrder.RUN_STATUS_NORMAL);
 
                     //更改订单调度员和计划员
 //                    TeamSet makeTeam = teamSetMapper.selectById(wo.getTsId());