From c4312ec7b6a88ddf2fe8793086784fafc960e8be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= <a15234804788@163.com>
Date: Wed, 25 Mar 2026 14:21:29 +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/service/impl/MakeRecServiceImpl.java       | 6 +++---
 .../desk/produce/service/impl/WorkOrderServiceImpl.java     | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MakeRecServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MakeRecServiceImpl.java
index 8f71605c..b7b69586 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MakeRecServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MakeRecServiceImpl.java
@@ -341,16 +341,16 @@ public class MakeRecServiceImpl extends BaseServiceImpl<MakeRecMapper, MakeRec>
 
     @Override
     public WorkPlanLoadVO loadNotReceived(String cardNo) {
-        List<Long> tsIds = relTeamSetUserService.list(Wrappers.lambdaQuery(RelTeamSetUser.class).eq(RelTeamSetUser::getUserId, 1297)).stream().map(RelTeamSetUser::getTeamSetId).collect(Collectors.toList());
+        List<Long> tsIds = relTeamSetUserService.list(Wrappers.lambdaQuery(RelTeamSetUser.class).eq(RelTeamSetUser::getUserId, AuthUtil.getUserId())).stream().map(RelTeamSetUser::getTeamSetId).collect(Collectors.toList());
         WorkPlanLoadVO rtn = new WorkPlanLoadVO();
         if (CollectionUtils.isEmpty(tsIds)) {
-            return rtn;
+            throw new ServiceException("没有可操作的班组！");
         }
         WorkOrder wo = workOrderMapper.getWorkOrderByCardNo(cardNo, (short) 0);
         Optional.ofNullable(wo).orElseThrow(() -> new ServiceException("车间订单不存在！"));
         List<WorkPlanLoadVO> wpList = workPlanMapper.loadNotReceived(tsIds, wo.getId());
         if (CollectionUtils.isEmpty(wpList)) {
-            return rtn;
+            throw new ServiceException("没有可操作的工单！");
         }
         WorkPlanLoadVO workPlanLoadVO = wpList.get(0);
         workPlanLoadVO.setRunStatusTitle(WorkOrderEnum.getName(workPlanLoadVO.getRunStatus()));
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 b505f747..b7e2877c 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
@@ -1829,6 +1829,9 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
     public void oemHandle(Long nextWpId, int type) {
         // 接收工序
         WorkPlan workPlan = workPlanService.getById(nextWpId);
+        if (workPlan != null && !"1".equals(workPlan.getOem())) {
+            return;
+        }
         // 完成工序
         WorkPlan frontWorkPlan = workPlanService.getById(workPlan.getFrontWpId());
         WorkOrder workOrder = this.getById(workPlan.getWoId());