From 7c9c6e6c95a76c8f5634116823ae55c22277e63d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= <a15234804788@163.com>
Date: Fri, 6 Mar 2026 10:56:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=9B=91=E6=8E=A7=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/StorageMonitoringServiceImpl.java    |  2 +-
 .../produce/controller/ProduceMonitorController.java  |  2 +-
 .../produce/service/impl/WorkOrderServiceImpl.java    | 11 ++++++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StorageMonitoringServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StorageMonitoringServiceImpl.java
index 3b707009..ba0da8a6 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StorageMonitoringServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StorageMonitoringServiceImpl.java
@@ -85,7 +85,7 @@ public class StorageMonitoringServiceImpl implements IStorageMonitoringService {
      * - 库位ID/任务/库位信息空值校验，跳过异常数据
      * - 状态未变化时跳过更新，减少数据库IO
      */
-    @Scheduled(cron = "*/5 * * * * ?") // Spring定时任务注解，cron表达式控制执行频率
+//    @Scheduled(cron = "*/5 * * * * ?") // Spring定时任务注解，cron表达式控制执行频率
     @Override // 实现IStorageMonitoringService接口的抽象方法
     public void monitoringStation() {
         // ========== 步骤1：查询所有空闲状态的站点 ==========
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/ProduceMonitorController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/ProduceMonitorController.java
index d0866a1c..b2fb535b 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/ProduceMonitorController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/ProduceMonitorController.java
@@ -21,7 +21,7 @@ import java.util.List;
  */
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/workOrder")
+@RequestMapping("/produceMonitor")
 @Tag(name = "生产监控", description = "接口")
 public class ProduceMonitorController extends BladeController {
 
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 54ccaf54..4f4bfa8f 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
@@ -1207,6 +1207,9 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
     @Override
     public boolean generateWorkOrder(Long id) {
         YieldOrder yieldOrder = yieldOrderService.getById(id);
+        if (yieldOrder == null) {
+            throw new ServiceException("未找到对应的生产订单");
+        }
         yieldOrder.setStatus(YieldOrderEnum.STATUS_APS.getCode());
         return yieldOrderService.updateById(yieldOrder);
     }
@@ -1259,9 +1262,11 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
 
         // 检验记录
         InspectionTask prWorkCheckByWpId = inspectionTaskService.getPrWorkCheckByWpId(wpId);
-        ProduceMonitorWorkCheckVO workCheckVO = new ProduceMonitorWorkCheckVO();
-        BeanUtils.copyProperties(prWorkCheckByWpId, workCheckVO);
-        planDataVO.setPrWorkCheck(workCheckVO);
+        if (prWorkCheckByWpId != null) {
+            ProduceMonitorWorkCheckVO workCheckVO = new ProduceMonitorWorkCheckVO();
+            BeanUtils.copyProperties(prWorkCheckByWpId, workCheckVO);
+            planDataVO.setPrWorkCheck(workCheckVO);
+        }
 
         // 转试记录
         List<PlanTest> planTests = planTestService.list(Wrappers.lambdaQuery(PlanTest.class).eq(PlanTest::getWpId, wpId));