From ec52b28c22e53b1a2068c5d351da2d9fa482e6ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= <a15234804788@163.com>
Date: Mon, 15 Jun 2026 17:47:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E8=AE=A2=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desk/oem/pojo/request/OemOrderQuery.java  | 10 ++--
 .../desk/oem/pojo/vo/OemOrderVO.java          |  3 ++
 .../produce/mapper/WorkOrderRunMapper.xml     | 48 ++++++++++---------
 3 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/request/OemOrderQuery.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/request/OemOrderQuery.java
index 85fe5fcb6..5e26a298d 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/request/OemOrderQuery.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/request/OemOrderQuery.java
@@ -15,17 +15,17 @@ public class OemOrderQuery {
     /**
      * 订单状态
      */
-    @Schema(description = "订单状态集合，传1,2,3")
-    private String orderStatus;
+//    @Schema(description = "订单状态集合，传1,2,3")
+//    private String orderStatus;
     /**
      * 外协状态
      */
-    @Schema(description = "外协状态集合，传1,2,3(外协状态(1-待外协、2-外协中、3-已完成))")
-    private String oemStatusList;
+    @Schema(description = "外协状态(1-外协中、2-外协完工、3-订单完工、4-已交接)")
+    private String oemStatus;
     /**
      * 订单单号
      */
-    @Schema(description = "订单单号")
+    @Schema(description = "车间订单号")
     private String orderCode;
     /**
      * 零件号
diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/vo/OemOrderVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/vo/OemOrderVO.java
index 907e92ced..fdbca2924 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/vo/OemOrderVO.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/vo/OemOrderVO.java
@@ -111,4 +111,7 @@ public class OemOrderVO extends WorkOrderRun {
 
     @Schema(description = "审批状态;1:正常，2:审批中，3:不通过，4:通过")
     private Integer approvalStatus;
+
+    @Schema(description = "外协状态")
+    private String oemStatusTitle;
 }
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 ead16c52e..634adf57f 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
@@ -20,6 +20,7 @@
         <result column="approval_time" property="approvalTime"/>
         <result column="batch_reason" property="batchReason"/>
         <result column="oem_status" property="oemStatus"/>
+        <result column="oem_status_title" property="oemStatusTitle"/>
 
         <!-- OemOrderVO自身字段 -->
         <result column="memo" property="memo"/>
@@ -103,12 +104,18 @@
         -- planner_user.real_name as planner_name,
         -- 调度员名称
         tyo.plan_user as planner_name,
-        dispatcher_user.real_name as dispatcher_name
+        dispatcher_user.real_name as dispatcher_name,
+        case
+        when two.run_status = 17 then '已交接'
+        when two.run_status = 15 then '订单完工'
+        when mwor.oem_status = 3 then '外协完工'
+        when mwor.oem_status = 2 then '外协中'
+        else '未知' end AS oem_status_title
         FROM MES_WORK_ORDER_RUN mwor
         -- 关联车间订单表
-        LEFT JOIN MES_WORK_ORDER two ON mwor.wo_id = two.id
+        INNER JOIN MES_WORK_ORDER two ON mwor.wo_id = two.id
         -- 关联生产订单表
-        LEFT JOIN MES_YIELD_ORDER tyo ON two.yo_id = tyo.id
+        INNER JOIN MES_YIELD_ORDER tyo ON two.yo_id = tyo.id
         -- 关联转出班组（只取名称）
         LEFT JOIN BS_TEAM_SET out_team ON mwor.out_team = out_team.id
         -- 关联转入班组（只取名称）
@@ -119,7 +126,7 @@
         -- LEFT JOIN blade_user planner_user ON two.planner = planner_user.id
         -- 关联调度员
         LEFT JOIN blade_user dispatcher_user ON two.dispatcher = dispatcher_user.id
-        --关联外协厂商
+        -- 关联外协厂商
         LEFT JOIN BS_OEM oem ON mwor.in_customer = oem.id
 
         where
@@ -189,25 +196,22 @@
         <if test="query.demandDateEnd != null">
             AND two.demand_date &lt; #{query.demandDateEnd}+ 1
         </if>
-        <if test="query.oemStatusList != null and query.oemStatusList != ''">
-            AND mwor.oem_status IN
-            <foreach collection="query.oemStatusList.split(',')" item="status"
-                     open="(" separator="," close=")" index="index">
-                #{status}
-            </foreach>
+        <if test="query.oemStatus != null and query.oemStatus != ''">
+            <choose>
+                <when test='query.oemStatus == "1"'>
+                    AND mwor.oem_status = 2
+                </when>
+                <when test='query.oemStatus == "2"'>
+                    AND mwor.oem_status = 3
+                </when>
+                <when test='query.oemStatus == "3"'>
+                    AND two.run_status = 15
+                </when>
+                <otherwise>
+                    AND two.run_status = 17
+                </otherwise>
+            </choose>
         </if>
-        <choose>
-            <when test='query.orderStatus != null and query.orderStatus != ""'>
-                AND two.run_status IN
-                <foreach collection="query.orderStatus.split(',')" item="status"
-                         open="(" separator="," close=")" index="index">
-                    #{status}
-                </foreach>
-            </when>
-            <otherwise>
-                AND two.run_status &lt; 15
-            </otherwise>
-        </choose>
         ORDER BY mwor.create_time DESC
     </select>