From c053d1eff1a77a463c7b534596b68724b3a9cdef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= <a15234804788@163.com>
Date: Fri, 15 May 2026 09:31:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desk/produce/pojo/vo/WorkOrderVO.java          | 14 +++++++-------
 .../produce/service/impl/WorkOrderServiceImpl.java | 12 +++++++++---
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/WorkOrderVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/WorkOrderVO.java
index d28969232..a1e6d3e24 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/WorkOrderVO.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/WorkOrderVO.java
@@ -80,25 +80,25 @@ public class WorkOrderVO extends WorkOrder {
 	private String dispatcherName;
 
 	@Schema(description = "未入库数量")
-	private Integer notInQty;
+	private Double notInQty;
 
 	@Schema(description = "下序id")
-	private Integer ppsIdNext;
+	private Long ppsIdNext;
 
 	@Schema(description = "下序名称")
-	private Integer ppsNameNext;
+	private String ppsNameNext;
 
 	@Schema(description = "下一班组id")
-	private Integer makeTeamNext;
+	private Long makeTeamNext;
 
 	@Schema(description = "下一班组")
-	private Integer makeTeamNextName;
+	private String makeTeamNextName;
 
 	@Schema(description = "接收人员id")
-	private Integer receiveUser;
+	private Long receiveUser;
 
 	@Schema(description = "接收人员")
-	private Integer receiveUserNamr;
+	private String receiveUserName;
 
 	@Schema(description = "状态")
 	private String runStatusName;
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java
index 17c0c718b..aaaf8cb4b 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java
@@ -25,6 +25,7 @@ import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.desk.basic.constant.FlowConst;
 import org.springblade.desk.basic.pojo.entity.BsAssignEntity;
+import org.springblade.desk.basic.pojo.entity.CenterTeam;
 import org.springblade.desk.basic.pojo.entity.OemCraftAbilityEntity;
 import org.springblade.desk.basic.pojo.entity.WorkCenter;
 import org.springblade.desk.basic.service.*;
@@ -197,6 +198,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
 
     private final IBsSalaryStandardService bsSalaryStandardService;
 
+    private final ICenterTeamService centerTeamService;
+
     @Override
     public IPage<WorkOrderVO> selectWorkOrderPage(IPage<WorkOrderVO> page, WorkOrderDTO workOrder) {
         return page.setRecords(baseMapper.selectWorkOrderPage(page, workOrder));
@@ -1650,9 +1653,12 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         if (workPlan.getMakeTeam() != null) {
             BsTeamSetEntity ct = teamSetService.getById(workPlan.getMakeTeam());
             if (ct != null) {
-                WorkCenter workCenter = workCenterService.getById(ct.getWcId());
-                if (1 == workCenter.getCheckout()) {
-                    return;
+                CenterTeam byTsId = centerTeamService.getByTsId(ct.getId());
+                if (byTsId != null) {
+                    WorkCenter workCenter = workCenterService.getById(byTsId.getWcId());
+                    if (workCenter != null && 1 == workCenter.getCheckout()) {
+                        return;
+                    }
                 }
             }
         }