生产监控接口修改

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：查询所有空闲状态的站点 ==========

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 {
 

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));