From d7d7d5b98ba5b49a8357c5a562dd7d96a284d2f4 Mon Sep 17 00:00:00 2001
From: sunjianxi <839419401@qq.com>
Date: Mon, 9 Feb 2026 09:07:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E4=BA=A7=E4=BF=AE=E6=94=B9-sjx?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desk/quality/pojo/entity/InspectionItem.java      | 11 +++++++++++
 .../scheduling/service/impl/WorkOrderServiceImpl.java |  1 +
 .../scheduling/service/impl/WorkPlanServiceImpl.java  | 11 +++++++++++
 3 files changed, 23 insertions(+)

diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java
index 75540a53..55a13f22 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java
@@ -190,4 +190,15 @@ public class InspectionItem extends BaseEntity {
      */
     @Schema(description = "特殊类型")
     private Integer specialType;
+
+	/**
+	 * 额定工时(分钟)
+	 */
+	@Schema(description = "额定工时")
+	private Double standardWorkMinute;
+	/**
+	 * 准备工时(分钟)
+	 */
+	@Schema(description = "准备工时")
+	private Double prepareWorkMinute;
 }
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java
index 40873567..7cf553b2 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java
@@ -441,6 +441,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                         workPlan.setQualifiedQty(0);
                         workPlan.setUnqualifiedQty(0);
                         workPlan.setScrapQty(0);
+                        workPlan.setOcId(craft.getOcId());
                         workPlanList.add(workPlan);
                     }else{
                         if ("设备".equals(mainProducerMap.get(craft.getPpsId()))) {
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkPlanServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkPlanServiceImpl.java
index 52f3dfc9..a9169631 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkPlanServiceImpl.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkPlanServiceImpl.java
@@ -25,7 +25,9 @@
  */
 package org.springblade.scheduling.scheduling.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.apache.commons.lang3.ObjectUtils;
+import org.springblade.core.tool.utils.CollectionUtil;
 import org.springblade.scheduling.pojo.entity.WorkPlanEntity;
 import org.springblade.scheduling.scheduling.excel.WorkPlanExcel;
 import org.springblade.scheduling.scheduling.mapper.WorkPlanMapper;
@@ -69,6 +71,15 @@ public class WorkPlanServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPla
 		if (ObjectUtils.isNotEmpty(factStartTime)) {
 			workPlanUpdate.setFactStartTime(factStartTime);
 			workPlanUpdate.setStatus(WorkPlanEntity.STATUS_START);
+			//获取当前计划
+			WorkPlanEntity workPlan = baseMapper.selectById(id);
+			List<WorkPlanEntity> workPlanList = baseMapper.selectList(Wrappers.<WorkPlanEntity>lambdaQuery().lt(WorkPlanEntity::getOrders,workPlan.getOrders()));
+			if(CollectionUtil.isNotEmpty(workPlanList)){
+				workPlanList.forEach(item ->{
+					item.setStatus(5);
+					baseMapper.updateById(item);
+				});
+			}
 		}
 		if (ObjectUtils.isNotEmpty(factEndTime)) {
 			workPlanUpdate.setFactEndTime(factEndTime);