From 0c099b877624664f9533173c44a9c2fe74d09ce8 Mon Sep 17 00:00:00 2001
From: pangyang <475446853@qq.com>
Date: Wed, 18 Mar 2026 16:28:04 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E7=83=A7=E7=BB=93=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=9C=AA=E5=AE=8C=E6=88=90001?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../produce/pojo/dto/PrintChildCheck.java     | 157 +++++
 .../pojo/dto/PrintChildCheckChild.java        |  91 +++
 .../produce/pojo/entity/DsRbFilePreserve.java |  56 ++
 .../desk/produce/pojo/entity/WorkPlan.java    |   7 +
 .../produce/pojo/vo/DsRbFilePreserveVO.java   |  18 +
 .../desk/quality/pojo/entity/RaiseHand.java   |   6 +
 .../pojo/entity/WorkPlanItemDetail.java       |  30 +
 .../quality/pojo/vo/InspectionTaskListVO.java |   2 +
 .../DsRbFilePreserveController.java           |  58 ++
 .../mapper/DsRbFilePreserveMapper.java        |  19 +
 .../produce/mapper/DsRbFilePreserveMapper.xml |  11 +
 .../desk/produce/mapper/WorkPlanMapper.java   |  39 +-
 .../desk/produce/mapper/WorkPlanMapper.xml    | 123 +++-
 .../service/IDsRbFilePreserveService.java     |  22 +
 .../impl/DsRbFilePreserveServiceImpl.java     |  40 ++
 .../wrapper/DsRbFilePreserveWrapper.java      |  37 ++
 .../controller/InspectionTaskController.java  |  18 +
 .../quality/mapper/InspectionTaskMapper.xml   |   1 +
 .../service/IInspectionTaskService.java       |   3 +
 .../impl/InspectionTaskServiceImpl.java       | 600 +++++++++++++++---
 20 files changed, 1218 insertions(+), 120 deletions(-)
 create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/PrintChildCheck.java
 create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/PrintChildCheckChild.java
 create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/DsRbFilePreserve.java
 create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/DsRbFilePreserveVO.java
 create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/DsRbFilePreserveController.java
 create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DsRbFilePreserveMapper.java
 create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DsRbFilePreserveMapper.xml
 create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IDsRbFilePreserveService.java
 create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/DsRbFilePreserveServiceImpl.java
 create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/produce/wrapper/DsRbFilePreserveWrapper.java

diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/PrintChildCheck.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/PrintChildCheck.java
new file mode 100644
index 000000000..25c0e10f7
--- /dev/null
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/PrintChildCheck.java
@@ -0,0 +1,157 @@
+package org.springblade.desk.produce.pojo.dto;
+
+import java.util.List;
+
+public class PrintChildCheck implements java.io.Serializable {
+
+    /**
+     * @return 序号
+     * @Author dxl
+     * @CreateTime 2022/11/7 10:24
+     */
+    private String testOrders;
+    /**
+    * @return 检验细项
+    * @Author dxl
+    * @CreateTime 2022/11/8 16:22
+    */
+    private List<PrintChildCheckChild> cccList;
+
+    /**
+     * @return 抽样数
+     * @Author dxl
+     * @CreateTime 2022/11/7 9:25
+     */
+    private String checkQty;
+    /**
+     * @return 合格，不合格，NA
+     * @Author dxl
+     * @CreateTime 2022/11/7 9:25
+     */
+    private String checkResult;
+    /**
+     * @return 姓名
+     * @Author dxl
+     * @CreateTime 2022/11/7 9:25
+     */
+    private String checkName;
+    /**
+     * @return 检验日期
+     * @Author dxl
+     * @CreateTime 2022/11/7 9:25
+     */
+    private String checkDate;
+
+    /**
+     * 试验数量
+     */
+    private String testQty;
+    /**
+     * @return 检测项目名称
+     */
+    private String testName;
+    /**
+     * @return 检测项目实验标准
+     */
+    private String trialStandard;
+
+    /**
+     * @return 设备编码
+     */
+    private String deviceCode;
+
+    /**
+     * @return 检验印章URL
+     */
+    private String imgUrl;
+    public String getTestOrders() {
+        return testOrders;
+    }
+
+    public void setTestOrders(String testOrders) {
+        this.testOrders = testOrders;
+    }
+
+    public String getCheckQty() {
+        return checkQty;
+    }
+
+    public void setCheckQty(String checkQty) {
+        this.checkQty = checkQty;
+    }
+
+    public String getCheckName() {
+        return checkName;
+    }
+
+    public void setCheckName(String checkName) {
+        this.checkName = checkName;
+    }
+
+    public String getCheckDate() {
+        return checkDate;
+    }
+
+    public void setCheckDate(String checkDate) {
+        this.checkDate = checkDate;
+    }
+
+    public String getCheckResult() {
+        return checkResult;
+    }
+
+    public void setCheckResult(String checkResult) {
+        this.checkResult = checkResult;
+    }
+
+    public List<PrintChildCheckChild> getCccList() {
+        return cccList;
+    }
+
+    public void setCccList(List<PrintChildCheckChild> cccList) {
+        this.cccList = cccList;
+    }
+
+    public String getTestQty() {
+        return testQty;
+    }
+
+    public void setTestQty(String testQty) {
+        this.testQty = testQty;
+    }
+
+    public String getTestName() {
+        return testName;
+    }
+
+    public void setTestName(String testName) {
+        this.testName = testName;
+    }
+
+    public String getTrialStandard() {
+        return trialStandard;
+    }
+
+    public void setTrialStandard(String trialStandard) {
+        this.trialStandard = trialStandard;
+    }
+
+    public String getDeviceCode() {
+        return deviceCode;
+    }
+
+    public void setDeviceCode(String deviceCode) {
+        this.deviceCode = deviceCode;
+    }
+
+    public PrintChildCheck() {
+    }
+
+    public String getImgUrl() {
+        return imgUrl;
+    }
+
+    public void setImgUrl(String imgUrl) {
+        this.imgUrl = imgUrl;
+    }
+}
diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/PrintChildCheckChild.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/PrintChildCheckChild.java
new file mode 100644
index 000000000..0b9e15483
--- /dev/null
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/PrintChildCheckChild.java
@@ -0,0 +1,91 @@
+package org.springblade.desk.produce.pojo.dto;
+
+/**
+ * @version V1.0
+ * @Title: PrintChildCheckChild
+ * @Author: dxl
+ * @CreateTime: 2022/11/8 16:18
+ */
+public class PrintChildCheckChild implements java.io.Serializable {
+
+    /**
+     * @return 名称
+     * @Author dxl
+     * @CreateTime 2022/11/7 10:24
+     */
+    private String testName;
+    /**
+     * @return 实验标准
+     * @Author dxl
+     * @CreateTime 2022/11/7 10:34
+     */
+    private String trialStandard;
+    /**
+     * @return 检验值
+     * @Author dxl
+     * @CreateTime 2022/11/7 10:34
+     */
+    private String checkValue;
+    /**
+     * @return 设备量具
+     * @Author dxl
+     * @CreateTime 2022/11/7 10:24
+     */
+    private String emTools;
+    /**
+     * @return 检验项Id
+     * @Author dxl
+     * @CreateTime 2022/11/8 17:09
+     */
+    private Long wpiId;
+
+    public String getTestName() {
+        return testName;
+    }
+
+    public void setTestName(String testName) {
+        this.testName = testName;
+    }
+
+    public String getEmTools() {
+        return emTools;
+    }
+
+    public void setEmTools(String emTools) {
+        this.emTools = emTools;
+    }
+
+    public String getTrialStandard() {
+        return trialStandard;
+    }
+
+    public void setTrialStandard(String trialStandard) {
+        this.trialStandard = trialStandard;
+    }
+
+    public String getCheckValue() {
+        return checkValue;
+    }
+
+    public void setCheckValue(String checkValue) {
+        this.checkValue = checkValue;
+    }
+
+    public Long getWpiId() {
+        return wpiId;
+    }
+
+    public void setWpiId(Long wpiId) {
+        this.wpiId = wpiId;
+    }
+
+    public PrintChildCheckChild(String testName, String trialStandard, String checkValue, Long wpiId) {
+        this.testName = testName;
+        this.trialStandard = trialStandard;
+        this.checkValue = checkValue;
+        this.wpiId = wpiId;
+    }
+
+    public PrintChildCheckChild() {
+    }
+}
diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/DsRbFilePreserve.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/DsRbFilePreserve.java
new file mode 100644
index 000000000..f0f88c04c
--- /dev/null
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/DsRbFilePreserve.java
@@ -0,0 +1,56 @@
+package org.springblade.desk.produce.pojo.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.io.Serial;
+import java.time.LocalDate;
+import java.util.Date;
+
+/**
+ *
+ * @author litao
+ */
+@Data
+@TableName("DS_RB_FILE_PRESERVE")
+@Schema(description = "DsRbFilePreserve对象")
+@EqualsAndHashCode(callSuper = true)
+public class DsRbFilePreserve extends BaseEntity {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	@Schema(description = "作业中心")
+	private Long wcId;
+
+	@Schema(description = "工序")
+	private Long ppsId;
+
+	@Schema(description = "线上线下")
+	private String line;
+
+	@Schema(description = "维护时间")
+	private LocalDate keepTime;
+
+	@Schema(description = "维护人")
+	private Long keepMan;
+
+	@Schema(description = "名称")
+	private String name;
+
+
+	@Schema(description = "审批状态")
+	private Short approvalStatus = -1;
+
+	@Schema(description = "状态")
+	private Short rfpStatus = 1;
+
+	@Schema(description = "升版ID")
+	private String versionId;
+
+
+
+}
diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkPlan.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkPlan.java
index 1357d5cff..cdda06f12 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkPlan.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkPlan.java
@@ -6,6 +6,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
+import org.springblade.desk.produce.pojo.dto.PrintChildCheck;
 import org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO;
 import org.springblade.desk.quality.pojo.entity.InspectionTask;
 import org.springblade.desk.quality.pojo.entity.WorkPlanItem;
@@ -327,5 +328,11 @@ public class WorkPlan extends BaseEntity {
 	private List<MesQcProduceRunEntity> qcProduceRunsList;
 	@TableField(exist = false)
 	private Integer totalPreserve = 0;
+	@TableField(exist = false)
+	private MesBsAdditionalMessEntity bsAdditionalMess;
+	@TableField(exist = false)
+	private List<MesRbFilePreserveSlotEntity> dsRbFilePreserveSlotList;
+	@TableField(exist = false)
+	private List<PrintChildCheck> printChildCheck;
 
 }
diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/DsRbFilePreserveVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/DsRbFilePreserveVO.java
new file mode 100644
index 000000000..de4816af0
--- /dev/null
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/DsRbFilePreserveVO.java
@@ -0,0 +1,18 @@
+package org.springblade.desk.produce.pojo.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springblade.desk.produce.pojo.entity.DsRbFilePreserve;
+
+import java.util.Date;
+
+/**
+ * 加工记录 视图实体类
+ *
+ * @author BladeX
+ * @since 2026-02-04
+ */
+@Data
+public class DsRbFilePreserveVO extends DsRbFilePreserve {
+
+}
diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RaiseHand.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RaiseHand.java
index 2b877e52b..42e51c4b4 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RaiseHand.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RaiseHand.java
@@ -71,5 +71,11 @@ public class RaiseHand extends BaseEntity {
 	@Schema(description = "免责金额")
 	private BigDecimal amount;
 
+	/**
+	 * raisHand文件
+	 */
+	@Schema(description = "文件路径")
+	private String fileUrl;
+
 
 }
diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItemDetail.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItemDetail.java
index f692cc79a..de41be207 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItemDetail.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItemDetail.java
@@ -3,10 +3,12 @@
  */
 package org.springblade.desk.quality.pojo.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.StringUtils;
 import org.springblade.core.mp.base.BaseEntity;
 
 import java.io.Serial;
@@ -149,4 +151,32 @@ public class WorkPlanItemDetail extends BaseEntity {
      */
     @Schema(description = "实际[量具]id")
     private Long actMtId;
+
+
+	@TableField(exist = false)
+	private String trialItem;
+	@TableField(exist = false)
+	private String trialStandard;
+	@TableField(exist = false)
+	private Long wpiId;
+
+
+	public String getGaugeValueNotNUll() {
+		StringBuffer sb = new StringBuffer();
+
+		if(StringUtils.isNotBlank(this.gaugeValue2) && this.gaugeValue6 != "/"){
+			sb.append(this.gaugeValue1+"/"+this.gaugeValue2+"/");
+
+		}
+
+		if(StringUtils.isNotBlank(this.gaugeValue4) && this.gaugeValue4 != "/"){
+			sb.append(this.gaugeValue3+"/"+this.gaugeValue4+"/");
+
+		}
+		if(StringUtils.isNotBlank(this.gaugeValue6) && this.gaugeValue6 != "/"){
+			sb.append(this.gaugeValue5+"/"+this.gaugeValue6+"/");
+
+		}
+		return  sb.toString();
+	}
 }
diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java
index 3db55df92..ff1795f4d 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java
@@ -123,4 +123,6 @@ public class InspectionTaskListVO extends InspectionTask {
 
     private String ppsName;
 
+    private Integer yieldType;
+
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/DsRbFilePreserveController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/DsRbFilePreserveController.java
new file mode 100644
index 000000000..8cfb68a54
--- /dev/null
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/DsRbFilePreserveController.java
@@ -0,0 +1,58 @@
+package org.springblade.desk.produce.controller;
+
+import com.alibaba.nacos.common.utils.CollectionUtils;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springblade.common.utils.CommonUtil;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.R;
+import org.springblade.desk.produce.pojo.dto.ShiftTransferDTO;
+import org.springblade.desk.produce.pojo.dto.TaskCompleteDTO;
+import org.springblade.desk.produce.pojo.dto.TaskCompleteOrderDTO;
+import org.springblade.desk.produce.pojo.entity.*;
+import org.springblade.desk.produce.pojo.vo.ByCardNoByPlanVO;
+import org.springblade.desk.produce.pojo.vo.DsRbFilePreserveVO;
+import org.springblade.desk.produce.pojo.vo.TaskCompleteVO;
+import org.springblade.desk.produce.service.IDisTaskingService;
+import org.springblade.desk.produce.service.IDsRbFilePreserveService;
+import org.springblade.desk.produce.service.IPdaSaveService;
+import org.springblade.desk.produce.service.IWorkPlanLogService;
+import org.springblade.system.cache.UserCache;
+import org.springblade.system.pojo.entity.User;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ *
+ *
+ * @author litao
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/DisTaskingController")
+public class DsRbFilePreserveController extends BladeController {
+
+    private final IDsRbFilePreserveService dsRbFilePreserveService;
+
+
+
+    @GetMapping("/page")
+    @ApiOperationSupport(order = 1)
+    @Operation(summary = "调度任务分派", description = "传入taskCompleteDTO")
+    public R<IPage<DsRbFilePreserveVO>> disTaskHandle(DsRbFilePreserve taskCompleteDTO, Query query) {
+        return R.data(null);
+    }
+
+
+}
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DsRbFilePreserveMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DsRbFilePreserveMapper.java
new file mode 100644
index 000000000..9be78d253
--- /dev/null
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DsRbFilePreserveMapper.java
@@ -0,0 +1,19 @@
+package org.springblade.desk.produce.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.desk.produce.pojo.entity.DsRbFilePreserve;
+import org.springblade.desk.produce.pojo.entity.MacToolUse;
+import org.springblade.desk.produce.pojo.entity.MesQcProduceRunEntity;
+import org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO;
+
+import java.util.List;
+
+/**
+ *
+ * @author BladeX
+ */
+public interface DsRbFilePreserveMapper extends BaseMapper<DsRbFilePreserve> {
+
+
+}
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DsRbFilePreserveMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DsRbFilePreserveMapper.xml
new file mode 100644
index 000000000..8e3fe10de
--- /dev/null
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DsRbFilePreserveMapper.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.desk.produce.mapper.DsRbFilePreserveMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="mesDsRbFilePreserveResultMap" type="org.springblade.desk.produce.pojo.entity.DsRbFilePreserve">
+
+    </resultMap>
+
+
+</mapper>
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.java
index a1b2c26b4..e0e6e6327 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.java
@@ -2,14 +2,16 @@ package org.springblade.desk.produce.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+import org.springblade.desk.dashboard.pojo.entity.DsPartRelationEntity;
+import org.springblade.desk.dashboard.pojo.entity.DsPartSub;
 import org.springblade.desk.produce.pojo.dto.MesRbFilePreserveDetailDTO;
-import org.springblade.desk.produce.pojo.entity.MacToolUse;
-import org.springblade.desk.produce.pojo.entity.MakeRec;
-import org.springblade.desk.produce.pojo.entity.MesQcProduceRunEntity;
-import org.springblade.desk.produce.pojo.entity.WorkPlan;
+import org.springblade.desk.produce.pojo.entity.*;
 import org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO;
 import org.springblade.desk.produce.pojo.vo.ProduceMonitorWorkPlanVO;
 import org.springblade.desk.produce.pojo.vo.WorkPlanLoadVO;
+import org.springblade.desk.quality.pojo.entity.ReviewSheet;
+import org.springblade.desk.quality.pojo.entity.WorkPlanItem;
+import org.springblade.desk.quality.pojo.entity.WorkPlanItemDetail;
 import org.springblade.scheduling.pojo.entity.WorkPlanEntity;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.desk.produce.pojo.vo.WorkPlanVO;
@@ -44,15 +46,38 @@ public interface WorkPlanMapper extends BaseMapper<WorkPlan> {
     MesQcProduceRunEntity getBoxInfo(Long wpId);
 
     List<ProduceMonitorSlotListVO> listSlotInfoGr (Long wpId, Boolean aTrue);
-    List<ProduceMonitorSlotListVO> listSlotInfo (Long wpId,Boolean aTrue);
+    List<ProduceMonitorSlotListVO> listSlotInfoList (Long wpId,Boolean aTrue);
     List<MacToolUse> listMacToolUse(Long wpId,Boolean aTrue);
 
     MakeRec getByWpId(Long wpId);
-    Object[] getConcatMrByWpId(Long wpId);
+//    Object[] getConcatMrByWpId(Long wpId);
+    WorkPlan getConcatMrByWpId(Long wpId);
     List<MesQcProduceRunEntity> listPrByWpIdIndex(Long wpId, Integer index,boolean aTrue);
     List<MacToolUse> getDataByWpIdAndIndexList(Long wpId, String indexNum);
     List<MesQcProduceRunEntity> listPrByWpIdIndexAndMtnCode(Long wpId, Integer indexNum,String mtnCode);
-    List<MesQcProduceRunEntity> getBoxInfoByWpIdMtnCode(Long wpId);
+    List<MesQcProduceRunEntity> getBoxInfoByWpIdMtnCodeList(Long wpId);
     List<MesRbFilePreserveDetailDTO> getByRfpsId(Long rfpsId);
     MacToolUse getHangNumIsNull(Long wpId);
+    MacToolUse getDataByWpIdAndIndex(Long wpId, String numberIndex);
+    List<DsRbFilePreserve> getDataByWcIdAndPpsId(Long wcId, Long ppsId,boolean aTrue);
+    List<MesRbFilePreserveSlotEntity> getByRfpId(Long rfpId);
+//    MesQcProduceRunEntity getBoxInfoByWpIdMtnCode(Long wpId);
+
+    MesBsAdditionalMessEntity getDataByOneData(String  mtnCode,Short indexNum);
+
+    List<WorkOrder> findFatherByYoIdMes(Long yoId);
+
+    List<WorkPlan> listByWoIdAllMes(Long woId);
+
+    List<ProduceMonitorSlotListVO> listSjSlotInfoMes(Long wpId, Boolean aTrue);
+    List<WorkPlanItem> listByWpIdMes(Long wpId);
+    List<WorkOrder> findCubByYoIdMes(Long yoId);
+    List<DsPartRelationEntity> listByPartCodeNew(String partCode, Short indexNum);
+    List<WorkOrder> findByPartCodeAndMemoMes(String partCode, String memo);
+    DsPartSub getByPartCodeAndSubCodeMes(String partCode, String subCode);
+    String getCheckManByNewErpMes(String userName);
+
+    List<WorkPlanItemDetail> listByWpiIdMes(Long wpiId);
+
+    List<ReviewSheet> getQcReviewSheetListMes(String partCode,String batchNo);
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml
index e97988a1a..c9d36bb85 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml
@@ -97,7 +97,7 @@
     </select>
 
 
-    <select id="listSlotInfo" resultType="org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO">
+    <select id="listSlotInfoList" resultType="org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO">
         select a.PART_CODE, a.BATCH_NO, a.WORK_QTY, a.area, a.sumArea,
                a.MTN_CODE, a.prod_ident,a.wo_code,a.material,a.yield_type from (
                    select d.PART_CODE, c.BATCH_NO, b.WORK_QTY, b.WORK_QTY*d.PO_AREA as area,
@@ -122,7 +122,7 @@
 
     <select id="listMacToolUse" resultType="org.springblade.desk.produce.pojo.entity.MacToolUse">
         select * from MES_MAC_TOOL_USE a
-                 where a.wpId= #{wpId}
+                 where a.wp_id= #{wpId}
         <if test="aTrue==true">
             and  a.finished = false
         </if>
@@ -131,13 +131,53 @@
 
     <select id="getByWpId" resultType="org.springblade.desk.produce.pojo.entity.MakeRec">
         select * from MES_MAKE_REC a
-        where a.wpId= #{wpId}
+        where a.wp_id= #{wpId}
         order by a.ID desc
     </select>
 
-    <select id="getConcatMrByWpId" >
-        select nvl(sum(a.flag_qty),0), nvl(wmsys.wm_concat(a.flag_colour_one),' '), nvl(wmsys.wm_concat(a.flag_colour_two),' '), nvl(wmsys.wm_concat(a.flag_ink),' '), nvl(wmsys.wm_concat(a.flag_matter),' '),
-               nvl(sum(a.belt_qty),0), nvl(wmsys.wm_concat(a.belt_colour_one),' '), nvl(wmsys.wm_concat(a.belt_colour_two),' '), nvl(wmsys.wm_concat(a.belt_ink),' '), nvl(wmsys.wm_concat(a.belt_matter),' ')
+    <select id="findCubByYoIdMes" resultType="org.springblade.desk.produce.pojo.entity.WorkOrder">
+        select * from MES_WORK_ORDER a left join MES_YIELD_ORDER b on a.YO_ID = b.ID where b.FATHER_YO_ID = #{yoId}
+    </select>
+
+    <select id="listByWpIdMes" resultType="org.springblade.desk.quality.pojo.entity.WorkPlanItem">
+        select * from QA_WORK_PLAN_ITEM a left join MES_WORK_PLAN b on a.wp_id = b.ID where a.wp_id= #{wpId}
+    </select>
+
+    <select id="listByPartCodeNew" resultType="org.springblade.desk.dashboard.pojo.entity.DsPartRelationEntity">
+        select * from DS_PART_RELATION a left join DS_PART b on a.PART_CODE = b.PART_CODE where a.PART_CODE= #{partCode} and b.SIN_TER_TYPE = #{indexNum}
+    </select>
+
+    <select id="getByPartCodeAndSubCodeMes" resultType="org.springblade.desk.dashboard.pojo.entity.DsPartSub">
+        select b.*,a.CHILD_PART_CODE as subCode from DS_PART_RELATION a left join DS_PART b
+            on a.PART_CODE = b.PART_CODE where a.PART_CODE= #{partCode} and a.CHILD_PART_CODE = #{subCode}
+    </select>
+
+    <select id="findByPartCodeAndMemoMes" resultType="org.springblade.desk.produce.pojo.entity.WorkOrder">
+        select * from MES_WORK_ORDER a left join MES_YIELD_ORDER b on a.YO_ID = b.ID where b.PART_CODE= #{partCode} and b.YP_CODE = #{memo}
+    </select>
+
+    <select id="getCheckManByNewErpMes" resultType="String">
+        select a.value1,a.value2 from v_rb_qms_checker_seal@nerp_mes_link a where a.checker_name= #{userName}
+    </select>
+
+    <select id="getQcReviewSheetListMes" resultType="org.springblade.desk.quality.pojo.entity.ReviewSheet">
+        select a.rs_code,a.memo,a.unqualified_qty,a.REVIEW_DATE from QA_REVIEW_SHEET a
+--                inner join rb_pr_work_check b on a.wc_id = b.wc_id
+               inner join MES_WORK_PLAN c on b.wp_id=c.id
+               inner join MES_WORK_ORDER d on c.wo_id=d.id
+               inner join MES_YIELD_ORDER e on e.id = d.yo_id
+                where e.part_code = #{partCode} and e.batch_no = #{batchNo}
+    </select>
+
+    <select id="listByWpiIdMes" resultType="org.springblade.desk.quality.pojo.entity.WorkPlanItemDetail">
+        select *,b.ITEM_NAME as trialItem,b.STANDARD_NAME as trialStandard,b.ID as wpiId from QA_WORK_PLAN_ITEM_DETAIL a
+            left join QA_WORK_PLAN_ITEM b on a.WORK_PLAN_ITEM_ID = b.ID where a.WORK_PLAN_ITEM_ID = #{wpiId}
+        order by a.UPDATE_TIME,a.GAUGE_VALUE1 desc
+    </select>
+
+    <select id="getConcatMrByWpId" resultType="org.springblade.desk.produce.pojo.entity.WorkPlan">
+        select nvl(sum(a.flag_qty),0) as flagQty, nvl(wmsys.wm_concat(a.flag_colour_one),' ') as flagColourOne, nvl(wmsys.wm_concat(a.flag_colour_two),' ') as flagColourTwo, nvl(wmsys.wm_concat(a.flag_ink),' ') as flagInk, nvl(wmsys.wm_concat(a.flag_matter),' ') as flagMatter,
+               nvl(sum(a.belt_qty),0) as beltQty, nvl(wmsys.wm_concat(a.belt_colour_one),' ') as beltColourOne, nvl(wmsys.wm_concat(a.belt_colour_two),' ') as beltColourTwo, nvl(wmsys.wm_concat(a.belt_ink),' ') as beltInk, nvl(wmsys.wm_concat(a.belt_matter),' ') as beltMatter
         from MES_MAKE_REC a where a.wp_id = #{wpId} order by a.ID desc
     </select>
 
@@ -147,7 +187,7 @@
         <if test="aTrue == true">
             and b.work_slot != '烘箱'
         </if>
-        order by mtn_code, b.pr_id
+        order by mtn_code, b.id
     </select>
 
     <select id="listPrByWpIdIndexAndMtnCode" resultType="org.springblade.desk.produce.pojo.entity.MesQcProduceRunEntity">
@@ -158,7 +198,41 @@
         order by b.ID asc
     </select>
 
-    <select id="getBoxInfoByWpIdMtnCode" resultType="org.springblade.desk.produce.pojo.entity.MesQcProduceRunEntity">
+    <select id="listSjSlotInfoMes" resultType="org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO">
+        select a.PART_CODE, a.BATCH_NO, a.WORK_QTY as qua, a.area, a.sumArea as totalArea,a.MTN_CODE, a.prod_ident,a.wo_code,a.material,a.yield_type
+        from (
+                 select d.PART_CODE, c.BATCH_NO, b.WORK_QTY, b.WORK_QTY*d.PO_AREA as area,
+                        sum(b.WORK_QTY*d.PO_AREA) over() as sumArea,
+                         a.MTN_CODE, d.prod_ident,c.wo_code,f.material,d.yield_type from MES_MAC_TOOL_USE a
+                         inner join MES_WORK_PLAN b on a.WP_ID = b.WP_ID
+                         inner join MES_WORK_ORDER c on b.WO_ID = c.ID
+                         inner join MES_YIELD_ORDER d on c.YO_ID = d.ID
+                         inner join ds_part f on d.part_code = f.part_code
+                        where a.MTN_CODE in(
+                            select a.MTN_CODE from MES_MAC_TOOL_USE a
+                            left join DE_EQUIPMENT_CARD b on a.EQUIPMENT_CARD = b.ID
+                            where a.WP_ID = #{wpId}
+                            <if test="aTrue==true">
+                                and b.CATEGORYS = '产线设备'
+                            </if>
+                            <if test="aTrue==false">
+                                and (b.CATEGORYS not like '%烘箱%' or b.CATEGORYS is null )
+                            </if>
+                        ) and a.mtu_index = '2'
+             )a group by a.PART_CODE, a.BATCH_NO, a.WORK_QTY, a.area, a.sumArea,
+                a.MTN_CODE, a.prod_ident,a.wo_code,a.material,a.yield_type
+    </select>
+
+
+    <select id="findFatherByYoIdMes" resultType="org.springblade.desk.produce.pojo.entity.WorkOrder">
+        select * from pr_work_order a inner join pj_yield_order  b on a.yo_id = b.id and b.id = #{yoId}
+    </select>
+
+    <select id="listByWoIdAllMes" resultType="org.springblade.desk.produce.pojo.entity.WorkPlan">
+        select a.* from rb_pr_work_plan a where a.wo_id= #{woId} order by orders asc
+    </select>
+
+    <select id="getBoxInfoByWpIdMtnCodeList" resultType="org.springblade.desk.produce.pojo.entity.MesQcProduceRunEntity">
         select min(c.IN_DATE), max(c.OUT_DATE), 'Max:'||max(c.TEMP_SLOT)||'/'||'Min:'||min(c.temp_slot), max(c.DEVICE_ID)
         from MES_QC_PRODUCE_RUN c where c.mtn_code in(
             select a.mtn_code from MES_MAC_TOOL_USE a left join MES_EQUIPMENT_CARD b on a.EQUIPMENT_CARD = b.ID
@@ -167,15 +241,29 @@
     </select>
 
     <select id="getDataByWpIdAndIndexList" resultType="org.springblade.desk.produce.pojo.entity.MacToolUse">
-        select b.* from MES_MAC_TOOL_USE a
+        select a.* from MES_MAC_TOOL_USE a
         left join MES_WORK_PLAN wp on a.WP_ID = wp.ID
-        where wp.Id=#{wpId} and a.mtu_index=#{indexNum} order by a.mtuId
+        where wp.Id=#{wpId} and a.mtu_index=#{indexNum} order by a.Id
+    </select>
+
+    <select id="getDataByWpIdAndIndex" resultType="org.springblade.desk.produce.pojo.entity.MacToolUse">
+        select a.* from MES_MAC_TOOL_USE a
+                            left join MES_WORK_PLAN wp on a.WP_ID = wp.ID
+        where wp.Id=#{wpId} and a.mtu_index=#{numberIndex} order by a.Id desc
     </select>
 
     <select id="getHangNumIsNull" resultType="org.springblade.desk.produce.pojo.entity.MacToolUse">
         select a.* from MES_MAC_TOOL_USE a where a.wp_id = #{wpId} and hang_num is not null
     </select>
 
+    <select id="getDataByWcIdAndPpsId" resultType="org.springblade.desk.produce.pojo.entity.DsRbFilePreserve">
+        select from DS_RB_FILE_PRESERVE a where 1=1
+        <if test="wcId != null">
+            and a.WC_ID = #{wcId}
+        </if>
+        and a.PPS_ID = #{ppsId} and a.LINE = 2
+    </select>
+
 
     <select id="getByRfpsId" resultType="org.springblade.desk.produce.pojo.dto.MesRbFilePreserveDetailDTO">
        select * ,slot.rfps_type as rfpsType from MES_RB_FILE_PRESERVE_DETAIL a
@@ -185,6 +273,21 @@
     </select>
 
 
+    <select id="getByRfpId" resultType="org.springblade.desk.produce.pojo.entity.MesRbFilePreserveSlotEntity">
+        select a.*  from MES_RB_FILE_PRESERVE_SLOT a
+        left join DS_RB_FILE_PRESERVE slot on a.Id = slot.RFP_ID
+        where slot.RFP_ID =#{rfpId}
+
+    </select>
+
+
+    <select id="getDataByOneData" resultType="org.springblade.desk.produce.pojo.entity.MesBsAdditionalMessEntity">
+        select a.*  from MES_BS_ADDITIONAL_MESS a
+        where a.ONE_DATA =#{mtnCode} and a.TYPE = #{indexNum}
+
+    </select>
+
+
     <select id="loadPrMacToolUseByMtnCode" resultType="java.lang.String">
         SELECT
         c.card_no
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IDsRbFilePreserveService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IDsRbFilePreserveService.java
new file mode 100644
index 000000000..8c7f4e159
--- /dev/null
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IDsRbFilePreserveService.java
@@ -0,0 +1,22 @@
+package org.springblade.desk.produce.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.desk.produce.pojo.entity.DsRbFilePreserve;
+import org.springblade.desk.produce.pojo.entity.MacToolUse;
+import org.springblade.desk.produce.pojo.entity.MesQcProduceRunEntity;
+import org.springblade.desk.produce.pojo.entity.WorkPlan;
+import org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO;
+
+import java.util.List;
+
+/**
+ *
+ *
+ * @author BladeX
+ * @since 2025-11-28
+ */
+public interface IDsRbFilePreserveService extends BaseService<DsRbFilePreserve> {
+
+
+}
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/DsRbFilePreserveServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/DsRbFilePreserveServiceImpl.java
new file mode 100644
index 000000000..8540a59a4
--- /dev/null
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/DsRbFilePreserveServiceImpl.java
@@ -0,0 +1,40 @@
+package org.springblade.desk.produce.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.desk.dashboard.pojo.entity.BsProcessSetEntity;
+import org.springblade.desk.dashboard.service.IBsProcessSetService;
+import org.springblade.desk.device.pojo.entity.RackSetEntity;
+import org.springblade.desk.device.service.IRackSetService;
+import org.springblade.desk.produce.mapper.DsRbFilePreserveMapper;
+import org.springblade.desk.produce.mapper.MacToolUseMapper;
+import org.springblade.desk.produce.pojo.entity.DsRbFilePreserve;
+import org.springblade.desk.produce.pojo.entity.MacToolUse;
+import org.springblade.desk.produce.pojo.entity.MesQcProduceRunEntity;
+import org.springblade.desk.produce.pojo.entity.WorkPlan;
+import org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO;
+import org.springblade.desk.produce.service.IDsRbFilePreserveService;
+import org.springblade.desk.produce.service.IMacToolUseService;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.Random;
+
+/**
+ * 设备，工装使用记录 服务实现类
+ *
+ * @author BladeX
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class DsRbFilePreserveServiceImpl extends BaseServiceImpl<DsRbFilePreserveMapper, DsRbFilePreserve> implements IDsRbFilePreserveService {
+
+}
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/wrapper/DsRbFilePreserveWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/wrapper/DsRbFilePreserveWrapper.java
new file mode 100644
index 000000000..a577dbd93
--- /dev/null
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/wrapper/DsRbFilePreserveWrapper.java
@@ -0,0 +1,37 @@
+package org.springblade.desk.produce.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.desk.produce.pojo.entity.DsRbFilePreserve;
+import org.springblade.desk.produce.pojo.entity.MesRbFilePreserveDetailEntity;
+import org.springblade.desk.produce.pojo.vo.DsRbFilePreserveVO;
+import org.springblade.desk.produce.pojo.vo.MesRbFilePreserveDetailVO;
+
+import java.util.Objects;
+
+/**
+ * 热表电子档案维护-明细 包装类,返回视图层所需的字段
+ *
+ * @author BladeX
+ * @since 2026-02-05
+ */
+public class DsRbFilePreserveWrapper extends BaseEntityWrapper<DsRbFilePreserve, DsRbFilePreserveVO>  {
+
+	public static DsRbFilePreserveWrapper build() {
+		return new DsRbFilePreserveWrapper();
+ 	}
+
+	@Override
+	public DsRbFilePreserveVO entityVO(DsRbFilePreserve mesRbFilePreserveDetail) {
+		DsRbFilePreserveVO mesRbFilePreserveDetailVO = Objects.requireNonNull(BeanUtil.copyProperties(mesRbFilePreserveDetail, DsRbFilePreserveVO.class));
+
+		//User createUser = UserCache.getUser(mesRbFilePreserveDetail.getCreateUser());
+		//User updateUser = UserCache.getUser(mesRbFilePreserveDetail.getUpdateUser());
+		//mesRbFilePreserveDetailVO.setCreateUserName(createUser.getName());
+		//mesRbFilePreserveDetailVO.setUpdateUserName(updateUser.getName());
+
+		return mesRbFilePreserveDetailVO;
+	}
+
+
+}
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java
index 013cbef83..ecc0197a3 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java
@@ -199,6 +199,24 @@ public class InspectionTaskController extends BladeController {
 //        return ResultInfo.ok(prWorkOrderService.newPagePrintEleFiles(woId, planList,moduleList));
     }
 
+    @Operation(summary = "烧结电子档案打印")
+    @PostMapping(value = "/pagePrintSj")
+    public R pagePrintSj(@RequestBody JSONObject data) {
+        Long woId = data.getLong("woId");
+        Integer yieldType = data.getInteger("yieldType");
+
+        List<Boolean> planList = new ArrayList<>();
+        List<Boolean> moduleList = new ArrayList<>();
+        if(data.getJSONArray("planList") != null){
+            planList= data.getJSONArray("planList").toJavaList(Boolean.class); // 工序
+            moduleList= data.getJSONArray("moduleList").toJavaList(Boolean.class); // 模块
+        }
+
+        Object pagePrintSjEleFiles = service.pagePrintSjEleFiles(woId, yieldType,planList,moduleList);
+
+        return R.data(pagePrintSjEleFiles);
+    }
+
 
     /**
      * [检验任务] 自定义分页
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml
index b78a14bed..e2fa66981 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml
@@ -250,6 +250,7 @@
         wo.batch_no AS poBatchNo,
         ps.NAME AS currentProcessName,
         yo.PRODUCT_IDENT AS prodIdent,
+        yo.YIELD_TYPE as yieldType,
         yo.YP_AREA * wo.MAKE_QTY AS areaTotal,
         yo.YP_AREA AS area,
         wo.MAKE_QTY AS poQty,
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTaskService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTaskService.java
index 289c24975..36b234973 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTaskService.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTaskService.java
@@ -121,4 +121,7 @@ public interface IInspectionTaskService extends BaseService<InspectionTask> {
     R sameResultCopy(Long sourceId, Long targetId);
 
     InspectionTask refreshStatusAndQty(Long id);
+
+    Object pagePrintSjEleFiles(Long woId, Integer yieldType,List<Boolean> planList, List<Boolean> moduleList);
+
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java
index 20ab4a7a0..bcf45a01f 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java
@@ -4,6 +4,7 @@
 package org.springblade.desk.quality.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -34,6 +35,8 @@ import org.springblade.desk.basic.util.IdUtil;
 import org.springblade.desk.basic.util.StatusCountMap;
 import org.springblade.desk.dashboard.pojo.entity.BsProcessSetEntity;
 import org.springblade.desk.dashboard.pojo.entity.DsPartEntity;
+import org.springblade.desk.dashboard.pojo.entity.DsPartRelationEntity;
+import org.springblade.desk.dashboard.pojo.entity.DsPartSub;
 import org.springblade.desk.dashboard.service.IBsProcessSetService;
 import org.springblade.desk.dashboard.service.IDsPartService;
 import org.springblade.desk.device.pojo.entity.FeiBaSetEntity;
@@ -46,6 +49,8 @@ import org.springblade.desk.order.service.IYieldOrderService;
 import org.springblade.desk.produce.mapper.WorkOrderMapper;
 import org.springblade.desk.produce.mapper.WorkPlanMapper;
 import org.springblade.desk.produce.pojo.dto.MesRbFilePreserveDetailDTO;
+import org.springblade.desk.produce.pojo.dto.PrintChildCheck;
+import org.springblade.desk.produce.pojo.dto.PrintChildCheckChild;
 import org.springblade.desk.produce.pojo.entity.*;
 import org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO;
 import org.springblade.desk.produce.service.IMesEquipmentCardService;
@@ -72,9 +77,12 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.fasterxml.jackson.databind.type.LogicalType.DateTime;
+
 /**
  * [检验任务] 服务实现类
  *
@@ -471,7 +479,17 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
 
         // 生产过程(放在获取检验记录下面，这个方法会排除数据)
         this.getNewProcess(wpList, jsonObj, planList);
-
+        if (moduleList.get(3)) {
+            // 审理单记录
+//            PrWorkOrder wor = this.getByKey(woId);
+//            PjYieldOrder yo = wo.getPjYieldOrder();
+//            jsonObj.put("modelFive", qcReviewSheetDao.getQcReviewSheetList(yo.getPartCode(), yo.getBatchNo()));
+            jsonObj.put("modelFive", null);
+        }
+        if (moduleList.get(2)) {
+            // 镀后入库记录
+            jsonObj.put("modelFour", wpList.get(wpList.size() - 1));
+        }
         return jsonObj;
     }
 
@@ -486,6 +504,9 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
 //        }
         List<WorkPlan> workPlanList = new ArrayList<>();
         for (int i = 0; i < newWpList.size(); i++) {
+//            if(i == modelFlag.size()-1){
+//                break;
+//            }
             if (modelFlag.get(i)) {
                 WorkPlan prWorkPlan = newWpList.get(i);
                 this.getProcessByWp(prWorkPlan);
@@ -516,9 +537,9 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
             if (process.getName().equals("固溶")) {
                 slotList = workPlanMapper.listSlotInfoGr(workPlan.getId(), Boolean.FALSE);
             } else {
-                slotList = workPlanMapper.listSlotInfo(workPlan.getId(), Boolean.TRUE);
+                slotList = workPlanMapper.listSlotInfoList(workPlan.getId(), Boolean.TRUE);
                 if (slotList == null || slotList.size() == 0) {
-                    slotList = workPlanMapper.listSlotInfo(workPlan.getId(), Boolean.FALSE);
+                    slotList = workPlanMapper.listSlotInfoList(workPlan.getId(), Boolean.FALSE);
                 }
             }
             // 2025-07-23 线上迁移修改 删除了prMacToolUseService.listSlotInfo方法调用
@@ -570,20 +591,20 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
             }
         }
 
-        Object[] obs = workPlanMapper.getConcatMrByWpId(workPlan.getId());
-        if (obs.length > 0) {
+        WorkPlan plan = workPlanMapper.getConcatMrByWpId(workPlan.getId());
+        if (null != plan) {
             // 色标数据
-            workPlan.setFlagQty(Double.valueOf(obs[0].toString()));
-            workPlan.setFlagColourOne(obs[1].toString());
-            workPlan.setFlagColourTwo(obs[2].toString());
-            workPlan.setFlagInk(obs[3].toString());
-            workPlan.setFlagMatter(obs[4].toString());
+            workPlan.setFlagQty(Double.valueOf(plan.getFlagQty().toString()));
+            workPlan.setFlagColourOne(plan.getFlagColourOne().toString());
+            workPlan.setFlagColourTwo(plan.getFlagColourTwo().toString());
+            workPlan.setFlagInk(plan.getFlagInk().toString());
+            workPlan.setFlagMatter(plan.getFlagMatter().toString());
             // 色带数据
-            workPlan.setBeltQty(Double.valueOf(obs[5].toString()));
-            workPlan.setBeltColourOne(obs[6].toString());
-            workPlan.setBeltColourTwo(obs[7].toString());
-            workPlan.setBeltInk(obs[8].toString());
-            workPlan.setBeltMatter(obs[9].toString());
+            workPlan.setBeltQty(Double.valueOf(plan.getBeltQty().toString()));
+            workPlan.setBeltColourOne(plan.getBeltColourOne().toString());
+            workPlan.setBeltColourTwo(plan.getBeltColourTwo().toString());
+            workPlan.setBeltInk(plan.getBeltInk().toString());
+            workPlan.setBeltMatter(plan.getBeltMatter().toString());
         }
 
         List<MesQcProduceRunEntity> qcProduceRunsList;
@@ -635,7 +656,7 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
                             qcProduceRunsList = workPlanMapper.listPrByWpIdIndexAndMtnCode(workPlan.getId(), 1, prMacToolUseItem.getMtnCode());
                             // 烘箱信息（从设备，工装使用记录获取）
 //                            boxInfo = workPlanMapper.getBoxInfoByWpIdMtnCode(workPlan.getId());
-                            List<MesQcProduceRunEntity> runs = workPlanMapper.getBoxInfoByWpIdMtnCode(workPlan.getId());
+                            List<MesQcProduceRunEntity> runs = workPlanMapper.getBoxInfoByWpIdMtnCodeList(workPlan.getId());
                             if(runs != null && runs.size() > 0){
                                 boxInfo = runs.get(0);
                             }
@@ -661,105 +682,115 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
 
                 //1111111111111111111111111111111111111111111111
 
-//                // 根据电子档案维护组装数据(自动)
-//                prMacToolUse = prMacToolUseService.getDataByWpIdAndIndex(workPlan.getWpId(), "2");
-//                if (prMacToolUse != null && prMacToolUse.getMtuId() != null) {
-//                    // 获取模板数据
-//                    List<DsRbFilePreserve> dsRbFilePreserveList = null;
-//                    if (workPlan.getProcedureSet() != null &&
-//                            ("喷砂".equals(workPlan.getProcedureSet().getPpsName()) || "涂色标".equals(workPlan.getProcedureSet().getPpsName()))) {
-//                        dsRbFilePreserveList = dsRbFilePreserveService.getDataByWcIdAndPpsId(null,
-//                                workPlan.getProcedureSet().getPpsId(), Boolean.TRUE);
-//                    } else {
-//                        dsRbFilePreserveList = dsRbFilePreserveService.getDataByWcIdAndPpsId(bsCenterTeam.getBsWorkCenter().getWcId(),
-//                                workPlan.getProcedureSet().getPpsId(), Boolean.TRUE);
-//                    }
-//                    if (dsRbFilePreserveList != null && dsRbFilePreserveList.size() > 0) {
-//                        preserveSlotList = dsRbFilePreserveSlotService.getByRfpId(dsRbFilePreserveList.get(0).getRfpId());
-//                        qcProduceRunsList = qcProduceRunService.listPrByWpIdIndex(workPlan.getWpId(), 2, Boolean.TRUE);
-//
-//                        // 烘箱信息（从设备，工装使用记录获取）
-//                        boxInfo = prMacToolUseService.getBoxInfoByWpIdMtnCode(workPlan.getWpId());
-//                        if (qcProduceRunsList != null && qcProduceRunsList.size() > 0 && StringUtils.isNotBlank(boxInfo.getInDate())) {
-//                            qcProduceRunsList.add(boxInfo);
-//                        }
-//                        if (qcProduceRunsList != null && qcProduceRunsList.size() > 0) {
-//                            //验证qc中重复槽子
-////                            Boolean checkQcRepeat = this.checkQcRepeat(qcProduceRunsList);
-////                            if (checkQcRepeat) {
-////                                //返镍排序
-////                                this.setRbFilePreserveDataFn(preserveSlotList, qcProduceRunsList, workPlan,
-////                                        dsRbFilePreserveSlotList, prMacToolUse);
-////                            } else {
-//                            // cdl 20250218 修改分槽同一槽号连续出现
-//                            this.setRbFilePreserveData(preserveSlotList, qcProduceRunsList, workPlan,
-//                                    dsRbFilePreserveSlotList, prMacToolUse);
-////                            }
-//
-//                            // cdl
-//                            if (!(num > 0)) {
-//                                workPlan.setTotalPreserve(workPlan.getTotalPreserve() + 1);
+                // 根据电子档案维护组装数据(自动)
+                prMacToolUse = workPlanMapper.getDataByWpIdAndIndex(workPlan.getId(), "2");
+                if (prMacToolUse != null && prMacToolUse.getId() != null) {
+                    // 获取模板数据
+                    List<DsRbFilePreserve> dsRbFilePreserveList = null;
+                    if (workPlan.getPpsId() != null){
+                        BsProcessSetEntity process = processSetService.getById(workPlan.getPpsId());
+                        if("喷砂".equals(process.getName()) || "涂色标".equals(process.getName())) {
+                            dsRbFilePreserveList = workPlanMapper.getDataByWcIdAndPpsId(null,
+                                    workPlan.getPpsId(), Boolean.TRUE);
+                        } else {
+                            dsRbFilePreserveList = workPlanMapper.getDataByWcIdAndPpsId(bsCenterTeam.getWcId(),
+                                    workPlan.getPpsId(), Boolean.TRUE);
+                        }
+                    }
+
+                    if (dsRbFilePreserveList != null && dsRbFilePreserveList.size() > 0) {
+                        preserveSlotList = workPlanMapper.getByRfpId(dsRbFilePreserveList.get(0).getId());
+                        qcProduceRunsList = workPlanMapper.listPrByWpIdIndex(workPlan.getId(), 2, Boolean.TRUE);
+                        List<MesQcProduceRunEntity> runs = workPlanMapper.getBoxInfoByWpIdMtnCodeList(workPlan.getId());
+                        if(runs != null && runs.size() > 0){
+                            boxInfo = runs.get(0);
+                        }
+                        // 烘箱信息（从设备，工装使用记录获取）
+//                        boxInfo = workPlanMapper.getBoxInfoByWpIdMtnCode(workPlan.getId());
+                        if (qcProduceRunsList != null && qcProduceRunsList.size() > 0 && StringUtils.isNotBlank(boxInfo.getInDate())) {
+                            qcProduceRunsList.add(boxInfo);
+                        }
+                        if (qcProduceRunsList != null && qcProduceRunsList.size() > 0) {
+                            //验证qc中重复槽子
+//                            Boolean checkQcRepeat = this.checkQcRepeat(qcProduceRunsList);
+//                            if (checkQcRepeat) {
+//                                //返镍排序
+//                                this.setRbFilePreserveDataFn(preserveSlotList, qcProduceRunsList, workPlan,
+//                                        dsRbFilePreserveSlotList, prMacToolUse);
+//                            } else {
+                            // cdl 20250218 修改分槽同一槽号连续出现
+                            this.setRbFilePreserveData(preserveSlotList, qcProduceRunsList, workPlan,
+                                    dsRbFilePreserveSlotList, prMacToolUse);
 //                            }
-//                            num += 1;
-//                        }
-//                    }
-//                    // 获取额外面积数据
-//                    BsAdditionalMess dataByMtuCode = bsAdditionalMessDao.getDataByOneData(prMacToolUse.getMtnCode(), BsAdditionalMess.TYPE_ONE);
-//                    workPlan.setBsAdditionalMess(dataByMtuCode);
-//                }
+
+                            // cdl
+                            if (!(num > 0)) {
+                                workPlan.setTotalPreserve(workPlan.getTotalPreserve() + 1);
+                            }
+                            num += 1;
+                        }
+                    }
+                    // 获取额外面积数据
+                    MesBsAdditionalMessEntity dataByMtuCode = workPlanMapper.getDataByOneData(prMacToolUse.getMtnCode(), MesBsAdditionalMessEntity.TYPE_ONE);
+                    workPlan.setBsAdditionalMess(dataByMtuCode);
+                }
 
 
 
                 //222222222222222222222222222222222222222222222
 
-//                // 根据电子档案维护组装数据(线下)
-////                prMacToolUse = prMacToolUseService.getDataByWpIdAndIndex(workPlan.getWpId(), "3");
-////                if (prMacToolUse != null && prMacToolUse.getMtuId() != null) {
-////                    // 获取模板数据
-////                    preserveSlotList = dsRbFilePreserveSlotService.getByRfpId(Long.valueOf(prMacToolUse.getRfpId()));
-////                    qcProduceRunsList = qcProduceRunService.listPrByWpIdIndex(workPlan.getWpId(), 3, Boolean.FALSE);
-////                    // 烘箱信息（从设备，工装使用记录获取）
-////                    boxInfo = prMacToolUseService.getBoxInfoByWpIdMtnCode(workPlan.getWpId());
-////                    if (StringUtils.isNotBlank(boxInfo.getInDate())) {
-////                        qcProduceRunsList.add(boxInfo);
-////                    }
-////                    this.setRbFilePreserveData(preserveSlotList, qcProduceRunsList, workPlan, dsRbFilePreserveSlotList);
-////                    //zxh 20241231 注释下方代码
-//////                    if (qcProduceRunsList != null && qcProduceRunsList.size() > 0) {
-//////                        workPlan.setTotalPreserve(workPlan.getTotalPreserve() + 1);
-//////                    }
-////                }
-//                //zxh 20250117 解决单工序绑定两个手动记录只显示一个问题
-//                List<PrMacToolUse> prMacToolUseList = prMacToolUseService.getDataByWpIdAndIndexList(workPlan.getWpId(), "3");
-//                if (prMacToolUseList != null && prMacToolUseList.size() > 0) {
-//                    for (PrMacToolUse prMacToolUseSd : prMacToolUseList) {
-//                        if (prMacToolUseSd != null && prMacToolUseSd.getMtuId() != null) {
-//                            // 获取模板数据
-//                            preserveSlotList = dsRbFilePreserveSlotService.getByRfpId(Long.valueOf(prMacToolUseSd.getRfpId()));
-//                            qcProduceRunsList = qcProduceRunService.listPrByWpIdIndexAndMtnCode(workPlan.getWpId(), 3, prMacToolUseSd.getMtnCode());
-//                            // 烘箱信息（从设备，工装使用记录获取）
-//                            boxInfo = prMacToolUseService.getBoxInfoByWpIdMtnCode(workPlan.getWpId());
-//                            if (StringUtils.isNotBlank(boxInfo.getInDate())) {
-//                                qcProduceRunsList.add(boxInfo);
-//                            }
-//
-//                            if (qcProduceRunsList != null && qcProduceRunsList.size() > 0) {
-//
-//                                // cdl 20250218 修改分槽同一槽号连续出现
-//                                this.setRbFilePreserveData(preserveSlotList, qcProduceRunsList, workPlan,
-//                                        dsRbFilePreserveSlotList, prMacToolUseSd);
-//                                if (!(num > 0)) {
-//                                    workPlan.setTotalPreserve(workPlan.getTotalPreserve() + 1);
-//                                }
-//                            }
-//                        }
+                // 根据电子档案维护组装数据(线下)
+//                prMacToolUse = prMacToolUseService.getDataByWpIdAndIndex(workPlan.getWpId(), "3");
+//                if (prMacToolUse != null && prMacToolUse.getMtuId() != null) {
+//                    // 获取模板数据
+//                    preserveSlotList = dsRbFilePreserveSlotService.getByRfpId(Long.valueOf(prMacToolUse.getRfpId()));
+//                    qcProduceRunsList = qcProduceRunService.listPrByWpIdIndex(workPlan.getWpId(), 3, Boolean.FALSE);
+//                    // 烘箱信息（从设备，工装使用记录获取）
+//                    boxInfo = prMacToolUseService.getBoxInfoByWpIdMtnCode(workPlan.getWpId());
+//                    if (StringUtils.isNotBlank(boxInfo.getInDate())) {
+//                        qcProduceRunsList.add(boxInfo);
 //                    }
+//                    this.setRbFilePreserveData(preserveSlotList, qcProduceRunsList, workPlan, dsRbFilePreserveSlotList);
+//                    //zxh 20241231 注释下方代码
+////                    if (qcProduceRunsList != null && qcProduceRunsList.size() > 0) {
+////                        workPlan.setTotalPreserve(workPlan.getTotalPreserve() + 1);
+////                    }
 //                }
+                //zxh 20250117 解决单工序绑定两个手动记录只显示一个问题
+                List<MacToolUse> prMacToolUseList = workPlanMapper.getDataByWpIdAndIndexList(workPlan.getId(), "3");
+                if (prMacToolUseList != null && prMacToolUseList.size() > 0) {
+                    for (MacToolUse prMacToolUseSd : prMacToolUseList) {
+                        if (prMacToolUseSd != null && prMacToolUseSd.getId() != null) {
+                            // 获取模板数据
+                            preserveSlotList = workPlanMapper.getByRfpId(Long.valueOf(prMacToolUseSd.getRfpId()));
+                            qcProduceRunsList = workPlanMapper.listPrByWpIdIndexAndMtnCode(workPlan.getId(), 3, prMacToolUseSd.getMtnCode());
+                            // 烘箱信息（从设备，工装使用记录获取）
+//                            boxInfo = prMacToolUseService.getBoxInfoByWpIdMtnCode(workPlan.getId());
 
+                            List<MesQcProduceRunEntity> runs = workPlanMapper.getBoxInfoByWpIdMtnCodeList(workPlan.getId());
+                            if(runs != null && runs.size() > 0){
+                                boxInfo = runs.get(0);
+                            }
 
+                            if (StringUtils.isNotBlank(boxInfo.getInDate())) {
+                                qcProduceRunsList.add(boxInfo);
+                            }
+
+                            if (qcProduceRunsList != null && qcProduceRunsList.size() > 0) {
+
+                                // cdl 20250218 修改分槽同一槽号连续出现
+                                this.setRbFilePreserveData(preserveSlotList, qcProduceRunsList, workPlan,
+                                        dsRbFilePreserveSlotList, prMacToolUseSd);
+                                if (!(num > 0)) {
+                                    workPlan.setTotalPreserve(workPlan.getTotalPreserve() + 1);
+                                }
+                            }
+                        }
+                    }
+                }
             }
 
-//            workPlan.setDsRbFilePreserveSlotList(dsRbFilePreserveSlotList);
+            workPlan.setDsRbFilePreserveSlotList(dsRbFilePreserveSlotList);
         }
 
 
@@ -1277,6 +1308,369 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
         return task;
     }
 
+    private JSONObject glassCake(Long woId) {
+        JSONObject obj = new JSONObject();
+        // 子件订单信息
+        WorkOrder prWorkOrder =workOrderMapper.selectById(woId);
+        YieldOrder yieldOrder = yieldOrderMapper.selectById(prWorkOrder.getYoId());
+//        DsPartEntity dsPart = dsPartService.getByPartCode(prWorkOrder.getPjYieldOrder().getPartCode());
+        QueryWrapper<DsPartEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("part_code", yieldOrder.getPartCode());
+        List<DsPartEntity> dsPartList = partService.list(queryWrapper);
+        DsPartEntity dsPart = new DsPartEntity();
+        if(null != dsPartList && dsPartList.size() > 0){
+            dsPart = dsPartList.get(0);
+        }
+
+        // 获取工序
+        List<WorkPlan> prWorkPlanList = workPlanMapper.listByWoIdAllMes(prWorkOrder.getId());
+        obj.put("prWorkOrder", prWorkOrder);
+        obj.put("dsPart", dsPart);
+        List<WorkPlanItem> prWorkPlanItems;
+        List<PrintChildCheck> printChildCheckList = new ArrayList<>();
+        for (WorkPlan prWorkPlan : prWorkPlanList) {
+
+//            // 同槽信息
+//            List<QcSlotInfo> slotList = prMacToolUseService.listSjSlotInfo(prWorkPlan.getWpId(), Boolean.FALSE);
+//            prWorkPlan.setSlotList(slotList);
+//
+//            // 设备绑定记录
+//            List<QcProduceRun> prList = qcProduceRunService.listPrByWpId(prWorkPlan.getWpId());
+//            prWorkPlan.setPrList(prList);
+
+            this.getProcessByWp(prWorkPlan);
+            prWorkPlanItems = workPlanMapper.listByWpIdMes(prWorkPlan.getId());
+            if (prWorkPlanItems != null && prWorkPlanItems.size() > 0) {
+                PrintChildCheck printChildCheck;
+                for (WorkPlanItem prWorkPlanItem : prWorkPlanItems) {
+                    printChildCheck = new PrintChildCheck();
+//                    printChildCheck.setTestOrders(prWorkPlanItem.getTrialNo());
+//                    printChildCheck.setTestName(prWorkPlanItem.getTrialItem());
+//                    printChildCheck.setTrialStandard(prWorkPlanItem.getTrialStandard());
+                    printChildCheck.setTestOrders(prWorkPlanItem.getItemCode());
+                    printChildCheck.setTestName(prWorkPlanItem.getItemName());
+                    printChildCheck.setTrialStandard(prWorkPlanItem.getStandardName());
+                    printChildCheck.setCheckResult(prWorkPlanItem.getCheckResult() == -1 ? "未检验" : prWorkPlanItem.getCheckResult() == 1 ? "合格" :
+                            prWorkPlanItem.getCheckResult() == 2 ? "不合格" : prWorkPlanItem.getCheckResult() == 3 ? "NA" : "");
+                    if (prWorkPlanItem.getCheckUserId() != null) {
+                        R<User> user = userClient.userInfoById(prWorkPlanItem.getCheckUserId());
+                        if(null != user && null != user.getData()){
+                            printChildCheck.setCheckName(user.getData().getRealName());
+                        }
+                    }
+
+                    if (prWorkPlanItem.getCheckDate() != null) {
+                        printChildCheck.setCheckDate(prWorkPlanItem.getCheckDate().toString());
+                    }
+                    printChildCheckList.add(printChildCheck);
+                }
+                prWorkPlan.setPrintChildCheck(printChildCheckList);
+            }
+        }
+        obj.put("prWorkPlanList", prWorkPlanList);
+        return obj;
+    }
+
+    private List<WorkOrder> checkOrderSj(WorkOrder prWorkOrder) {
+        //B号为空则直接跳过
+        YieldOrder yieldOrder = yieldOrderMapper.selectById(prWorkOrder.getYoId());
+        if (StringUtils.isBlank(yieldOrder.getRoamNo())) {
+            return null;
+        }
+        //非烧结零件跳过子件验证
+        if (!yieldOrder.getYieldType().equals(YieldOrder.YIELD_TYPE_2)) {
+            return null;
+        }
+
+//        String roamNoText = dsPartService.findNameByRoamNo(prWorkOrder.getPjYieldOrder().getPartCode(), prWorkOrder.getPjYieldOrder().getRoamNo());
+//        if (StringUtils.isBlank(roamNoText)) {
+//            return null;
+//        }
+//
+//        //如果部件b号不带有封接字样， 则不显示子件
+//        if (!roamNoText.contains("封接")) {
+//            return null;
+//        }
+
+        //获取到所有除玻璃饼外的其他子件车间订单
+        List<WorkOrder> subList = workPlanMapper.findCubByYoIdMes(yieldOrder.getId());
+        //获取到部件下面的玻璃饼信息
+        List<DsPartRelationEntity> dpsList = workPlanMapper.listByPartCodeNew(yieldOrder.getPartCode(), DsPartSub.SIN_TER_TYPE_BLB);
+        if (dpsList != null && dpsList.size() > 0) {
+            List<WorkOrder> blbList;
+            for (DsPartRelationEntity dps : dpsList) {
+                blbList = workPlanMapper.findByPartCodeAndMemoMes(dps.getChildPartCode(), yieldOrder.getYpCode());
+                subList.addAll(blbList);
+            }
+        }
+        return subList;
+    }
+
+    private JSONObject glassSealing(Long woId, List<Boolean> planList, List<Boolean> moduleList) {
+        JSONObject obj = new JSONObject();
+        // 订单信息
+        WorkOrder prWorkOrder =workOrderMapper.selectById(woId);
+
+        List<WorkOrder> subPrWorkOrderList = this.checkOrderSj(prWorkOrder);
+        YieldOrder yieldOrder = yieldOrderMapper.selectById(prWorkOrder.getYoId());
+//        DsPartEntity dsPart = dsPartService.getByPartCode(prWorkOrder.getPjYieldOrder().getPartCode());
+        QueryWrapper<DsPartEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("part_code", yieldOrder.getPartCode());
+        List<DsPartEntity> dsPartList = partService.list(queryWrapper);
+        DsPartEntity dsPart = new DsPartEntity();
+        if(null != dsPartList && dsPartList.size() > 0){
+            dsPart = dsPartList.get(0);
+        }
+        obj.put("prWorkOrder", prWorkOrder);
+        obj.put("dsPart", dsPart);
+        JSONArray sunPrWorkOrderList = new JSONArray();
+        DsPartSub dsPartSub;
+        if (subPrWorkOrderList != null && subPrWorkOrderList.size() > 0) {
+            for (WorkOrder workOrder : subPrWorkOrderList) {
+                JSONObject sub = new JSONObject();
+                dsPartSub = workPlanMapper.getByPartCodeAndSubCodeMes(dsPart.getPartCode(), yieldOrder.getPartCode());
+                if (dsPartSub != null) {
+                    sub.put("batchNo", workOrder.getBatchNo());//批次号
+                    sub.put("makeQty", workOrder.getMakeQty());//数量
+                    sub.put("yieldType", dsPartSub.getSinTerType());//零件类型
+                    sub.put("partCode", dsPartSub.getSubCode());//零件号
+                    sub.put("material", dsPartSub.getMaterial());//材料
+                    sub.put("plate", dsPartSub.getPlate());//镀种
+                    if (dsPartSub.getArea() != null && dsPartSub.getQuota() != null) {
+                        sub.put("poArea", String.valueOf(dsPartSub.getArea() * dsPartSub.getQuota()));//面积
+                    }
+                }
+                sunPrWorkOrderList.add(sub);
+            }
+        }
+        obj.put("sunPrWorkOrderList", sunPrWorkOrderList);
+
+        // 获取工序
+        List<WorkPlan> prWorkPlanList = workPlanMapper.listByWoIdAllMes(prWorkOrder.getId());
+        List<WorkPlan> newPrWorkPlanList = new ArrayList<>();
+        List<WorkPlanItem> prWorkPlanItems;
+        List<PrintChildCheck> printChildCheckList;
+        for (int i = 0; i < prWorkPlanList.size(); i++) {
+            if (planList.get(i)) {
+                WorkPlan prWorkPlan = prWorkPlanList.get(i);
+                this.getProcessByWp(prWorkPlan);
+
+                prWorkPlanItems = workPlanMapper.listByWpIdMes(prWorkPlan.getId());
+
+                printChildCheckList = new ArrayList<>();
+                this.getCheckListDetail(printChildCheckList, prWorkPlanItems, true);
+                prWorkPlan.setPrintChildCheck(printChildCheckList);
+                newPrWorkPlanList.add(prWorkPlan);
+            }
+        }
+        obj.put("prWorkPlanList", newPrWorkPlanList);
+        if (moduleList.get(0)) {
+            // 审理单记录
+//            YieldOrder yo = prWorkOrder.getPjYieldOrder();
+            obj.put("qcReviewSheetList", workPlanMapper.getQcReviewSheetListMes(yieldOrder.getPartCode(), yieldOrder.getBatchNo()));
+        }
+        return obj;
+    }
+    public List<PrintChildCheck> getCheckListDetail(List<PrintChildCheck> checkList, List<WorkPlanItem> piLst, Boolean eleOrPrint) {
+
+        if (piLst != null && piLst.size() > 0) {
+            //开始组装检验项map
+            Map<String, PrintChildCheck> ccMap = new LinkedHashMap<>();
+            PrintChildCheck cc;
+
+            Map<String, List<PrintChildCheckChild>> piMap = new LinkedHashMap<>();
+            List<PrintChildCheckChild> lst;
+
+            for (WorkPlanItem pi : piLst) {
+
+                lst = piMap.get(pi.getItemCode());
+                WorkPlan plan = workPlanMapper.selectById(pi.getWpId());
+                String testOrder = plan.getOrders() + "-" + pi.getItemCode();
+                if (lst == null || lst.size() == 0) {
+                    //组装检验小项集合
+                    lst = new ArrayList<>();
+                    piMap.put(testOrder, lst);
+                    //组装打印检验大项集合
+                    cc = new PrintChildCheck();
+                    cc.setTestOrders(testOrder);
+                    if (pi.getCheckQty() != null && pi.getCheckQty() > 0) {
+                        cc.setCheckQty(pi.getCheckQty().toString());
+                    }
+                    // 230310新增试验数量
+                    cc.setTestQty(pi.getTestQty() != null && pi.getTestQty() > 0 ? pi.getTestQty().toString() : "");
+                    // 检验结果
+                    if(0==pi.getCheckResult()){
+                        cc.setCheckResult("未检验");
+                    }
+                    if(1==pi.getCheckResult()){
+                        cc.setCheckResult("合格");
+                    }
+                    if(2==pi.getCheckResult()){
+                        cc.setCheckResult("不合格");
+                    }
+                    if(-1==pi.getCheckResult()){
+                        cc.setCheckResult("NA");
+                    }
+//                    cc.setCheckResult(!"未检验".equals(pi.getCheckResult()) ? pi.getCheckResult() : null);
+
+                    if (pi.getCheckUserId() != null) {
+                        R<User> user = userClient.userInfoById(pi.getCheckUserId());
+                        String userName = user.getData().getAccount();
+                        if(null != user && user.getData() != null){
+                            cc.setCheckName(user.getData().getRealName());
+                        }
+                        //zxh 20250212 从nerp获取检验员印章
+                        String checkManByNewErp = workPlanMapper.getCheckManByNewErpMes(userName);
+
+
+
+                        if (eleOrPrint) {
+                            cc.setImgUrl(checkManByNewErp);
+                        } else {
+                            if (checkManByNewErp != null && checkManByNewErp.indexOf("base64,") > 0) {
+                                String checkManByNewErpSubString = checkManByNewErp.substring(checkManByNewErp.indexOf("base64,") + 7);
+                                cc.setImgUrl(checkManByNewErpSubString);
+                            }
+                        }
+
+                        if(null != pi.getCheckDate()){
+                            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+                            String formattedDateTime = pi.getCheckDate().format(formatter);
+                            cc.setCheckDate(formattedDateTime);
+                        }
+                    }
+                    ccMap.put(testOrder, cc);
+                }
+                if ("厚度检测".equals(pi.getItemName())) {
+                    for (int i = 0; i < 3; i++) {
+                        lst.add(new PrintChildCheckChild(pi.getItemCode(), pi.getStandardName(), pi.getCheckValue(), pi.getWpId()));
+                    }
+                }
+                lst.add(new PrintChildCheckChild(pi.getItemCode(), pi.getStandardName(), pi.getCheckValue(), pi.getWpId()));
+            }
+
+            List<WorkPlanItemDetail> idLst;
+            for (Map.Entry<String, PrintChildCheck> entry : ccMap.entrySet()) {
+
+                cc = ccMap.get(entry.getKey());
+                if (cc != null) {
+                    lst = piMap.get(cc.getTestOrders());
+                    lst = lst.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(()
+                            -> new TreeSet<>(Comparator.comparing(i -> i.getWpiId()))), ArrayList::new));
+
+                    if (lst != null && lst.size() > 0) {
+                        for (PrintChildCheckChild ccc : lst) {
+                            idLst = workPlanMapper.listByWpiIdMes(ccc.getWpiId());
+                            if (idLst != null && idLst.size() > 0) {
+                                lst = new ArrayList<>();
+                                // 组装量具集合
+                                for (WorkPlanItemDetail itemDetail : idLst) {
+                                    if ("厚度检测".equals(itemDetail.getTrialItem())) {
+                                        cc.setDeviceCode(itemDetail.getGaugeValue8());
+                                        lst.add(new PrintChildCheckChild(itemDetail.getTrialItem(),
+                                                itemDetail.getTrialStandard(), itemDetail.getGaugeValueNotNUll(),
+                                                null));
+                                    } else if (itemDetail.getActMtId() != null) {
+                                        lst.add(new PrintChildCheckChild(itemDetail.getTrialItem(), itemDetail.getRuleSize(),
+                                                itemDetail.getGaugeValue1(), itemDetail.getWpiId()));
+                                        cc.setDeviceCode(itemDetail.getTools());
+                                        if (cc.getTrialStandard() != null) {
+                                            cc.setTrialStandard(cc.getTrialStandard() + ';' + itemDetail.getRuleSize());
+                                        } else {
+                                            cc.setTrialStandard(itemDetail.getRuleSize());
+                                        }
+                                        if (cc.getCheckResult() != null) {
+                                            cc.setCheckResult(cc.getCheckResult());
+                                        } else {
+                                            cc.setCheckResult(itemDetail.getGaugeValue1());
+                                        }
+                                    }
+                                }
+                            }
+                            cc.setCccList(lst);
+                            checkList.add(cc);
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        return checkList;
+    }
+
+    @Override
+    public Object pagePrintSjEleFiles(Long woId, Integer yieldType, List<Boolean> planList, List<Boolean> moduleList) {
+        if (yieldType == YieldOrder.YIELD_TYPE_4 || yieldType == YieldOrder.YIELD_TYPE_5) {
+            return this.metalParts(woId);
+        } else if (yieldType == YieldOrder.YIELD_TYPE_6) {  // 石墨模
+//            return this.graphiteMold(woId);
+            return this.metalParts(woId);
+        } else if (yieldType == YieldOrder.YIELD_TYPE_3) { // 玻璃饼
+            return this.glassCake(woId);
+        } else if (yieldType == YieldOrder.YIELD_TYPE_2) { // 玻璃封接部件
+            return this.glassSealing(woId, planList, moduleList);
+        }
+
+        return null;
+
+    }
+
+    private JSONObject metalParts(Long woId) {
+        JSONObject obj = new JSONObject();
+        // 子件订单信息
+        WorkOrder prWorkOrder = workOrderMapper.selectById(woId);
+        // 获取部件订单
+        List<WorkOrder> workOrderList = workPlanMapper.findFatherByYoIdMes(prWorkOrder.getYoId());
+
+        // 获取工序
+        List<WorkPlan> prWorkPlanList = workPlanMapper.listByWoIdAllMes(prWorkOrder.getId());
+        obj.put("prWorkOrder", prWorkOrder);
+        obj.put("workOrderList", workOrderList);
+        List<WorkPlanItem> prWorkPlanItems;
+        List<PrintChildCheck> printChildCheckList = new ArrayList<>();
+        for (WorkPlan prWorkPlan : prWorkPlanList) {
+
+            // 同槽信息
+            List<ProduceMonitorSlotListVO> slotList = workPlanMapper.listSjSlotInfoMes(prWorkPlan.getId(), Boolean.FALSE);
+            prWorkPlan.setSlotList(slotList);
+
+            // 设备绑定记录
+            List<MesQcProduceRunEntity> prList = workPlanMapper.listPrByWpId(prWorkPlan.getId());
+            prWorkPlan.setPrList(prList);
+
+            prWorkPlanItems = workPlanMapper.listByWpIdMes(prWorkPlan.getId());
+            if (prWorkPlanItems != null && prWorkPlanItems.size() > 0) {
+                PrintChildCheck printChildCheck;
+                for (WorkPlanItem prWorkPlanItem : prWorkPlanItems) {
+                    printChildCheck = new PrintChildCheck();
+//                    printChildCheck.setTestOrders(prWorkPlanItem.getTrialNo());
+//                    printChildCheck.setTestName(prWorkPlanItem.getTrialItem());
+//                    printChildCheck.setTrialStandard(prWorkPlanItem.getTrialStandard());
+
+                    printChildCheck.setTestOrders(prWorkPlanItem.getItemCode());
+                    printChildCheck.setTestName(prWorkPlanItem.getItemName());
+                    printChildCheck.setTrialStandard(prWorkPlanItem.getStandardName());
+
+                    printChildCheck.setCheckResult(prWorkPlanItem.getCheckResult() == -1 ? "未检验" : prWorkPlanItem.getCheckResult() == 1 ? "合格" :
+                            prWorkPlanItem.getCheckResult() == 2 ? "不合格" : prWorkPlanItem.getCheckResult() == 3 ? "NA" : "");
+                    if (prWorkPlanItem.getCheckUserId() != null) {
+                        R<User> user = userClient.userInfoById(prWorkPlanItem.getCheckUserId());
+                        if(null != user && null != user.getData()){
+                            printChildCheck.setCheckName(user.getData().getRealName());
+                        }
+                    }
+                    if (prWorkPlanItem.getCheckDate() != null) {
+                        printChildCheck.setCheckDate(prWorkPlanItem.getCheckDate().toString());
+                    }
+                    printChildCheckList.add(printChildCheck);
+                }
+                prWorkPlan.setPrintChildCheck(printChildCheckList);
+            }
+        }
+        obj.put("prWorkPlanList", prWorkPlanList);
+        return obj;
+    }
+
     public void addRsSheet(Long id) {
         InspectionTask task = getById(id);
         if (InspectionTaskConst.CHECK_RESULT_NG.equals(task.getCheckResult())) {

From 20bcb3cf9f813c591f02b7e9407a16d3125944b8 Mon Sep 17 00:00:00 2001
From: sunjianxi <839419401@qq.com>
Date: Wed, 18 Mar 2026 16:43:29 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=8E=92=E4=BA=A7=E5=BC=80=E5=8F=91-sjx?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dashboard/constant/BatchConstant.java     |   0
 .../dashboard/constant/DsCraftConstant.java   |   0
 .../dashboard/constant/DsPartConstant.java    |   2 +-
 .../dashboard/constant/TaskingConstant.java   |   0
 .../desk/order/pojo/enums/YieldOrderEnum.java |   1 +
 .../pojo/entity/EquipAbilityEntity.java       |  22 +-
 .../pojo/entity/EquipResourceEntity.java      |  23 +
 .../scheduling/pojo/entity/PartEntity.java    |  20 +-
 .../pojo/entity/PartRelationEntity.java       |  12 +-
 .../pojo/entity/PersonAbilityEntity.java      |   5 +-
 .../pojo/entity/WorkPlanEntity.java           |   3 +-
 .../pojo/entity/YieldOrderEntity.java         |   7 +-
 .../scheduling/pojo/enums/WorkOrderEnum.java  |  13 +-
 .../impl/DsBatchPreserveTaskServiceImpl.java  |   4 -
 .../service/impl/YieldOrderServiceImpl.java   |  16 +-
 .../service/impl/YieldPlanServiceImpl.java    |   4 +-
 .../controller/CertificateTypeController.java |   4 +
 .../controller/CraftAbilityController.java    |  36 +-
 .../controller/EquipAbilityController.java    |  54 +-
 .../controller/EquipmentController.java       |   4 +
 .../controller/MainProducerController.java    |   4 +
 .../OutsourceProcessController.java           |  29 +-
 .../controller/PersonAbilityController.java   |   4 +
 .../controller/SameTroughController.java      |  29 +-
 .../controller/SintTempCurveController.java   |  29 +-
 .../scheduling/mapper/PartMapper.java         |   3 +-
 .../scheduling/mapper/PartMapper.xml          |   8 +-
 .../scheduling/mapper/PartVersionMapper.java  |  41 +
 .../scheduling/mapper/PartVersionMapper.xml   |  24 +
 .../scheduling/service/IPartService.java      |   3 +-
 .../service/IPartVersionService.java          |  42 +
 .../impl/EquipResourceServiceImpl.java        | 129 +--
 .../service/impl/PartServiceImpl.java         |  12 +-
 .../service/impl/PartsVersionServiceImpl.java |  47 +
 .../impl/PersonResourceServiceImpl.java       |  39 +-
 .../service/impl/WorkOrderServiceImpl.java    | 832 +++++++++++++++---
 .../scheduling/vo/EquipAbilityVO.java         |   4 +
 .../scheduling/vo/PersonAbilityVO.java        |   4 +
 38 files changed, 1186 insertions(+), 327 deletions(-)
 rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/constant/BatchConstant.java (100%)
 rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/constant/DsCraftConstant.java (100%)
 rename blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/constant/DsPartConst.java => blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/constant/DsPartConstant.java (92%)
 rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/dashboard/constant/TaskingConstant.java (100%)
 create mode 100644 blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PartVersionMapper.java
 create mode 100644 blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PartVersionMapper.xml
 create mode 100644 blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IPartVersionService.java
 create mode 100644 blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/PartsVersionServiceImpl.java

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/constant/BatchConstant.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/constant/BatchConstant.java
similarity index 100%
rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/constant/BatchConstant.java
rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/constant/BatchConstant.java
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/constant/DsCraftConstant.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/constant/DsCraftConstant.java
similarity index 100%
rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/constant/DsCraftConstant.java
rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/constant/DsCraftConstant.java
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/constant/DsPartConst.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/constant/DsPartConstant.java
similarity index 92%
rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/constant/DsPartConst.java
rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/constant/DsPartConstant.java
index deed7ce66..b36baa61d 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/constant/DsPartConst.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/constant/DsPartConstant.java
@@ -4,7 +4,7 @@ package org.springblade.desk.dashboard.constant;
  * @author lqk
  * @date 2025-12-05 16:51
  */
-public interface DsPartConst {
+public interface DsPartConstant {
 	//region 烧结子件种类
 	/**
 	 * 插针
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/constant/TaskingConstant.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/constant/TaskingConstant.java
similarity index 100%
rename from blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/constant/TaskingConstant.java
rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/constant/TaskingConstant.java
diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/YieldOrderEnum.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/YieldOrderEnum.java
index ffe363c93..6337edcff 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/YieldOrderEnum.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/YieldOrderEnum.java
@@ -29,6 +29,7 @@ public enum YieldOrderEnum {
 	STATUS_PROCESSING("加工中", 10005),
 	STATUS_PROCESS_ERROR("排产异常", 10006),
 	STATUS_RECOVER("数据恢复", 10007),
+	STATUS_OUTSOURCING_WAITING("外协后待排产", 10008),
 	STATUS_COMPLETED("已完工", 10015),
 	STATUS_CLOSED("已关闭", 10021),
 
diff --git a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/EquipAbilityEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/EquipAbilityEntity.java
index a293b7d82..9c1f22b21 100644
--- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/EquipAbilityEntity.java
+++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/EquipAbilityEntity.java
@@ -28,7 +28,6 @@ package org.springblade.scheduling.pojo.entity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.NullSerializer;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -99,8 +98,7 @@ public class EquipAbilityEntity extends BaseEntity {
 	 * 额定加工能力
 	 */
 	@Schema(description = "额定加工能力")
-	@JsonSerialize(nullsUsing = NullSerializer.class)
-	private BigDecimal standardProcessAbility;
+	private String standardProcessAbility;
 
 	/**
 	 * 额定工时（分钟）
@@ -141,4 +139,22 @@ public class EquipAbilityEntity extends BaseEntity {
 	@Schema(description = "备注")
 	private String remarks;
 
+	/**
+	 * 工序编码
+	 */
+	@Schema(description = "工序编码")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+	private Long processId;
+
+	/**
+	 * 工序名称
+	 */
+	@Schema(description = "工序名称")
+	private String processName;
+
+	/**
+	 * 零件类型
+	 */
+	private Integer partType;
+
 }
diff --git a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/EquipResourceEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/EquipResourceEntity.java
index 48e23277e..ff7a7a6a5 100644
--- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/EquipResourceEntity.java
+++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/EquipResourceEntity.java
@@ -27,6 +27,8 @@ package org.springblade.scheduling.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.NullSerializer;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -159,7 +161,28 @@ public class EquipResourceEntity extends BaseEntity {
 
 	private Integer isDeleted;
 
+	/**
+	 * 工序编码
+	 */
+	@Schema(description = "工序编码")
+	@JsonSerialize(nullsUsing = NullSerializer.class)
+	private Long processId;
+
+	/**
+	 * 工序名称
+	 */
+	@Schema(description = "工序名称")
+	private String processName;
 
+	/**
+	 * 开始值
+	 */
+	private Integer startNum;
+
+	/**
+	 * 结束值
+	 */
+	private Integer endNum;
 
 
 }
diff --git a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/PartEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/PartEntity.java
index e805892f4..5f423f43e 100644
--- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/PartEntity.java
+++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/PartEntity.java
@@ -25,15 +25,15 @@
  */
 package org.springblade.scheduling.pojo.entity;
 
-import lombok.Data;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
-import java.math.BigDecimal;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
-import org.springblade.core.tenant.mp.TenantEntity;
+
 import java.io.Serial;
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 零件信息表 实体类
@@ -291,4 +291,14 @@ public class PartEntity extends BaseEntity {
 	@Schema(description = "审核人")
 	private String reviewUser;
 
+
+	@Schema(name = "玻璃饼直径")
+	private Double blbDiameter;
+
+	@Schema(name = "壳体最大外径")
+	private Double externalDiameter;
+
+	@Schema(name = "定额")
+	private Double quota;
+
 }
diff --git a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/PartRelationEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/PartRelationEntity.java
index a82584fd1..d702b844b 100644
--- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/PartRelationEntity.java
+++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/PartRelationEntity.java
@@ -25,14 +25,12 @@
  */
 package org.springblade.scheduling.pojo.entity;
 
-import lombok.Data;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.math.BigDecimal;
-import java.util.Date;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
-import org.springblade.core.tenant.mp.TenantEntity;
+
 import java.io.Serial;
 
 /**
@@ -54,7 +52,7 @@ public class PartRelationEntity extends BaseEntity {
 	 * 部件ID
 	 */
 	@Schema(description = "部件ID")
-	private BigDecimal partId;
+	private Long partId;
 	/**
 	 * 部件号
 	 */
@@ -64,7 +62,7 @@ public class PartRelationEntity extends BaseEntity {
 	 * 子件ID
 	 */
 	@Schema(description = "子件ID")
-	private BigDecimal childPartId;
+	private Long childPartId;
 	/**
 	 * 子件号
 	 */
diff --git a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/PersonAbilityEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/PersonAbilityEntity.java
index d532c5bdb..311efef0b 100644
--- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/PersonAbilityEntity.java
+++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/PersonAbilityEntity.java
@@ -94,7 +94,7 @@ public class PersonAbilityEntity extends BaseEntity {
 	 * 额定工时（分钟/每人每个）
 	 */
 	@Schema(description = "额定工时（分钟/每人每个）")
-	private BigDecimal standardTime;
+	private String standardTime;
 
 	/**
 	 * 准备工时（分钟）
@@ -123,4 +123,7 @@ public class PersonAbilityEntity extends BaseEntity {
 	 */
 	private String productIdent;
 
+	private Integer partType;
+
+
 }
diff --git a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/WorkPlanEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/WorkPlanEntity.java
index 0bd714cf2..aadb1f495 100644
--- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/WorkPlanEntity.java
+++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/WorkPlanEntity.java
@@ -34,7 +34,6 @@ import org.springblade.core.mp.base.BaseEntity;
 import java.io.Serial;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * 车间作业计划 实体类
@@ -97,7 +96,7 @@ public class WorkPlanEntity extends BaseEntity {
 	 * 工时定额
 	 */
 	@Schema(description = "工时定额")
-	private BigDecimal hourQuota;
+	private Double hourQuota;
 	/**
 	 * 计划开始
 	 */
diff --git a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/YieldOrderEntity.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/YieldOrderEntity.java
index 9cfd44be2..9a8e70d90 100644
--- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/YieldOrderEntity.java
+++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/entity/YieldOrderEntity.java
@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import org.springblade.core.mp.base.BaseEntity;
 import org.springblade.core.tenant.mp.TenantEntity;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -61,6 +60,12 @@ public class YieldOrderEntity extends TenantEntity {
 	@TableField(value = "PART_NAME")
 	private String partName;
 
+	/**
+	 * 零件号版本号
+	 */
+	@TableField(value = "PART_VERSION")
+	private String partVersion;
+
 	/**
 	 * 镀种
 	 */
diff --git a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/enums/WorkOrderEnum.java b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/enums/WorkOrderEnum.java
index c8e7438c0..022a2438d 100644
--- a/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/enums/WorkOrderEnum.java
+++ b/blade-service-api/blade-scheduling-api/src/main/java/org/springblade/scheduling/pojo/enums/WorkOrderEnum.java
@@ -27,10 +27,17 @@ public enum WorkOrderEnum {
 	STATUS_COMPLETED("已完工", 4),
 	STATUS_ADJUDICATING("审理中", 5),
 	STATUS_SCRAP("已报废", 6),
-	STATUS_REWORK("已返工", 7)
+	STATUS_REWORK("已返工", 7),
+
+	/**
+	 * 烧结订单人工工时统计类型
+	 */
+	STATUS_PART_TYPE_1("壳体最大外径", 1),
+	STATUS_PART_TYPE_2("玻璃饼直径", 2),
+	STATUS_PART_TYPE_3("芯数", 3),
 	;
 	final String name;
-	final int category;
+	final int code;
 
 	/**
 	 * 匹配枚举值
@@ -54,7 +61,7 @@ public enum WorkOrderEnum {
 	 */
 	public static String getName(int category) {
 		WorkOrderEnum item = Arrays.stream(WorkOrderEnum.values())
-			.filter(enumItem -> enumItem.getCategory() == category)
+			.filter(enumItem -> enumItem.getCode() == category)
 			.findFirst()
 			.orElse(null);
 		return ObjectUtil.isEmpty(item) ? StringPool.EMPTY : item.getName();
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsBatchPreserveTaskServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsBatchPreserveTaskServiceImpl.java
index 718c60ba3..2f626867e 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsBatchPreserveTaskServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsBatchPreserveTaskServiceImpl.java
@@ -28,18 +28,15 @@ package org.springblade.desk.dashboard.service.impl;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.desk.dashboard.constant.BatchConstant;
-import org.springblade.desk.dashboard.constant.TaskingConstant;
 import org.springblade.desk.dashboard.pojo.entity.BsWorkCenterEntity;
 import org.springblade.desk.dashboard.pojo.entity.DsBatchPreservePlanEntity;
 import org.springblade.desk.dashboard.pojo.entity.DsBatchPreserveTaskEntity;
-import org.springblade.desk.dashboard.pojo.entity.DsBatchWorkCenterSetEntity;
 import org.springblade.desk.dashboard.pojo.vo.DsBatchPreserveTaskVO;
 import org.springblade.desk.dashboard.excel.DsBatchPreserveTaskExcel;
 import org.springblade.desk.dashboard.mapper.DsBatchPreserveTaskMapper;
 import org.springblade.desk.dashboard.service.IBsWorkCenterService;
 import org.springblade.desk.dashboard.service.IDsBatchPreservePlanService;
 import org.springblade.desk.dashboard.service.IDsBatchPreserveTaskService;
-import org.springblade.desk.dashboard.service.IDsBatchWorkCenterSetService;
 import org.springblade.system.feign.IUserClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
@@ -49,7 +46,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.util.CollectionUtils;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java
index 1e9cef1ca..d6890d39c 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java
@@ -22,7 +22,7 @@ import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.core.tool.utils.StringPool;
 import org.springblade.desk.dashboard.constant.DsCraftConstant;
-import org.springblade.desk.dashboard.constant.DsPartConst;
+import org.springblade.desk.dashboard.constant.DsPartConstant;
 import org.springblade.desk.dashboard.pojo.entity.DsCraftEntity;
 import org.springblade.desk.dashboard.pojo.entity.DsPartEntity;
 import org.springblade.desk.dashboard.pojo.entity.DsProcessEntity;
@@ -406,13 +406,13 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 	@Override
 	public void saveSubYieldOrder(YieldOrder yieldOrder, Boolean isManual, Long receiveUser) throws BusinessException {
 		// 验证是否存在玻璃饼子件信息
-		this.checkSub(yieldOrder.getPartCode(), DsPartConst.SIN_TER_TYPE_BLB, "玻璃饼");
+		this.checkSub(yieldOrder.getPartCode(), DsPartConstant.SIN_TER_TYPE_BLB, "玻璃饼");
 
 		//查询所有的烧结子件清单
 		List<DsPartEntity> subList = new ArrayList<>();
-		subList.addAll(this.checkSub(yieldOrder.getPartCode(), DsPartConst.SIN_TER_TYPE_SMM, "石墨模"));
-		subList.addAll(this.checkSub(yieldOrder.getPartCode(), DsPartConst.SIN_TER_TYPE_KT, "壳体"));
-		subList.addAll(this.checkSub(yieldOrder.getPartCode(), DsPartConst.SIN_TER_TYPE_CZ, "插针"));
+		subList.addAll(this.checkSub(yieldOrder.getPartCode(), DsPartConstant.SIN_TER_TYPE_SMM, "石墨模"));
+		subList.addAll(this.checkSub(yieldOrder.getPartCode(), DsPartConstant.SIN_TER_TYPE_KT, "壳体"));
+		subList.addAll(this.checkSub(yieldOrder.getPartCode(), DsPartConstant.SIN_TER_TYPE_CZ, "插针"));
 		if (subList.size() == 0) {
 			throw new BusinessException("未找到烧结前处理子件信息，请联系工艺编制！");
 		}
@@ -806,9 +806,9 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 				throw new BusinessException(errMsg);
 			}
 			Integer yieldType = YieldOrderEnum.YIELD_TYPE_6.getCode();
-			if (DsPartConst.SIN_TER_TYPE_KT.equals(dsPartSub.getSinTerType())) {
+			if (DsPartConstant.SIN_TER_TYPE_KT.equals(dsPartSub.getSinTerType())) {
 				yieldType = YieldOrderEnum.YIELD_TYPE_4.getCode();
-			} else if (DsPartConst.SIN_TER_TYPE_CZ.equals(dsPartSub.getSinTerType())) {
+			} else if (DsPartConstant.SIN_TER_TYPE_CZ.equals(dsPartSub.getSinTerType())) {
 				yieldType = YieldOrderEnum.YIELD_TYPE_5.getCode();
 			}
 			//非石墨模子件，面积不允许为空
@@ -825,7 +825,7 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 
 			//获取金属件子件B号，如果未获取到，提示异常
 			String roamNo = null;
-			if (DsPartConst.SIN_TER_TYPE_KT.equals(dsPartSub.getSinTerType()) || DsPartConst.SIN_TER_TYPE_CZ.equals(dsPartSub.getSinTerType())) {
+			if (DsPartConstant.SIN_TER_TYPE_KT.equals(dsPartSub.getSinTerType()) || DsPartConstant.SIN_TER_TYPE_CZ.equals(dsPartSub.getSinTerType())) {
 				roamNo = dsPartService.findRoamNoByPartCode(dsPartSub.getPartCode());
 				if (StringUtils.isBlank(roamNo)) {
 					String errMsg = MessageFormat.format("子件{}未找到对应B号，请在ERP核查子件一级路线!", dsPartSub.getPartCode());
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldPlanServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldPlanServiceImpl.java
index 03ae5cefc..5e7e53f9f 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldPlanServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldPlanServiceImpl.java
@@ -13,7 +13,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.api.ResultCode;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.ObjectUtil;
-import org.springblade.desk.dashboard.constant.DsPartConst;
+import org.springblade.desk.dashboard.constant.DsPartConstant;
 import org.springblade.desk.dashboard.pojo.entity.DsPartEntity;
 import org.springblade.desk.dashboard.service.IDsPartService;
 import org.springblade.desk.order.mapper.YieldPlanMapper;
@@ -117,7 +117,7 @@ public class YieldPlanServiceImpl extends BaseServiceImpl<YieldPlanMapper, Yield
 	@Override
 	public Boolean saveGlassCake(YieldPlan yieldPlan) {
 		// 调用生产订单服务类中方法，生成玻璃饼订单并保存
-		List<DsPartEntity> glassCakePartList = dsPartService.selectDsPartByPatCode(yieldPlan.getPartCode(), DsPartConst.SIN_TER_TYPE_BLB);
+		List<DsPartEntity> glassCakePartList = dsPartService.selectDsPartByPatCode(yieldPlan.getPartCode(), DsPartConstant.SIN_TER_TYPE_BLB);
 		if (glassCakePartList != null && glassCakePartList.size() > 0) {
 			for (DsPartEntity dsPart : glassCakePartList) {
 				//不包含玻璃字样的代表维护错误，跳过
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/CertificateTypeController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/CertificateTypeController.java
index 61f50a6d8..9f35d2705 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/CertificateTypeController.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/CertificateTypeController.java
@@ -11,6 +11,7 @@ import jakarta.validation.Valid;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
@@ -69,6 +70,7 @@ public class CertificateTypeController extends BladeController {
     @PostMapping("/save")
     @ApiOperationSupport(order = 4)
     @Operation(summary = "新增", description = "传入certificateType")
+    @ApiLog
     public R save(@Valid @RequestBody CertificateTypeEntity certificateType) {
         return R.status(certificateTypeService.save(certificateType));
     }
@@ -79,6 +81,7 @@ public class CertificateTypeController extends BladeController {
     @PostMapping("/update")
     @ApiOperationSupport(order = 5)
     @Operation(summary = "修改", description = "传入certificateType")
+    @ApiLog
     public R update(@Valid @RequestBody CertificateTypeEntity certificateType) {
         return R.status(certificateTypeService.updateById(certificateType));
     }
@@ -99,6 +102,7 @@ public class CertificateTypeController extends BladeController {
     @PostMapping("/remove")
     @ApiOperationSupport(order = 7)
     @Operation(summary = "逻辑删除", description = "传入ids")
+    @ApiLog
     public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
         return R.status(certificateTypeService.deleteLogic(Func.toLongList(ids)));
     }
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/CraftAbilityController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/CraftAbilityController.java
index 45e65cac6..1918a5d3f 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/CraftAbilityController.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/CraftAbilityController.java
@@ -25,25 +25,27 @@
  */
 package org.springblade.scheduling.scheduling.controller;
 
-import io.swagger.v3.oas.annotations.tags.Tag;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import lombok.AllArgsConstructor;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
-
-import org.springblade.core.secure.BladeUser;
-import org.springblade.core.secure.annotation.IsAdmin;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.annotation.IsAdmin;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.desk.basic.pojo.entity.CoatingThickness;
-import org.springblade.desk.basic.pojo.entity.PlatingSmall;
-import org.springblade.desk.basic.pojo.entity.TeamSet;
 import org.springblade.desk.basic.pojo.entity.WorkCenter;
-import org.springblade.desk.basic.pojo.vo.PlatingSmallVO;
 import org.springblade.desk.basic.pojo.vo.WorkCenterVO;
 import org.springblade.desk.feign.INoticeClient;
 import org.springblade.scheduling.pojo.entity.CraftAbilityEntity;
@@ -53,20 +55,13 @@ import org.springblade.scheduling.scheduling.vo.CraftAbilityVO;
 import org.springblade.scheduling.scheduling.wrapper.CraftAbilityWrapper;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.core.excel.util.ExcelUtil;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.ArrayList;
-import java.util.Map;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
-import jakarta.servlet.http.HttpServletResponse;
-import org.springframework.web.multipart.MultipartFile;
-
 /**
  * 工艺能力 控制器
  *
@@ -158,6 +153,7 @@ public class CraftAbilityController extends BladeController {
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
 	@Operation(summary = "新增", description  = "传入CraftAbility")
+	@ApiLog
 	public R save(@Valid @RequestBody CraftAbilityEntity craftAbility) {
 		return R.status(craftAbilityService.save(craftAbility));
 	}
@@ -168,6 +164,7 @@ public class CraftAbilityController extends BladeController {
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@Operation(summary = "修改", description  = "传入CraftAbility")
+	@ApiLog
 	public R update(@Valid @RequestBody CraftAbilityEntity craftAbility) {
 		return R.status(craftAbilityService.updateById(craftAbility));
 	}
@@ -188,6 +185,7 @@ public class CraftAbilityController extends BladeController {
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
 	@Operation(summary = "逻辑删除", description  = "传入ids")
+	@ApiLog
 	public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
 		return R.status(craftAbilityService.deleteLogic(Func.toLongList(ids)));
 	}
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/EquipAbilityController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/EquipAbilityController.java
index 6257e3fa9..38d1278e3 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/EquipAbilityController.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/EquipAbilityController.java
@@ -25,10 +25,10 @@
  */
 package org.springblade.scheduling.scheduling.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -38,7 +38,7 @@ import jakarta.validation.Valid;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
-import org.springblade.core.mp.base.BaseEntity;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
@@ -56,6 +56,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * 设备能力表 控制器
@@ -110,14 +111,35 @@ public class EquipAbilityController extends BladeController {
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
 	@Operation(summary = "新增", description  = "传入mesEquipAbility")
-	public R save(@Valid @RequestBody EquipAbilityEntity entity) {
-		List<EquipAbilityEntity> list = equipAbilityService.list(Wrappers.<EquipAbilityEntity>lambdaQuery().eq(EquipAbilityEntity::getWorkCenterId,entity.getWorkCenterId()).eq(EquipAbilityEntity::getEquipCode,entity.getEquipCode()).eq(EquipAbilityEntity::getEquipType,entity.getEquipType()).eq(EquipAbilityEntity::getCraftId,entity.getCraftId()).eq(BaseEntity::getIsDeleted,0));
-		if(CollectionUtils.isNotEmpty(list)){
-			return R.status(false,"该设备能力已存在！");
+	public R save(@Valid @RequestBody List<EquipAbilityEntity> list) {
+		//校验唯一性
+		for(EquipAbilityEntity entity : list){
+			LambdaQueryWrapper<EquipAbilityEntity> wrapper = new LambdaQueryWrapper();
+			wrapper.eq(EquipAbilityEntity::getWorkCenterId,entity.getWorkCenterId())
+					.eq(EquipAbilityEntity::getEquipCode,entity.getEquipCode())
+					.eq(EquipAbilityEntity::getEquipType,entity.getEquipType())
+					.eq(EquipAbilityEntity::getCraftId,entity.getCraftId());
+			if(entity.getProcessId() != null){
+				wrapper.eq(EquipAbilityEntity::getProcessId,entity.getProcessId());
+			}
+			List<EquipAbilityEntity> oldList = equipAbilityService.list(wrapper);
+			if(CollectionUtils.isNotEmpty(oldList)){
+				return R.status(false,"设备能力["+entity.getWorkCenterName()+"-"+entity.getCraftName()+"-"+entity.getProcessName()+"]已存在！");
+			}
+
+		}
+		//保存
+		for(EquipAbilityEntity entity : list){
+			boolean flag = equipAbilityService.save(entity);
+			if(flag){
+				//异步执行
+				CompletableFuture<Void> future = CompletableFuture.runAsync(() -> {
+					//初始化设备资源
+					equipResourceService.initSingleEquipResource(entity);
+				});
+			}
 		}
-		equipAbilityService.save(entity);
-		//初始化设备资源
-		equipResourceService.initSingleEquipResource(entity);
+
 		return R.status(true);
 	}
 
@@ -127,10 +149,13 @@ public class EquipAbilityController extends BladeController {
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@Operation(summary = "修改", description  = "传入mesEquipAbility")
-	public R update(@Valid @RequestBody EquipAbilityEntity entity) {
-		equipAbilityService.updateById(entity);
-		//初始化设备资源
-		equipResourceService.initSingleEquipResource(entity);
+	@ApiLog
+	public R update(@Valid @RequestBody List<EquipAbilityEntity> list) {
+		for(EquipAbilityEntity entity : list){
+			equipAbilityService.updateById(entity);
+			//初始化设备资源
+			equipResourceService.initSingleEquipResource(entity);
+		}
 		return R.status(true);
 	}
 
@@ -150,6 +175,7 @@ public class EquipAbilityController extends BladeController {
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
 	@Operation(summary = "逻辑删除", description  = "传入ids")
+	@ApiLog
 	public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
 		return R.status(equipAbilityService.deleteLogic(Func.toLongList(ids)));
 	}
@@ -168,4 +194,6 @@ public class EquipAbilityController extends BladeController {
 		ExcelUtil.export(response, "设备能力表数据" + DateUtil.time(), "设备能力表数据表", list, EquipAbilityExcel.class);
 	}
 
+
+
 }
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/EquipmentController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/EquipmentController.java
index 4b538ade5..3661948f1 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/EquipmentController.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/EquipmentController.java
@@ -36,6 +36,7 @@ import jakarta.validation.Valid;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
@@ -105,6 +106,7 @@ public class EquipmentController extends BladeController {
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
 	@Operation(summary = "新增", description  = "传入Equipment")
+	@ApiLog
 	public R save(@Valid @RequestBody EquipmentEntity equipment) {
 		return R.status(equipmentService.save(equipment));
 	}
@@ -115,6 +117,7 @@ public class EquipmentController extends BladeController {
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@Operation(summary = "修改", description  = "传入Equipment")
+	@ApiLog
 	public R update(@Valid @RequestBody EquipmentEntity equipment) {
 		return R.status(equipmentService.updateById(equipment));
 	}
@@ -135,6 +138,7 @@ public class EquipmentController extends BladeController {
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
 	@Operation(summary = "逻辑删除", description  = "传入ids")
+	@ApiLog
 	public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
 		return R.status(equipmentService.deleteLogic(Func.toLongList(ids)));
 	}
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/MainProducerController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/MainProducerController.java
index e9a509fed..f2a17d0e6 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/MainProducerController.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/MainProducerController.java
@@ -38,6 +38,7 @@ import jakarta.validation.Valid;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.base.BaseEntity;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -108,6 +109,7 @@ public class MainProducerController extends BladeController {
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
 	@Operation(summary = "新增", description  = "传入mainProducer")
+	@ApiLog
 	public R save(@Valid @RequestBody MainProducerEntity entity) {
 		List<MainProducerEntity> list = mainProducerService.list(Wrappers.<MainProducerEntity>lambdaQuery().eq(MainProducerEntity::getProcessId,entity.getProcessId()).eq(MainProducerEntity::getMainProducer,entity.getMainProducer()).eq(BaseEntity::getIsDeleted,0));
 		if(CollectionUtils.isNotEmpty(list)){
@@ -122,6 +124,7 @@ public class MainProducerController extends BladeController {
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@Operation(summary = "修改", description  = "传入mainProducer")
+	@ApiLog
 	public R update(@Valid @RequestBody MainProducerEntity entity) {
 		return R.status(mainProducerService.updateById(entity));
 	}
@@ -142,6 +145,7 @@ public class MainProducerController extends BladeController {
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
 	@Operation(summary = "逻辑删除", description  = "传入ids")
+	@ApiLog
 	public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
 		return R.status(mainProducerService.deleteLogic(Func.toLongList(ids)));
 	}
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/OutsourceProcessController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/OutsourceProcessController.java
index 65edd56c1..0dff3e762 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/OutsourceProcessController.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/OutsourceProcessController.java
@@ -25,18 +25,24 @@
  */
 package org.springblade.scheduling.scheduling.controller;
 
-import io.swagger.v3.oas.annotations.tags.Tag;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import lombok.AllArgsConstructor;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
-
-import org.springblade.core.secure.BladeUser;
-import org.springblade.core.secure.annotation.IsAdmin;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.annotation.IsAdmin;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.scheduling.pojo.entity.OutsourceProcessEntity;
 import org.springblade.scheduling.scheduling.excel.OutsourceProcessExcel;
@@ -44,15 +50,9 @@ import org.springblade.scheduling.scheduling.service.IOutsourceProcessService;
 import org.springblade.scheduling.scheduling.vo.OutsourceProcessVO;
 import org.springblade.scheduling.scheduling.wrapper.OutsourceProcessWrapper;
 import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.core.excel.util.ExcelUtil;
 
-import java.util.Map;
 import java.util.List;
-import jakarta.servlet.http.HttpServletResponse;
+import java.util.Map;
 
 /**
  * 外协工序表 控制器
@@ -106,6 +106,7 @@ public class OutsourceProcessController extends BladeController {
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
 	@Operation(summary = "新增", description  = "传入OutsourceProcess")
+	@ApiLog
 	public R save(@Valid @RequestBody OutsourceProcessEntity OutsourceProcess) {
 		return R.status(outsourceProcessService.save(OutsourceProcess));
 	}
@@ -116,6 +117,7 @@ public class OutsourceProcessController extends BladeController {
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@Operation(summary = "修改", description  = "传入OutsourceProcess")
+	@ApiLog
 	public R update(@Valid @RequestBody OutsourceProcessEntity OutsourceProcess) {
 		return R.status(outsourceProcessService.updateById(OutsourceProcess));
 	}
@@ -136,6 +138,7 @@ public class OutsourceProcessController extends BladeController {
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
 	@Operation(summary = "逻辑删除", description  = "传入ids")
+	@ApiLog
 	public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
 		return R.status(outsourceProcessService.deleteLogic(Func.toLongList(ids)));
 	}
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/PersonAbilityController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/PersonAbilityController.java
index bd09de1b5..393183c45 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/PersonAbilityController.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/PersonAbilityController.java
@@ -38,6 +38,7 @@ import jakarta.validation.Valid;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.base.BaseEntity;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -109,6 +110,7 @@ public class PersonAbilityController extends BladeController {
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
 	@Operation(summary = "新增", description  = "传入personAbility")
+	@ApiLog
 	public R save(@Valid @RequestBody PersonAbilityEntity entity) {
 		List<PersonAbilityEntity> list = personAbilityService.list(Wrappers.<PersonAbilityEntity>lambdaQuery().eq(PersonAbilityEntity::getWorkCenterId,entity.getWorkCenterId()).eq(PersonAbilityEntity::getProcessId,entity.getProcessId()).eq(PersonAbilityEntity::getCraftId,entity.getCraftId()).eq(BaseEntity::getIsDeleted,0));
 		if(CollectionUtils.isNotEmpty(list)){
@@ -123,6 +125,7 @@ public class PersonAbilityController extends BladeController {
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@Operation(summary = "修改", description  = "传入personAbility")
+	@ApiLog
 	public R update(@Valid @RequestBody PersonAbilityEntity entity) {
 		return R.status(personAbilityService.updateById(entity));
 	}
@@ -143,6 +146,7 @@ public class PersonAbilityController extends BladeController {
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
 	@Operation(summary = "逻辑删除", description  = "传入ids")
+	@ApiLog
 	public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
 		return R.status(personAbilityService.deleteLogic(Func.toLongList(ids)));
 	}
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/SameTroughController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/SameTroughController.java
index 46d1c3645..ffdd7dbd6 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/SameTroughController.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/SameTroughController.java
@@ -25,18 +25,24 @@
  */
 package org.springblade.scheduling.scheduling.controller;
 
-import io.swagger.v3.oas.annotations.tags.Tag;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import lombok.AllArgsConstructor;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
-
-import org.springblade.core.secure.BladeUser;
-import org.springblade.core.secure.annotation.IsAdmin;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.annotation.IsAdmin;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.scheduling.pojo.entity.SameTroughEntity;
 import org.springblade.scheduling.scheduling.excel.SameTroughExcel;
@@ -44,15 +50,9 @@ import org.springblade.scheduling.scheduling.service.ISameTroughService;
 import org.springblade.scheduling.scheduling.vo.SameTroughVO;
 import org.springblade.scheduling.scheduling.wrapper.SameTroughWrapper;
 import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.core.excel.util.ExcelUtil;
 
-import java.util.Map;
 import java.util.List;
-import jakarta.servlet.http.HttpServletResponse;
+import java.util.Map;
 
 /**
  * 非同槽因素表 控制器
@@ -106,6 +106,7 @@ public class SameTroughController extends BladeController {
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
 	@Operation(summary = "新增", description  = "传入SameTrough")
+	@ApiLog
 	public R save(@Valid @RequestBody SameTroughEntity sameTrough) {
 		return R.status(sameTroughService.save(sameTrough));
 	}
@@ -116,6 +117,7 @@ public class SameTroughController extends BladeController {
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@Operation(summary = "修改", description  = "传入SameTrough")
+	@ApiLog
 	public R update(@Valid @RequestBody SameTroughEntity sameTrough) {
 		return R.status(sameTroughService.updateById(sameTrough));
 	}
@@ -136,6 +138,7 @@ public class SameTroughController extends BladeController {
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
 	@Operation(summary = "逻辑删除", description  = "传入ids")
+	@ApiLog
 	public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
 		return R.status(sameTroughService.deleteLogic(Func.toLongList(ids)));
 	}
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/SintTempCurveController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/SintTempCurveController.java
index 5cd335c8b..f12a5dc47 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/SintTempCurveController.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/SintTempCurveController.java
@@ -25,18 +25,24 @@
  */
 package org.springblade.scheduling.scheduling.controller;
 
-import io.swagger.v3.oas.annotations.tags.Tag;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import lombok.AllArgsConstructor;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
-
-import org.springblade.core.secure.BladeUser;
-import org.springblade.core.secure.annotation.IsAdmin;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.annotation.IsAdmin;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.scheduling.pojo.entity.SintTempCurveEntity;
 import org.springblade.scheduling.scheduling.excel.SintTempCurveExcel;
@@ -44,15 +50,9 @@ import org.springblade.scheduling.scheduling.service.ISintTempCurveService;
 import org.springblade.scheduling.scheduling.vo.SintTempCurveVO;
 import org.springblade.scheduling.scheduling.wrapper.SintTempCurveWrapper;
 import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.core.excel.util.ExcelUtil;
 
-import java.util.Map;
 import java.util.List;
-import jakarta.servlet.http.HttpServletResponse;
+import java.util.Map;
 
 /**
  * 烧结温度曲线表 控制器
@@ -106,6 +106,7 @@ public class SintTempCurveController extends BladeController {
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
 	@Operation(summary = "新增", description  = "传入SintTempCurve")
+	@ApiLog
 	public R save(@Valid @RequestBody SintTempCurveEntity sintTempCurve) {
 		return R.status(sintTempCurveService.save(sintTempCurve));
 	}
@@ -116,6 +117,7 @@ public class SintTempCurveController extends BladeController {
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
 	@Operation(summary = "修改", description  = "传入SintTempCurve")
+	@ApiLog
 	public R update(@Valid @RequestBody SintTempCurveEntity sintTempCurve) {
 		return R.status(sintTempCurveService.updateById(sintTempCurve));
 	}
@@ -136,6 +138,7 @@ public class SintTempCurveController extends BladeController {
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
 	@Operation(summary = "逻辑删除", description  = "传入ids")
+	@ApiLog
 	public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
 		return R.status(sintTempCurveService.deleteLogic(Func.toLongList(ids)));
 	}
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PartMapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PartMapper.java
index ca8684c35..fbf9f10e2 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PartMapper.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PartMapper.java
@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
+import org.springblade.desk.dashboard.pojo.entity.DsPartVersionEntity;
 import org.springblade.scheduling.pojo.entity.PartEntity;
 import org.springblade.scheduling.scheduling.excel.PartExcel;
 import org.springblade.scheduling.scheduling.vo.PartVO;
@@ -62,6 +63,6 @@ public interface PartMapper extends BaseMapper<PartEntity> {
 	List<PartExcel> export(@Param("ew") Wrapper<PartEntity> queryWrapper);
 
 
-	List<PartEntity> selectChildPart(PartEntity part);
+	List<PartEntity> selectChildPart(DsPartVersionEntity partVersion);
 
 }
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PartMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PartMapper.xml
index 40c865a5a..a47ccc469 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PartMapper.xml
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PartMapper.xml
@@ -77,10 +77,12 @@
             c.*
         FROM
             DS_PART a
-            LEFT JOIN DS_PART_RELATION b ON a.id = b.PART_ID
-            LEFT JOIN DS_PART c ON b.CHILD_PART_ID = c.id
+        LEFT JOIN DS_PART_VERSION b ON a.id = b.part_id
+        LEFT JOIN DS_PART_RELATION c ON a.id = c.PART_ID
+        LEFT JOIN DS_PART d ON c.CHILD_PART_ID = d.id
         WHERE
-            a.PART_CODE = #{partCode}
+            b.PART_CODE = #{partCode}
+          and b.PART_VERSION = #{partVersion}
     </select>
 
 </mapper>
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PartVersionMapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PartVersionMapper.java
new file mode 100644
index 000000000..34bae5bd6
--- /dev/null
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PartVersionMapper.java
@@ -0,0 +1,41 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.scheduling.scheduling.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springblade.desk.dashboard.pojo.entity.DsPartVersionEntity;
+
+/**
+ * 零件信息表 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2025-11-12
+ */
+public interface PartVersionMapper extends BaseMapper<DsPartVersionEntity> {
+
+
+
+}
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PartVersionMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PartVersionMapper.xml
new file mode 100644
index 000000000..b8011b87b
--- /dev/null
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/PartVersionMapper.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.scheduling.scheduling.mapper.PartVersionMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="partVersionResultMap" type="org.springblade.desk.dashboard.pojo.entity.DsPartVersionEntity">
+        <result column="ID" property="id"/>
+        <result column="PART_ID" property="partId"/>
+        <result column="PART_CODE" property="partCode"/>
+        <result column="PART_VERSION" property="partVersion"/>
+        <result column="CRAFT_ID" property="craftId"/>
+        <result column="CREATE_TIME" property="createTime"/>
+        <result column="CREATE_USER" property="createUser"/>
+        <result column="CREATE_DEPT" property="createDept"/>
+        <result column="UPDATE_TIME" property="updateTime"/>
+        <result column="UPDATE_USER" property="updateUser"/>
+        <result column="REMARKS" property="remarks"/>
+        <result column="STATUS" property="status"/>
+        <result column="IS_DELETED" property="isDeleted"/>
+    </resultMap>
+
+
+
+</mapper>
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IPartService.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IPartService.java
index 8905fe6eb..2a71a106c 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IPartService.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IPartService.java
@@ -28,6 +28,7 @@ package org.springblade.scheduling.scheduling.service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
+import org.springblade.desk.dashboard.pojo.entity.DsPartVersionEntity;
 import org.springblade.scheduling.pojo.entity.PartEntity;
 import org.springblade.scheduling.scheduling.excel.PartExcel;
 import org.springblade.scheduling.scheduling.vo.PartVO;
@@ -59,6 +60,6 @@ public interface IPartService extends BaseService<PartEntity> {
 	 */
 	List<PartExcel> export(Wrapper<PartEntity> queryWrapper);
 
-	List<PartEntity> selectChildPart(PartEntity part);
+	List<PartEntity> selectChildPart(DsPartVersionEntity partVersion);
 
 }
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IPartVersionService.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IPartVersionService.java
new file mode 100644
index 000000000..b7451cc60
--- /dev/null
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/IPartVersionService.java
@@ -0,0 +1,42 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.scheduling.scheduling.service;
+
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.desk.dashboard.pojo.entity.DsPartVersionEntity;
+
+import java.util.List;
+
+/**
+ * 零件版本信息表 服务类
+ *
+ * @author BladeX
+ * @since 2025-11-12
+ */
+public interface IPartVersionService extends BaseService<DsPartVersionEntity> {
+
+
+}
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/EquipResourceServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/EquipResourceServiceImpl.java
index 74d77890c..a67d27efd 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/EquipResourceServiceImpl.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/EquipResourceServiceImpl.java
@@ -30,21 +30,25 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.fasterxml.jackson.core.type.TypeReference;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.tool.jackson.JsonUtil;
 import org.springblade.scheduling.pojo.entity.EquipAbilityEntity;
 import org.springblade.scheduling.pojo.entity.EquipResourceEntity;
 import org.springblade.scheduling.scheduling.excel.EquipResourceExcel;
 import org.springblade.scheduling.scheduling.mapper.EquipResourceMapper;
 import org.springblade.scheduling.scheduling.service.IEquipAbilityService;
 import org.springblade.scheduling.scheduling.service.IEquipResourceService;
+import org.springblade.scheduling.scheduling.vo.EquipAbilityVO;
 import org.springblade.scheduling.scheduling.vo.EquipResourceVO;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -92,6 +96,9 @@ public class EquipResourceServiceImpl extends BaseServiceImpl<EquipResourceMappe
 				wrapper.eq(EquipResourceEntity::getWorkCenterId,equipAbility.getWorkCenterId());
 				wrapper.eq(EquipResourceEntity::getCraftId,equipAbility.getCraftId());
 				wrapper.eq(EquipResourceEntity::getEquipCode,equipAbility.getEquipCode());
+				if(equipAbility.getProcessId() != null){
+					wrapper.eq(EquipResourceEntity::getProcessId,equipAbility.getProcessId());
+				}
 				List<EquipResourceEntity> list = this.list(wrapper);
 				if(CollectionUtils.isEmpty(list)){
 					generateData(today,equipAbility);
@@ -129,17 +136,24 @@ public class EquipResourceServiceImpl extends BaseServiceImpl<EquipResourceMappe
 		if(equipAbility.getCraftId() != null){
 			wrapper.eq(EquipAbilityEntity::getCraftId,equipAbility.getCraftId());
 		}
+		if(equipAbility.getProcessId() != null){
+			wrapper.eq(EquipAbilityEntity::getProcessId,equipAbility.getProcessId());
+		}
 		if(StringUtils.isNotBlank(equipAbility.getEquipCode())){
 			wrapper.eq(EquipAbilityEntity::getEquipCode,equipAbility.getEquipCode());
 		}
 		List<EquipAbilityEntity> equipAbilityList = equipAbilityService.list(wrapper);
 		if(CollectionUtils.isNotEmpty(equipAbilityList)){
 			if(equipAbility.getWorkCenterId() != null && equipAbility.getCraftId() != null && StringUtils.isNotBlank(equipAbility.getEquipCode())){
-				List<EquipResourceEntity> list = this.list(Wrappers.<EquipResourceEntity>lambdaQuery()
-						.eq(EquipResourceEntity::getWorkCenterId,equipAbility.getWorkCenterId())
+				LambdaQueryWrapper<EquipResourceEntity> wrapper2 = new LambdaQueryWrapper<>();
+				wrapper2.eq(EquipResourceEntity::getWorkCenterId,equipAbility.getWorkCenterId())
 						.eq(EquipResourceEntity::getCraftId,equipAbility.getCraftId())
 						.eq(EquipResourceEntity::getEquipCode,equipAbility.getEquipCode())
-						.eq(EquipResourceEntity::getDateTime,day));
+						.eq(EquipResourceEntity::getDateTime,day);
+				if(equipAbility.getProcessId() != null){
+					wrapper2.eq(EquipResourceEntity::getProcessId,equipAbility.getProcessId());
+				}
+				List<EquipResourceEntity> list = this.list(wrapper2);
 				if(CollectionUtils.isNotEmpty(list)){
 					list.forEach(item -> baseMapper.deleteById(item.getId()));
 				}
@@ -151,61 +165,57 @@ public class EquipResourceServiceImpl extends BaseServiceImpl<EquipResourceMappe
 			LocalDateTime startOfDay = LocalDateTime.of(targetDate, LocalTime.MIDNIGHT);
 			//获取
 			List<Map<String,Object>> teamIdList = baseMapper.selectTeamByWorkCenter(equipAbility.getWorkCenterId());
-			//0-产线设备 1-普通设备
-			if("0".equals(equipAbility.getEquipType())){
-				//产线设备根据轮询间隔生成数据，根据轮询间隔判断一天要分成多少段
-				int interval = equipAbility.getInterval() == null ? 60 : Integer.parseInt(equipAbility.getInterval().toString()); // 默认60分钟
-				int totalMinutes = 24 * 60; // 一天总分钟数
-				int totalCount = totalMinutes / interval; // 生成条数
-				List<EquipResourceEntity> resourceList = new ArrayList<>();
-				for (int i = 0; i < totalCount; i++) {
-					LocalDateTime startTime = startOfDay.plusMinutes(i * interval);
-					LocalDateTime endTime = startTime.plusMinutes(interval);
-					EquipResourceEntity equipResource = new EquipResourceEntity();
-					equipResource.setDateTime(day);
-					equipResource.setEquipCode(equipAbility.getEquipCode());
-					equipResource.setEquipName(equipAbility.getEquipName());
-					equipResource.setCraftId(equipAbility.getCraftId().toString());
-					equipResource.setCraftName(equipAbility.getCraftName());
-					equipResource.setPeriod(startTime.format(timeFormatter) + "-" + endTime.format(timeFormatter));
-					equipResource.setTotalCapacity(equipAbility.getStandardProcessAbility());
-					equipResource.setRestCapacity(equipAbility.getStandardProcessAbility());
-					equipResource.setStartTime(startTime);
-					equipResource.setEndTime(endTime);
-					equipResource.setEquipOrder(equipAbility.getEquipOrder());
-					equipResource.setStandardTime(equipAbility.getStandardTime());
-					equipResource.setIsUsed("0");
-					equipResource.setEquipType(equipAbility.getEquipType());
-					equipResource.setWorkCenterId(equipAbility.getWorkCenterId());
+			int interval = equipAbility.getInterval() == null ? 60 : Integer.parseInt(equipAbility.getInterval().toString()); // 默认60分钟
+			int totalMinutes = 24 * 60; // 一天总分钟数
+			int totalCount = totalMinutes / interval; // 生成条数
+			List<EquipResourceEntity> resourceList = new ArrayList<>();
+			for (int i = 0; i < totalCount; i++) {
+				if(equipAbility.getPartType() != 0){
+					List<EquipAbilityVO> voList = JsonUtil.readValue(equipAbility.getStandardProcessAbility(), new TypeReference<List<EquipAbilityVO>>() {});
+					for(EquipAbilityVO vo : voList){
+						LocalDateTime startTime = startOfDay.plusMinutes(i * interval);
+						//0-产线设备 1-普通设备
+						LocalDateTime endTime = startTime.plusMinutes("0".equals(equipAbility.getEquipType()) ? interval : equipAbility.getStandardTime().longValue());
+						EquipResourceEntity equipResource = new EquipResourceEntity();
+						equipResource.setDateTime(day);
+						equipResource.setEquipCode(equipAbility.getEquipCode());
+						equipResource.setEquipName(equipAbility.getEquipName());
+						equipResource.setCraftId(equipAbility.getCraftId().toString());
+						equipResource.setCraftName(equipAbility.getCraftName());
+						equipResource.setPeriod(startTime.format(timeFormatter) + "-" + endTime.format(timeFormatter));
+						equipResource.setTotalCapacity(BigDecimal.valueOf(Integer.parseInt(vo.getStandardProcessAbility())));
+						equipResource.setRestCapacity(BigDecimal.valueOf(Integer.parseInt(vo.getStandardProcessAbility())));
+						equipResource.setStartTime(startTime);
+						equipResource.setEndTime(endTime);
+						equipResource.setEquipOrder(equipAbility.getEquipOrder());
+						equipResource.setStandardTime(equipAbility.getStandardTime());
+						equipResource.setIsUsed("0");
+						equipResource.setEquipType(equipAbility.getEquipType());
+						equipResource.setWorkCenterId(equipAbility.getWorkCenterId());
+						equipResource.setProcessId(equipAbility.getProcessId());
+						equipResource.setProcessName(equipAbility.getProcessName());
+						equipResource.setStartNum(vo.getStartNum());
+						equipResource.setEndNum(vo.getEndNum());
 
-					Long teamId = null;
-					for(Map<String,Object> map : teamIdList){
 
+						Long teamId = null;
+						for(Map<String,Object> map : teamIdList){
 
-						LocalDateTime teamStartTime = LocalDateTime.parse(day + ' '+ map.get("startTime").toString(), dateTimeFormatter);
-						LocalDateTime teamEndTime = LocalDateTime.parse(day + ' '+ map.get("endTime").toString(), dateTimeFormatter);
+							LocalDateTime teamStartTime = LocalDateTime.parse(day + ' '+ map.get("startTime").toString(), dateTimeFormatter);
+							LocalDateTime teamEndTime = LocalDateTime.parse(day + ' '+ map.get("endTime").toString(), dateTimeFormatter);
+
+							if((startTime.compareTo(teamStartTime) >=0 && endTime.compareTo(teamEndTime) <= 0) || (startTime.compareTo(teamStartTime) >=0 && startTime.compareTo(teamEndTime) <0)){
+								teamId = Long.parseLong(map.get("teamId").toString());
+							}
 
-						if((startTime.compareTo(teamStartTime) >=0 && endTime.compareTo(teamEndTime) <= 0) || (startTime.compareTo(teamStartTime) >=0 && startTime.compareTo(teamEndTime) <0)){
-							teamId = Long.parseLong(map.get("teamId").toString());
 						}
+						equipResource.setTeamId(teamId);
+						resourceList.add(equipResource);
 
 					}
-					equipResource.setTeamId(teamId);
-					resourceList.add(equipResource);
-
-				}
-				if(CollectionUtils.isNotEmpty(resourceList)){
-					this.saveBatch(resourceList);
-				}
-			}else{
-				//普通设备每30分钟间隔生成数据
-				int interval = equipAbility.getInterval() == null ? 60 : Integer.parseInt(equipAbility.getInterval().toString());
-				int totalMinutes = 24 * 60; // 一天总分钟数
-				int totalCount = totalMinutes / interval; // 生成条数
-				List<EquipResourceEntity> resourceList = new ArrayList<>();
-				for (int i = 0; i < totalCount; i++) {
+				}else{
 					LocalDateTime startTime = startOfDay.plusMinutes(i * interval);
-					LocalDateTime endTime = startTime.plusMinutes(equipAbility.getStandardTime().longValue());
+					LocalDateTime endTime = startTime.plusMinutes(interval);
 					EquipResourceEntity equipResource = new EquipResourceEntity();
 					equipResource.setDateTime(day);
 					equipResource.setEquipCode(equipAbility.getEquipCode());
@@ -213,8 +223,8 @@ public class EquipResourceServiceImpl extends BaseServiceImpl<EquipResourceMappe
 					equipResource.setCraftId(equipAbility.getCraftId().toString());
 					equipResource.setCraftName(equipAbility.getCraftName());
 					equipResource.setPeriod(startTime.format(timeFormatter) + "-" + endTime.format(timeFormatter));
-					equipResource.setTotalCapacity(equipAbility.getStandardProcessAbility());
-					equipResource.setRestCapacity(equipAbility.getStandardProcessAbility());
+					equipResource.setTotalCapacity(BigDecimal.valueOf(Integer.parseInt(equipAbility.getStandardProcessAbility())));
+					equipResource.setRestCapacity(BigDecimal.valueOf(Integer.parseInt(equipAbility.getStandardProcessAbility())));
 					equipResource.setStartTime(startTime);
 					equipResource.setEndTime(endTime);
 					equipResource.setEquipOrder(equipAbility.getEquipOrder());
@@ -222,24 +232,27 @@ public class EquipResourceServiceImpl extends BaseServiceImpl<EquipResourceMappe
 					equipResource.setIsUsed("0");
 					equipResource.setEquipType(equipAbility.getEquipType());
 					equipResource.setWorkCenterId(equipAbility.getWorkCenterId());
+					equipResource.setProcessId(equipAbility.getProcessId());
+					equipResource.setProcessName(equipAbility.getProcessName());
+
 					Long teamId = null;
 					for(Map<String,Object> map : teamIdList){
-
-
 						LocalDateTime teamStartTime = LocalDateTime.parse(day + ' '+ map.get("startTime").toString(), dateTimeFormatter);
 						LocalDateTime teamEndTime = LocalDateTime.parse(day + ' '+ map.get("endTime").toString(), dateTimeFormatter);
 
 						if((startTime.compareTo(teamStartTime) >=0 && endTime.compareTo(teamEndTime) <= 0) || (startTime.compareTo(teamStartTime) >=0 && startTime.compareTo(teamEndTime) <0)){
 							teamId = Long.parseLong(map.get("teamId").toString());
 						}
+
 					}
 					equipResource.setTeamId(teamId);
 					resourceList.add(equipResource);
-
-				}
-				if(CollectionUtils.isNotEmpty(resourceList)){
-					this.saveBatch(resourceList);
 				}
+
+
+			}
+			if(CollectionUtils.isNotEmpty(resourceList)){
+				this.saveBatch(resourceList);
 			}
 		}
 	}
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/PartServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/PartServiceImpl.java
index 782efe476..8ac150f7b 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/PartServiceImpl.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/PartServiceImpl.java
@@ -25,15 +25,17 @@
  */
 package org.springblade.scheduling.scheduling.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.desk.dashboard.pojo.entity.DsPartVersionEntity;
 import org.springblade.scheduling.pojo.entity.PartEntity;
 import org.springblade.scheduling.scheduling.excel.PartExcel;
 import org.springblade.scheduling.scheduling.mapper.PartMapper;
 import org.springblade.scheduling.scheduling.service.IPartService;
 import org.springblade.scheduling.scheduling.vo.PartVO;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.core.mp.base.BaseServiceImpl;
+
 import java.util.List;
 
 /**
@@ -61,8 +63,8 @@ public class PartServiceImpl extends BaseServiceImpl<PartMapper, PartEntity> imp
 	}
 
 	@Override
-	public List<PartEntity> selectChildPart(PartEntity part) {
-		return baseMapper.selectChildPart(part);
+	public List<PartEntity> selectChildPart(DsPartVersionEntity partVersion) {
+		return baseMapper.selectChildPart(partVersion);
 	}
 
 }
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/PartsVersionServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/PartsVersionServiceImpl.java
new file mode 100644
index 000000000..512ece103
--- /dev/null
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/PartsVersionServiceImpl.java
@@ -0,0 +1,47 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.scheduling.scheduling.service.impl;
+
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.desk.dashboard.pojo.entity.DsPartVersionEntity;
+import org.springblade.scheduling.scheduling.mapper.PartVersionMapper;
+import org.springblade.scheduling.scheduling.service.IPartVersionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 相似零件表 服务实现类
+ *
+ * @author BladeX
+ * @since 2025-11-21
+ */
+@Service
+public class PartsVersionServiceImpl extends BaseServiceImpl<PartVersionMapper, DsPartVersionEntity> implements IPartVersionService {
+
+    @Autowired
+    PartVersionMapper partVersionMapper;
+
+}
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/PersonResourceServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/PersonResourceServiceImpl.java
index b7547a405..fb41bdc94 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/PersonResourceServiceImpl.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/PersonResourceServiceImpl.java
@@ -47,7 +47,10 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 工艺能力表 服务实现类
@@ -84,7 +87,7 @@ public class PersonResourceServiceImpl extends BaseServiceImpl<PersonResourceMap
 				generateData(today);
 			}
 		}
-		log.info("初始化人力资源开始："+ DateFormatUtils.format(new Date(),"yyyy-MM-dd HH:mm:ss"));
+		log.info("初始化人力资源结束："+ DateFormatUtils.format(new Date(),"yyyy-MM-dd HH:mm:ss"));
 	}
 
 	public void generateData(String day){
@@ -96,43 +99,11 @@ public class PersonResourceServiceImpl extends BaseServiceImpl<PersonResourceMap
 			DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
 			DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
 			LocalDate targetDate = LocalDate.parse(day, dateFormatter);
-			LocalDateTime startOfDay = LocalDateTime.of(targetDate, LocalTime.MIDNIGHT);
 			for(PersonAbilityEntity personAbility : personAbilityList){
 				//获取
 				List<Map<String,Object>> teamIdList = baseMapper.selectTeamByWorkCenter(personAbility.getWorkCenterId());
 				List<PersonResourceEntity> resourceList = new ArrayList<>();
-				//普通设备每30分钟间隔生成数据
-				/*int interval = 30;
-				int totalMinutes = 24 * 60; // 一天总分钟数
-				int totalCount = totalMinutes / interval; // 生成条数
-
-				for (int i = 0; i < totalCount; i++) {
-					LocalDateTime startTime = startOfDay.plusMinutes(i * interval);
-					LocalDateTime endTime = startTime.plusMinutes(30);
-					PersonResourceEntity personResource = new PersonResourceEntity();
-					personResource.setDateTime(day);
-					personResource.setCraftId(personAbility.getCraftId());
-					personResource.setCraftName(personAbility.getCraftName());
-					personResource.setPeriod(startTime.format(timeFormatter) + "-" + endTime.format(timeFormatter));
-					personResource.setStartTime(startTime);
-					personResource.setEndTime(endTime);
-					personResource.setIsUsed("0");
-
-					Long teamId = null;
-					for(Map<String,Object> map : teamIdList){
-
-
-						LocalDateTime teamStartTime = LocalDateTime.parse(day + ' '+ map.get("startTime").toString(), dateTimeFormatter);
-						LocalDateTime teamEndTime = LocalDateTime.parse(day + ' '+ map.get("endTime").toString(), dateTimeFormatter);
-
-						if((startTime.compareTo(teamStartTime) >=0 && endTime.compareTo(teamEndTime) <= 0) || (startTime.compareTo(teamStartTime) >=0 && startTime.compareTo(teamEndTime) <0)){
-							teamId = Long.parseLong(map.get("teamId").toString());
-						}
-					}
-					personResource.setTeamId(teamId);
-					resourceList.add(personResource);
 
-				}*/
 				for(Map<String,Object> map : teamIdList){
 					LocalDateTime teamStartTime = LocalDateTime.parse(day + ' '+ map.get("startTime").toString(), dateTimeFormatter);
 					LocalDateTime teamEndTime = LocalDateTime.parse(day + ' '+ map.get("endTime").toString(), dateTimeFormatter);
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 40792205f..2e9335b64 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
@@ -28,10 +28,12 @@ package org.springblade.scheduling.scheduling.service.impl;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.fasterxml.jackson.core.type.TypeReference;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -39,16 +41,21 @@ import org.apache.commons.lang3.time.DateFormatUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.springblade.core.mp.base.BaseEntity;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.tool.jackson.JsonUtil;
 import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.desk.dashboard.constant.DsPartConstant;
+import org.springblade.desk.dashboard.pojo.entity.DsPartVersionEntity;
 import org.springblade.desk.order.pojo.enums.YieldOrderEnum;
 import org.springblade.scheduling.pojo.entity.*;
+import org.springblade.scheduling.pojo.enums.WorkOrderEnum;
+import org.springblade.scheduling.pojo.vo.WorkOrderVO;
 import org.springblade.scheduling.scheduling.dto.WorkOrderDto;
 import org.springblade.scheduling.scheduling.excel.SchedulingBoardExcel;
 import org.springblade.scheduling.scheduling.excel.WorkOrderExcel;
 import org.springblade.scheduling.scheduling.mapper.WorkOrderMapper;
 import org.springblade.scheduling.scheduling.service.*;
+import org.springblade.scheduling.scheduling.vo.PersonAbilityVO;
 import org.springblade.scheduling.scheduling.vo.SameTroughVO;
-import org.springblade.scheduling.pojo.vo.WorkOrderVO;
 import org.springblade.scheduling.scheduling.vo.WorkPlanVO;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -94,6 +101,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
     private final ISameTroughService sameTroughService;
     private final IWorkCenterService workCenterService;
     private final ICraftAbilityService craftAbilityService;
+    private final IPartVersionService partVersionService;
+    private final IPartRelationService partRelationService;
 
     @Value("${business.oldMes.url}")
     private String oldMesUrl;
@@ -156,7 +165,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         //查询待排产订单，状态是3
         List<YieldOrderEntity> list =
                 yieldOrderService.list(Wrappers.<YieldOrderEntity>lambdaQuery()
-                        .in(BaseEntity::getStatus, YieldOrderEnum.STATUS_APS.getCode())
+                        .in(BaseEntity::getStatus, YieldOrderEnum.STATUS_APS.getCode(),YieldOrderEnum.STATUS_OUTSOURCING_WAITING.getCode())
                         .isNotNull(YieldOrderEntity::getWorkCenterId)
                         .isNotNull(YieldOrderEntity::getReleaseDate)
                         .isNotNull(YieldOrderEntity::getDemandDate));
@@ -164,12 +173,12 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         if (CollectionUtils.isNotEmpty(list)) {
             //校验已排产订单
             checkSchedulingOrder(list);
-            list = yieldOrderService.list(Wrappers.<YieldOrderEntity>lambdaQuery().in(BaseEntity::getStatus, YieldOrderEnum.STATUS_APS.getCode()).isNotNull(YieldOrderEntity::getWorkCenterId).isNotNull(YieldOrderEntity::getReleaseDate).isNotNull(YieldOrderEntity::getDemandDate));
+            list = yieldOrderService.list(Wrappers.<YieldOrderEntity>lambdaQuery().in(BaseEntity::getStatus, YieldOrderEnum.STATUS_APS.getCode(),YieldOrderEnum.STATUS_OUTSOURCING_WAITING.getCode()).isNotNull(YieldOrderEntity::getWorkCenterId).isNotNull(YieldOrderEntity::getReleaseDate).isNotNull(YieldOrderEntity::getDemandDate));
             //初始化人员能力
             List<PersonAbilityEntity> personAbilityEntityList = personAbilityService.list(Wrappers.<PersonAbilityEntity>lambdaQuery().isNotNull(PersonAbilityEntity::getWorkCenterId).isNotNull(PersonAbilityEntity::getProcessId).isNotNull(PersonAbilityEntity::getCraftId));
             Map<String, PersonAbilityEntity> personAbilityMap = new HashMap<>();
             personAbilityEntityList.forEach(personAbility -> {
-                personAbilityMap.put(personAbility.getWorkCenterId() + "-" + personAbility.getProcessId() + "-" + personAbility.getCraftId(), personAbility);
+                personAbilityMap.put(personAbility.getWorkCenterId() + "-" + personAbility.getCraftId() + "-" + personAbility.getProcessId(), personAbility);
             });
             //初始化主生产者
             List<MainProducerEntity> mainProducerList = mainProducerService.list(Wrappers.<MainProducerEntity>lambdaQuery().isNotNull(MainProducerEntity::getProcessId));
@@ -400,13 +409,30 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                                   Map<Long, String> workCenterMap,
                                   Map<Long, String> craftAbilityMap) {
         List<WorkOrderEntity> workOrderList = new ArrayList<>();
+        list = mergeYieldOrderList(list);
+        LocalDateTime localDateTime = LocalDateTime.now();
         for (YieldOrderEntity order : list) {
             try {
+                DsPartVersionEntity partVersion = partVersionService.getOne(Wrappers.<DsPartVersionEntity>lambdaQuery().eq(DsPartVersionEntity::getPartCode,order.getPartCode()).eq(DsPartVersionEntity::getPartVersion,order.getPartVersion()));
+                if(partVersion == null){
+                    order.setErrorInfo("订单："+order.getYoCode()+"未查询到零件号：" + order.getPartCode() +"的版本号："+order.getPartVersion()+"的对应信息");
+                    order.setStatus(YieldOrderEnum.STATUS_PROCESS_ERROR.getCode());
+                    yieldOrderService.updateById(order);
+                    continue;
+                }
+                PartEntity part = partService.getById(partVersion.getPartId());
                 //是否可以排产
                 Boolean isSchecuding = true;
                 List<WorkPlanEntity> workPlanList = new ArrayList<>();
                 //查询所有工序
                 List<YieldOrderCraftEntity> craftList = yieldOrderCraftService.list(Wrappers.<YieldOrderCraftEntity>lambdaQuery().eq(YieldOrderCraftEntity::getYoId, order.getId()).ne(YieldOrderCraftEntity::getCaId, 27).orderByAsc(YieldOrderCraftEntity::getProcessNo));
+                //如果是外协回来的订单
+                if(order.getStatus() == YieldOrderEnum.STATUS_OUTSOURCING_WAITING.getCode()){
+                    WorkOrderEntity oldWorkOrder = this.getOne(Wrappers.<WorkOrderEntity>lambdaQuery().eq(WorkOrderEntity::getYoId,order.getId()));
+                    List<WorkPlanEntity> oldWorkPlanList = workPlanService.list(Wrappers.<WorkPlanEntity>lambdaQuery().eq(WorkPlanEntity::getWoId,oldWorkOrder.getId()));
+                    List<Long> ppsIds = oldWorkPlanList.stream().map(WorkPlanEntity::getPpsId).collect(Collectors.toList());
+                    craftList = yieldOrderCraftService.list(Wrappers.<YieldOrderCraftEntity>lambdaQuery().eq(YieldOrderCraftEntity::getYoId, order.getId()).ne(YieldOrderCraftEntity::getCaId, 27).notIn(YieldOrderCraftEntity::getPpsId,ppsIds).orderByAsc(YieldOrderCraftEntity::getProcessNo));
+                }
                 //过滤非外协工序
                 List<YieldOrderCraftEntity> craftList1 = craftList.stream().filter(item -> item.getIsOutsource() == false).collect(Collectors.toList());
                 List<Long> workCenterList = craftList1.stream().filter(item -> item.getWorkCenterId() != null).map(YieldOrderCraftEntity::getWorkCenterId).collect(Collectors.toList());
@@ -430,30 +456,19 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                     workPlanList = planMap.get(order.getYoCode());
                     prevProcessEnd = prevProcessEnd.compareTo(workPlanList.get(workPlanList.size() - 1).getPlanEndTime()) > 0 ? prevProcessEnd : workPlanList.get(workPlanList.size() - 1).getPlanEndTime();
                 }
-                //处理外协工序，外协可能多个工序连续的，共享开始结束时间
-                Map<Long, List<YieldOrderCraftEntity>> outSourceMap = craftList.stream().filter(item -> item.getIsOutsource() == true).collect(Collectors.groupingBy(YieldOrderCraftEntity::getOcId));
-                Map<Long, String> ppsIdMap = new HashMap<>();
-                for (Map.Entry<Long, List<YieldOrderCraftEntity>> entry : outSourceMap.entrySet()) {
-                    String ppsIdStr = entry.getValue().stream()
-                            .map(entity -> String.valueOf(entity.getPpsId())) // long → String
-                            // 等价写法：.map(entity -> Long.toString(entity.getPpsId()))
-                            .collect(Collectors.joining(",")); // 逗号分隔拼接
-                    ppsIdMap.put(entry.getKey(), ppsIdStr);
-                }
+
                 for (int i = 0; i < craftList.size(); i++) {
                     YieldOrderCraftEntity craft = craftList.get(i);
                     //如果是外协的话，去查询外协工序时间，若未查询到先默认3天，跳过该工序的排产
                     if (craft.getIsOutsource()) {
-                        String ppsIdStr = ppsIdMap.get(craft.getOcId());
-                        OutsourceProcessEntity outsourceProcess = outsourceProcessService.getOne(Wrappers.<OutsourceProcessEntity>lambdaQuery().eq(OutsourceProcessEntity::getProcessId, ppsIdStr));
-                        BigDecimal totalTime = new BigDecimal(0);
+                        OutsourceProcessEntity outsourceProcess = outsourceProcessService.getOne(Wrappers.<OutsourceProcessEntity>lambdaQuery().eq(OutsourceProcessEntity::getProcessId, craft.getPpsId()));
+                        Double totalTime = 0.0;
                         if (outsourceProcess != null) {
-                            //外协多工序需要把时间平分，方便处理
-                            prevProcessEnd = prevProcessEnd.plusMinutes((long) ((double) outsourceProcess.getDays() / ppsIdStr.split(",").length * 24 * 60));
-                            totalTime = totalTime.add(BigDecimal.valueOf((long) ((double) outsourceProcess.getDays() / ppsIdStr.split(",").length * 24 * 60)));
+                            prevProcessEnd = prevProcessEnd.plusDays(outsourceProcess.getDays());
+                            totalTime = totalTime + outsourceProcess.getDays() * 24 *60;
                         } else {
                             prevProcessEnd = prevProcessEnd.plusDays(3);
-                            totalTime = totalTime.add(BigDecimal.valueOf(3 * 24 * 60));
+                            totalTime = totalTime + 3 * 24 * 60;
                         }
                         WorkPlanEntity workPlan = new WorkPlanEntity();
                         workPlan.setWoId(order.getId());
@@ -470,27 +485,42 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                         workPlan.setScrapQty(0);
                         workPlan.setOcId(craft.getOcId());
                         workPlanList.add(workPlan);
+                        //下一道工序如果不是外协就只排产到外协工序停止
+                        if(i!=craftList.size()-1 && !craftList.get(i+1).getIsOutsource()){
+                            break;
+                        }
                     } else {
                         if ("设备".equals(mainProducerMap.get(craft.getPpsId()))) {
-                            //热表同槽
-                            Boolean isSameTrough = sameTrough(order, craft, prevProcessEnd, workPlanList);
-                            //同槽就不需要继续匹配了
-                            if (isSameTrough) {
-                                continue;
-                            }
                             String glassCodeStr = null;
                             Map<String, Object> sameFurnaceMap = new HashMap<>();
-                            //烧结同炉
-                            if (sintMap.containsKey(craft.getPpsId())) {
-                                sameFurnaceMap = sameFurnace(order, craft, workPlanList, prevProcessEnd, glassCodeStr, sintMap);
-                                //同炉的话就不用走下面的匹配了，直接下一工序
-                                if (sameFurnaceMap.get("isSameFurnace").toString() == "true") {
+                            //同炉同槽
+                            if(order.getYieldType() == YieldOrderEnum.YIELD_TYPE_1.getCode()){
+                                //热表同槽
+                                Boolean isSameTrough = sameTrough(order, craft, prevProcessEnd, workPlanList);
+                                //同槽就不需要继续匹配了
+                                if (isSameTrough) {
                                     continue;
                                 }
+                            }else{
+                                //烧结同炉
+                                if (sintMap.containsKey(craft.getPpsId())) {
+                                    sameFurnaceMap = sameFurnace(order, craft, workPlanList, localDateTime, glassCodeStr, sintMap, part, processMap, prevProcessEnd);
+                                    //同炉的话就不用走下面的匹配了，直接下一工序
+                                    if (sameFurnaceMap.get("isSameFurnace").toString() == "true") {
+                                        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm");
+                                        prevProcessEnd = LocalDateTime.parse(sameFurnaceMap.get("prevProcessEnd").toString(), formatter);
+                                        continue;
+                                    }
+                                }
                             }
 
                             //根据作业中心查询所有设备
-                            List<EquipAbilityEntity> equipAbilityList = equipAbilityService.list(Wrappers.<EquipAbilityEntity>lambdaQuery().in(EquipAbilityEntity::getWorkCenterId, craft.getWorkCenterId()).eq(EquipAbilityEntity::getCraftId, craft.getCaId()));
+                            List<EquipAbilityEntity> equipAbilityList = new ArrayList<>();
+                            if(order.getYieldType() == YieldOrderEnum.YIELD_TYPE_1.getCode()){
+                                equipAbilityList = equipAbilityService.list(Wrappers.<EquipAbilityEntity>lambdaQuery().in(EquipAbilityEntity::getWorkCenterId, craft.getWorkCenterId()).eq(EquipAbilityEntity::getCraftId, craft.getCaId()));
+                            }else{
+                                equipAbilityList = equipAbilityService.list(Wrappers.<EquipAbilityEntity>lambdaQuery().in(EquipAbilityEntity::getWorkCenterId, craft.getWorkCenterId()).eq(EquipAbilityEntity::getCraftId, craft.getCaId()).eq(EquipAbilityEntity::getProcessId,craft.getPpsId()));
+                            }
                             if (CollectionUtils.isEmpty(equipAbilityList)) {
                                 order.setErrorInfo("作业中心：" + workCenterMap.get(craft.getWorkCenterId()) + ",工艺：" + craftAbilityMap.get(craft.getCaId()) + ",工序：" + processMap.get(craft.getPpsId()) + ",未匹配到对应的设备能力");
                                 order.setStatus(YieldOrderEnum.STATUS_PROCESS_ERROR.getCode());
@@ -505,12 +535,39 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                             LocalDateTime dateTime = getNextIntegerTime(prevProcessEnd);
                             for (Map.Entry<Integer, List<EquipAbilityEntity>> entry : equipAbilityMap.entrySet()) {
                                 //根据时间点获取所有设备资源
-                                List<EquipResourceEntity> equipResourceList = equipResourceService.list(Wrappers.<EquipResourceEntity>lambdaQuery()
-                                        .eq(EquipResourceEntity::getCraftId, craft.getCaId())
-                                        .eq(EquipResourceEntity::getWorkCenterId, craft.getWorkCenterId())
-                                        .ge(EquipResourceEntity::getStartTime, dateTime)
-                                        .eq(EquipResourceEntity::getIsUsed, 0)
-                                        .in(EquipResourceEntity::getEquipOrder, entry.getKey()));
+                                List<EquipResourceEntity> equipResourceList = new ArrayList<>();
+                                if(order.getYieldType() == YieldOrderEnum.YIELD_TYPE_1.getCode()){
+                                    equipResourceList = equipResourceService.list(Wrappers.<EquipResourceEntity>lambdaQuery()
+                                            .eq(EquipResourceEntity::getCraftId, craft.getCaId())
+                                            .eq(EquipResourceEntity::getWorkCenterId, craft.getWorkCenterId())
+                                            .ge(EquipResourceEntity::getStartTime, dateTime)
+                                            .eq(EquipResourceEntity::getIsUsed, 0)
+                                            .in(EquipResourceEntity::getEquipOrder, entry.getKey()));
+                                }else{
+                                    if(order.getYieldType() == YieldOrderEnum.YIELD_TYPE_3.getCode()){
+                                        equipResourceList = equipResourceService.list(Wrappers.<EquipResourceEntity>lambdaQuery()
+                                                .eq(EquipResourceEntity::getCraftId, craft.getCaId())
+                                                .eq(EquipResourceEntity::getWorkCenterId, craft.getWorkCenterId())
+                                                .eq(EquipResourceEntity::getProcessId,craft.getPpsId())
+                                                .ge(EquipResourceEntity::getStartTime, dateTime)
+                                                .eq(EquipResourceEntity::getIsUsed, 0)
+                                                .in(EquipResourceEntity::getEquipOrder, entry.getKey())
+                                                .lt(EquipResourceEntity::getStartNum,part.getBlbDiameter())
+                                                .ge(EquipResourceEntity::getEndNum,part.getBlbDiameter()));
+                                    }else{
+                                        equipResourceList = equipResourceService.list(Wrappers.<EquipResourceEntity>lambdaQuery()
+                                                .eq(EquipResourceEntity::getCraftId, craft.getCaId())
+                                                .eq(EquipResourceEntity::getWorkCenterId, craft.getWorkCenterId())
+                                                .eq(EquipResourceEntity::getProcessId,craft.getPpsId())
+                                                .ge(EquipResourceEntity::getStartTime, dateTime)
+                                                .eq(EquipResourceEntity::getIsUsed, 0)
+                                                .in(EquipResourceEntity::getEquipOrder, entry.getKey())
+                                                .lt(EquipResourceEntity::getStartNum,part.getExternalDiameter())
+                                                .ge(EquipResourceEntity::getEndNum,part.getExternalDiameter()));
+                                    }
+
+                                }
+
                                 if (CollectionUtils.isEmpty(equipResourceList)) {
                                     order.setStatus(YieldOrderEnum.STATUS_APS.getCode());
                                     order.setErrorInfo("工序：" + processMap.get(craft.getPpsId()) + ",未匹配到对应的设备资源");
@@ -537,7 +594,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                                                 )
                                         ));
                                 //计算生产所需产能
-                                BigDecimal sumCapacity = order.getYpArea().multiply(BigDecimal.valueOf(order.getYpQty()));
+                                BigDecimal sumCapacity = order.getYieldType() == YieldOrderEnum.YIELD_TYPE_1.getCode() ? order.getYpArea().multiply(BigDecimal.valueOf(order.getYpQty())) : BigDecimal.valueOf(order.getYpQty());
                                 //需要判断设备额定生产能力是否满足订单总产能，如果不满足，则需要把总产能进行拆分
                                 List<BigDecimal> capacityList = capacitySplit(equipResourceMap, sumCapacity);
                                 for (BigDecimal capacity : capacityList) {
@@ -545,6 +602,19 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                                         Boolean isOccupied = false;
                                         List<EquipResourceEntity> resourceList = entry1.getValue();
                                         for (EquipResourceEntity equipResource : resourceList) {
+                                            //烧结订单需判断零件类型
+                                            if(order.getYieldType() != YieldOrderEnum.YIELD_TYPE_1.getCode()){
+                                                //玻璃饼订单查询玻璃饼直径
+                                                if(order.getYieldType() == YieldOrderEnum.YIELD_TYPE_3.getCode()){
+                                                    if(part.getBlbDiameter() <equipResource.getStartNum() || part.getBlbDiameter() > equipResource.getEndNum()){
+                                                        continue;
+                                                    }
+                                                }else{//其他类型订单查询壳体最大外径
+                                                    if(part.getExternalDiameter() < equipResource.getStartNum() || part.getExternalDiameter() > equipResource.getEndNum()){
+                                                        continue;
+                                                    }
+                                                }
+                                            }
                                             //如果产能最大的设备都不满足，后面的设备就不需要判断了
                                             if (equipResource.getRestCapacity().compareTo(capacity) < 0) {
                                                 break;
@@ -553,10 +623,22 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                                                 WorkPlanEntity workPlan = new WorkPlanEntity();
                                                 workPlan.setPlanStartTime(equipResource.getStartTime());
                                                 if ("0".equals(equipResource.getEquipType())) {
-                                                    workPlan.setPlanEndTime(equipResource.getStartTime().plusMinutes(equipResource.getStandardTime().longValue()));
+                                                    workPlan.setPlanEndTime(equipResource.getStartTime().plusMinutes(equipResource.getStandardTime().setScale(0, RoundingMode.CEILING).longValue()));
                                                 } else {
                                                     workPlan.setPlanEndTime(equipResource.getEndTime());
                                                 }
+                                                //烧结订单需额外增加人工工时
+                                                if(order.getYieldType() != YieldOrderEnum.YIELD_TYPE_1.getCode()){
+                                                    Double personHours = 0.0;
+                                                    if("箱式排腊玻化工序".equals(processMap.get(craft.getPpsId()))){
+                                                        personHours = calPersonHoursByXsplbh(order,part);
+                                                    }else if("真空炉灌胶".equals(processMap.get(craft.getPpsId()))){
+                                                        personHours = calPersonHoursByZklgj(order,part);
+                                                    }else{
+                                                        personHours = calPersonHours(order,craft,part);
+                                                    }
+                                                    workPlan.setPlanEndTime(workPlan.getPlanEndTime().plusMinutes(personHours.longValue()));
+                                                }
                                                 workPlan.setWorkQty(order.getYpQty());
                                                 workPlan.setCaId(craft.getCaId());
                                                 workPlan.setPpsId(craft.getPpsId());
@@ -569,7 +651,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                                                 workPlan.setQualifiedQty(0);
                                                 workPlan.setUnqualifiedQty(0);
                                                 workPlan.setScrapQty(0);
-                                                workPlan.setHourQuota(BigDecimal.valueOf(ChronoUnit.MINUTES.between(workPlan.getPlanStartTime(), workPlan.getPlanEndTime())));
+                                                workPlan.setHourQuota((double)ChronoUnit.MINUTES.between(workPlan.getPlanStartTime(), workPlan.getPlanEndTime()));
                                                 workPlan.setEquipCode(equipResource.getEquipCode());
                                                 workPlan.setEquipName(equipResource.getEquipName());
                                                 workPlan.setEquipResourceId(equipResource.getId());
@@ -577,18 +659,26 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                                                 //更新剩余产能
                                                 equipResource.setRestCapacity(equipResource.getRestCapacity().subtract(capacity));
                                                 equipResource.setIsUsed("1");
-                                                if ((order.getYieldType() == 2 || order.getYieldType() == 3) && sameFurnaceMap.get("glassCode") != null) {
+                                                if (order.getYieldType() != YieldOrderEnum.YIELD_TYPE_1.getCode() && sameFurnaceMap.get("glassCode") != null) {
                                                     equipResource.setGlassCode(sameFurnaceMap.get("glassCode").toString());
                                                 }
-
+                                                equipResourceService.updateById(equipResource);
                                                 //同一个设备可能有多个工艺能力，同一时间只能做一个工艺能力的零件，所以需要把当前设备所有工艺能力的剩余产能都更新调
-                                                LambdaUpdateWrapper<EquipResourceEntity> equipWrapper = new LambdaUpdateWrapper<>();
+                                                LambdaQueryWrapper<EquipResourceEntity> equipWrapper = new LambdaQueryWrapper<>();
                                                 equipWrapper.eq(EquipResourceEntity::getEquipCode, equipResource.getEquipCode());
                                                 equipWrapper.eq(EquipResourceEntity::getDateTime, equipResource.getDateTime());
                                                 equipWrapper.eq(EquipResourceEntity::getPeriod, equipResource.getPeriod());
-                                                equipWrapper.eq(EquipResourceEntity::getStartTime, equipResource.getStartTime());
-                                                equipWrapper.eq(EquipResourceEntity::getEndTime, equipResource.getEndTime());
-                                                equipResourceService.update(equipResource, equipWrapper);
+                                                equipWrapper.ne(BaseEntity::getId,equipResource.getId());
+                                                List<EquipResourceEntity> otherResourceList = equipResourceService.list(equipWrapper);
+                                                BigDecimal rate = equipResource.getRestCapacity().divide(equipResource.getTotalCapacity(), 2, RoundingMode.HALF_UP);
+                                                for(EquipResourceEntity otherResource : otherResourceList){
+                                                    otherResource.setRestCapacity(otherResource.getTotalCapacity().multiply(rate).setScale(0, RoundingMode.FLOOR));
+                                                    otherResource.setIsUsed("1");
+                                                    if (order.getYieldType() != YieldOrderEnum.YIELD_TYPE_1.getCode() && sameFurnaceMap.get("glassCode") != null) {
+                                                        otherResource.setGlassCode(sameFurnaceMap.get("glassCode").toString());
+                                                    }
+                                                    equipResourceService.updateById(otherResource);
+                                                }
                                                 //该设备后续所有开始时间小于当前结束时间的时间段都变为不可用
                                                 LambdaUpdateWrapper<EquipResourceEntity> updateWrapper = new LambdaUpdateWrapper();
                                                 updateWrapper.lt(EquipResourceEntity::getStartTime, equipResource.getEndTime());
@@ -619,13 +709,13 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                         } else if ("人".equals(mainProducerMap.get(craft.getPpsId()))) {
                             //匹配人资源
                             WorkPlanEntity workPlan = new WorkPlanEntity();
-                            BigDecimal totalTime = new BigDecimal(0);
-                            PersonAbilityEntity ability = personAbilityMap.get(craft.getWorkCenterId() + "-" + craft.getPpsId() + "-" + craft.getCaId());
-                            log.info("人员能力是：" + craft.getWorkCenterId() + "-" + craft.getPpsId() + "-" + craft.getCaId());
+                            Double totalTime = 0.0;
+                            PersonAbilityEntity ability = personAbilityMap.get(craft.getWorkCenterId() + "-" + craft.getCaId() + "-" + craft.getPpsId());
+                            log.info("人员能力是：" + craft.getWorkCenterId() + "-" + craft.getCaId() + "-" + craft.getPpsId());
                             //镀后检验和镀后接收先按半小时计算
                             if (ability != null) {
                                 if ("镀后检验".equals(ability.getProcessName()) || "镀后接收".equals(ability.getProcessName())) {
-                                    totalTime = BigDecimal.valueOf(30);
+                                    totalTime = 30.0;
                                     workPlan.setPlanStartTime(prevProcessEnd.plusMinutes(30));
                                     workPlan.setPlanEndTime(prevProcessEnd.plusMinutes(60));
                                     if ("镀后接收".equals(ability.getProcessName())) {
@@ -636,11 +726,31 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                                     }
                                     prevProcessEnd = workPlan.getPlanEndTime();
                                 } else {
-                                    if ("0".equals(ability.getType())) {
-                                        totalTime = totalTime.add(BigDecimal.valueOf(order.getYpQty()).multiply(ability.getStandardTime()).add(ability.getPrepareTime()));
-                                    } else {
-                                        totalTime = totalTime.add(ability.getStandardTime()).add(ability.getPrepareTime());
+                                    //烧结订单和热表订单不同的计算逻辑
+                                    if(order.getYieldType() == YieldOrderEnum.YIELD_TYPE_1.getCode()){
+                                        if ("0".equals(ability.getType())) {
+                                            totalTime = totalTime + order.getYpQty() * Double.parseDouble(ability.getStandardTime()) + ability.getPrepareTime().doubleValue();
+                                        } else {
+                                            totalTime = totalTime + Double.parseDouble(ability.getStandardTime()) + ability.getPrepareTime().doubleValue();
+                                        }
+                                    }else{
+                                        if("玻璃封接组装".equals(processMap.get(craft.getPpsId()))){//玻璃封接组装单独计算
+                                            totalTime = calPersonHoursByBlfjzz(order,part);
+                                        }else if("箱式排腊玻化工序".equals(processMap.get(craft.getPpsId()))){
+                                            totalTime = calPersonHoursByXsplbh(order,part);
+                                        }else if("玻璃封接卸模".equals(processMap.get(craft.getPpsId()))){
+                                            totalTime = calPersonHoursByBlfjxm(order,part);
+                                        }else if("玻璃封接灌胶".equals(processMap.get(craft.getPpsId()))){
+                                            totalTime = calPersonHoursByBlfjgj(order,part);
+                                        }else if("真空炉灌胶".equals(processMap.get(craft.getPpsId()))){
+                                            totalTime = calPersonHoursByZklgj(order,part);
+                                        }else if("单侧折针".equals(processMap.get(craft.getPpsId())) || "双侧折针".equals(processMap.get(craft.getPpsId()))){
+                                            totalTime = calPersonHoursByZz(order,part,processMap.get(craft.getPpsId()));
+                                        }else{
+                                            totalTime = calPersonHours(order,craft,part);
+                                        }
                                     }
+
                                     prevProcessEnd = prevProcessEnd.plusMinutes(totalTime.longValue());
                                 }
                                 List<PersonResourceEntity> personResourceList = personResourceService.list(Wrappers.<PersonResourceEntity>lambdaQuery()
@@ -664,7 +774,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                                 }
                             } else {
                                 prevProcessEnd = prevProcessEnd.plusMinutes(30);
-                                totalTime = BigDecimal.valueOf(30);
+                                totalTime = 30.0;
                             }
 
                             workPlan.setWoId(order.getId());
@@ -700,46 +810,54 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                 if (CollectionUtils.isNotEmpty(workPlanList)) {
                     //为人员工序赋值开始结束时间
                     WorkPlanTimeCalculator(workPlanList);
-                    //新增车间订单和车间计划
                     WorkOrderEntity workOrder = new WorkOrderEntity();
-                    workOrder.setWoCode(this.nextCode(order.getYpCode()));
-                    workOrder.setCardNo(order.getCardNo());
-                    workOrder.setBatchNo(order.getBatchNo());
-                    workOrder.setYoId(order.getId());
-                    workOrder.setMakeQty(order.getYpQty());
-                    workOrder.setPlanStartDate(workPlanList.get(0).getPlanStartTime() == null ? null : workPlanList.get(0).getPlanStartTime().truncatedTo(ChronoUnit.DAYS).toString().substring(0, 10));
-                    workOrder.setPlanEndDate(workPlanList.get(workPlanList.size() - 1).getPlanEndTime() == null ? null : workPlanList.get(workPlanList.size() - 1).getPlanEndTime().truncatedTo(ChronoUnit.DAYS).toString().substring(0, 10));
-                    workOrder.setPlanStartTime(workPlanList.get(0).getPlanStartTime() == null ? null : workPlanList.get(0).getPlanStartTime());
-                    workOrder.setPlanEndTime(workPlanList.get(workPlanList.size() - 1).getPlanEndTime() == null ? null : workPlanList.get(workPlanList.size() - 1).getPlanEndTime());
-                    workOrder.setInventoryQty(0);
-                    workOrder.setRunStatus(2);
-                    workOrder.setPickingStatus(0);
-                    workOrder.setOem("0");
-                    workOrder.setPriority(order.getPriorityAps());
-                    workOrder.setApprovalStatus(1);
-                    workOrder.setScrapQty(0);
-                    workOrder.setOemOut("0");
-                    workOrder.setOemType(-1);
-                    workOrder.setPrintFlag("0");
-                    workOrder.setPushFlag("0");
-                    workOrder.setQuotaExceptional("0");
-                    workOrder.setReInStore("0");
-                    workOrder.setPartCode(order.getPartCode());
-                    workOrder.setDemandDate(order.getDemandDate());
-                    //调度员是主工序加工班组的调度员
-                    if (workPlanList.get(0).getMakeTeam() != null) {
-                        TeamSetEntity teamSet = teamSetService.getById(workPlanList.get(0).getMakeTeam());
-                        if (teamSet != null) {
-                            workOrder.setDispatcher(teamSet.getDispatcher());
+                    if(order.getStatus() == YieldOrderEnum.STATUS_APS.getCode()){
+                        //新增车间订单和车间计划
+                        workOrder.setWoCode(this.nextCode(order.getYpCode()));
+                        workOrder.setCardNo(order.getCardNo());
+                        workOrder.setBatchNo(order.getBatchNo());
+                        workOrder.setYoId(order.getId());
+                        workOrder.setMakeQty(order.getYpQty());
+                        workOrder.setPlanStartDate(workPlanList.get(0).getPlanStartTime() == null ? null : workPlanList.get(0).getPlanStartTime().truncatedTo(ChronoUnit.DAYS).toString().substring(0, 10));
+                        workOrder.setPlanEndDate(workPlanList.get(workPlanList.size() - 1).getPlanEndTime() == null ? null : workPlanList.get(workPlanList.size() - 1).getPlanEndTime().truncatedTo(ChronoUnit.DAYS).toString().substring(0, 10));
+                        workOrder.setPlanStartTime(workPlanList.get(0).getPlanStartTime() == null ? null : workPlanList.get(0).getPlanStartTime());
+                        workOrder.setPlanEndTime(workPlanList.get(workPlanList.size() - 1).getPlanEndTime() == null ? null : workPlanList.get(workPlanList.size() - 1).getPlanEndTime());
+                        workOrder.setInventoryQty(0);
+                        workOrder.setRunStatus(2);
+                        workOrder.setPickingStatus(0);
+                        workOrder.setOem("0");
+                        workOrder.setPriority(order.getPriorityAps());
+                        workOrder.setApprovalStatus(1);
+                        workOrder.setScrapQty(0);
+                        workOrder.setOemOut("0");
+                        workOrder.setOemType(-1);
+                        workOrder.setPrintFlag("0");
+                        workOrder.setPushFlag("0");
+                        workOrder.setQuotaExceptional("0");
+                        workOrder.setReInStore("0");
+                        workOrder.setPartCode(order.getPartCode());
+                        workOrder.setDemandDate(order.getDemandDate());
+                        //调度员是主工序加工班组的调度员
+                        if (workPlanList.get(0).getMakeTeam() != null) {
+                            TeamSetEntity teamSet = teamSetService.getById(workPlanList.get(0).getMakeTeam());
+                            if (teamSet != null) {
+                                workOrder.setDispatcher(teamSet.getDispatcher());
+                            }
                         }
-                    }
 
 
-                    this.save(workOrder);
-                    workPlanList.forEach(workPlanEntity -> {
-                        workPlanEntity.setWoId(workOrder.getId());
-                        workPlanService.save(workPlanEntity);
-                    });
+                        this.save(workOrder);
+                    }else if(order.getStatus() == YieldOrderEnum.STATUS_OUTSOURCING_WAITING.getCode()){
+                        workOrder = this.getOne(Wrappers.<WorkOrderEntity>lambdaQuery().eq(WorkOrderEntity::getYoId,order.getId()));
+                        workOrder.setPlanEndDate(workPlanList.get(workPlanList.size() - 1).getPlanEndTime() == null ? null : workPlanList.get(workPlanList.size() - 1).getPlanEndTime().truncatedTo(ChronoUnit.DAYS).toString().substring(0, 10));
+                        workOrder.setPlanEndTime(workPlanList.get(workPlanList.size() - 1).getPlanEndTime() == null ? null : workPlanList.get(workPlanList.size() - 1).getPlanEndTime());
+                        this.updateById(workOrder);
+                    }
+                    for(WorkPlanEntity workPlan : workPlanList){
+                        workPlan.setWoId(workOrder.getId());
+                        workPlanService.save(workPlan);
+                    }
+
                     for (int i = 0; i < workPlanList.size(); i++) {
                         WorkPlanEntity workPlan = workPlanList.get(i);
                         if (i != 0) {
@@ -849,12 +967,12 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                 if (list.get(i).getPlanStartTime() == null && list.get(i).getPlanEndTime() == null) {
                     if (i != 0 && list.get(i - 1).getPlanEndTime() != null) {
                         list.get(i).setPlanStartTime(list.get(i - 1).getPlanEndTime());
-                        list.get(i).setPlanEndTime(list.get(i).getPlanStartTime().plusMinutes(list.get(i).getHourQuota().longValue()));
+                        list.get(i).setPlanEndTime(list.get(i).getPlanStartTime().plusMinutes((long)Math.ceil(list.get(i).getHourQuota())));
                         continue;
                     }
                     if (i != list.size() - 1 && list.get(i + 1).getPlanStartTime() != null) {
                         list.get(i).setPlanEndTime(list.get(i + 1).getPlanStartTime());
-                        list.get(i).setPlanStartTime(list.get(i).getPlanEndTime().minusMinutes(list.get(i).getHourQuota().longValue()));
+                        list.get(i).setPlanStartTime(list.get(i).getPlanEndTime().minusMinutes((long)Math.ceil(list.get(i).getHourQuota())));
                     }
                 }
             }
@@ -866,7 +984,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                 LocalDateTime prevProcessEnd = LocalDateTime.now();
                 for (int i = 0; i < list.size(); i++) {
                     list.get(i).setPlanStartTime(prevProcessEnd);
-                    list.get(i).setPlanEndTime(prevProcessEnd.plusMinutes(list.get(i).getHourQuota().longValue()));
+                    list.get(i).setPlanEndTime(prevProcessEnd.plusMinutes((long)Math.ceil(list.get(i).getHourQuota())));
                     prevProcessEnd = list.get(i).getPlanEndTime();
                 }
             }
@@ -879,7 +997,6 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
     public List<BigDecimal> capacitySplit(Map<LocalDateTime, List<EquipResourceEntity>> map, BigDecimal sumCapacity) {
         List<EquipResourceEntity> equipResourceList1 = map.values().stream().flatMap(List::stream).collect(Collectors.toList());
         BigDecimal maxRestCapacity = equipResourceList1.stream().filter(entity -> entity.getRestCapacity().compareTo(BigDecimal.ZERO) >= 0).map(EquipResourceEntity::getRestCapacity).max(BigDecimal::compareTo).orElseThrow(() -> new IllegalArgumentException("列表中无有效的 restCapacity 数值"));
-        ;
         List<BigDecimal> capacityList = new ArrayList<>();
         if (sumCapacity.compareTo(maxRestCapacity) > 0) {
             // 计算商（fullCount）和余数（remainder）：divideAndRemainder返回[商, 余数]
@@ -994,7 +1111,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                             if (workPlan.getEquipResourceId() != null) {
                                 EquipResourceEntity equipResource = equipResourceService.getById(workPlan.getEquipResourceId());
                                 equipResource.setIsUsed("0");
-                                equipResource.setRestCapacity(equipResource.getRestCapacity().add(workPlan.getHourQuota()));
+                                equipResource.setRestCapacity(equipResource.getRestCapacity().add(BigDecimal.valueOf(workPlan.getHourQuota())));
                                 LambdaUpdateWrapper<EquipResourceEntity> updateWrapper = new LambdaUpdateWrapper<>();
                                 updateWrapper.eq(EquipResourceEntity::getEquipCode, equipResource.getEquipCode());
                                 updateWrapper.eq(EquipResourceEntity::getDateTime, equipResource.getDateTime());
@@ -1094,7 +1211,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             //对前置公共工序进行排产
             //获取公共工序设备能力，根据工艺能力查询，写死ID是27
             EquipAbilityEntity equipAbility = equipAbilityService.getOne(Wrappers.<EquipAbilityEntity>lambdaQuery().eq(EquipAbilityEntity::getCraftId, 27));
-            BigDecimal standardProcessAbility = equipAbility.getStandardProcessAbility();
+            BigDecimal standardProcessAbility = BigDecimal.valueOf(Integer.parseInt(equipAbility.getStandardProcessAbility()));
             //获取所有空闲的公共工序资源
             List<EquipResourceEntity> equipResourceList = equipResourceService.selectCommonCraftList();
             for (YieldOrderEntity order : commonCraftOrderList) {
@@ -1117,7 +1234,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                             equipResourceService.updateById(equipResource);
                             WorkPlanEntity workPlan = new WorkPlanEntity();
                             workPlan.setPlanStartTime(equipResource.getStartTime());
-                            workPlan.setPlanEndTime(equipResource.getStartTime().plusMinutes(equipResource.getStandardTime().longValue()));
+                            workPlan.setPlanEndTime(equipResource.getStartTime().plusMinutes(equipResource.getStandardTime().setScale(0, RoundingMode.CEILING).longValue()));
                             workPlan.setWorkQty(order.getYpQty());
                             workPlan.setCaId(craft.getCaId());
                             workPlan.setPpsId(craft.getPpsId());
@@ -1130,7 +1247,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                             workPlan.setQualifiedQty(0);
                             workPlan.setUnqualifiedQty(0);
                             workPlan.setScrapQty(0);
-                            workPlan.setHourQuota(BigDecimal.valueOf(ChronoUnit.MINUTES.between(workPlan.getPlanStartTime(), workPlan.getPlanEndTime())));
+                            workPlan.setHourQuota((double)ChronoUnit.MINUTES.between(workPlan.getPlanStartTime(), workPlan.getPlanEndTime()));
                             workPlan.setEquipCode(equipResource.getEquipCode());
                             workPlan.setEquipName(equipResource.getEquipName());
                             workPlan.setEquipResourceId(equipResource.getId());
@@ -1182,7 +1299,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             if (workPlan.getEquipResourceId() != null) {
                 EquipResourceEntity equipResource = equipResourceService.getById(workPlan.getEquipResourceId());
                 equipResource.setIsUsed("0");
-                equipResource.setRestCapacity(equipResource.getRestCapacity().add(workPlan.getHourQuota()));
+                equipResource.setRestCapacity(equipResource.getRestCapacity().add(BigDecimal.valueOf(workPlan.getHourQuota())));
                 LambdaUpdateWrapper<EquipResourceEntity> updateWrapper = new LambdaUpdateWrapper<>();
                 updateWrapper.eq(EquipResourceEntity::getEquipCode, equipResource.getEquipCode());
                 updateWrapper.eq(EquipResourceEntity::getDateTime, equipResource.getDateTime());
@@ -1311,7 +1428,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                                 WorkPlanEntity workPlan = new WorkPlanEntity();
                                 workPlan.setPlanStartTime(equipResource.getStartTime());
                                 if ("0".equals(equipResource.getEquipType())) {
-                                    workPlan.setPlanEndTime(equipResource.getStartTime().plusMinutes(equipResource.getStandardTime().longValue()));
+                                    workPlan.setPlanEndTime(equipResource.getStartTime().plusMinutes(equipResource.getStandardTime().setScale(0, RoundingMode.CEILING).longValue()));
                                 } else {
                                     workPlan.setPlanEndTime(equipResource.getEndTime());
                                 }
@@ -1327,7 +1444,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                                 workPlan.setQualifiedQty(0);
                                 workPlan.setUnqualifiedQty(0);
                                 workPlan.setScrapQty(0);
-                                workPlan.setHourQuota(BigDecimal.valueOf(ChronoUnit.MINUTES.between(workPlan.getPlanStartTime(), workPlan.getPlanEndTime())));
+                                workPlan.setHourQuota((double)ChronoUnit.MINUTES.between(workPlan.getPlanStartTime(), workPlan.getPlanEndTime()));
                                 workPlan.setEquipCode(equipResource.getEquipCode());
                                 workPlan.setEquipName(equipResource.getEquipName());
                                 workPlan.setEquipResourceId(equipResource.getId());
@@ -1347,19 +1464,27 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         return isSameTrough;
     }
 
-    public Map<String, Object> sameFurnace(YieldOrderEntity order, YieldOrderCraftEntity craft, List<WorkPlanEntity> workPlanList, LocalDateTime prevProcessEnd, String glassCodeStr, Map<Long, List<SintTempCurveEntity>> sintMap) {
+    public Map<String, Object> sameFurnace(YieldOrderEntity order,
+                                           YieldOrderCraftEntity craft,
+                                           List<WorkPlanEntity> workPlanList,
+                                           LocalDateTime localDateTime,
+                                           String glassCodeStr,
+                                           Map<Long, List<SintTempCurveEntity>> sintMap,
+                                           PartEntity part,
+                                           Map<Long, String> processMap,
+                                           LocalDateTime prevProcessEnd) {
         Map<String, Object> map = new HashMap<>();
         Boolean isSameFurnace = false;
-        if (order.getYieldType() == YieldOrderEnum.YIELD_TYPE_2.getCode() || order.getYieldType() == YieldOrderEnum.YIELD_TYPE_3.getCode()) {//烧结订单
+        if (order.getYieldType() != YieldOrderEnum.YIELD_TYPE_1.getCode()) {//烧结订单
             //获取当前工序的所有温度曲线
             List<SintTempCurveEntity> sintList = sintMap.get(craft.getPpsId());
             List<List<String>> sintMaterialList = new ArrayList<>();
             sintList.stream().map(SintTempCurveEntity::getGlassCode).collect(Collectors.toList()).forEach(item -> sintMaterialList.add(Arrays.asList(item.split(","))));
 
             //根据零件号获取子件信息
-            PartEntity part = new PartEntity();
-            part.setPartCode(order.getPartCode());
-            List<PartEntity> childPartList = partService.selectChildPart(part);
+            List<PartRelationEntity> partRelationList = partRelationService.list(Wrappers.<PartRelationEntity>lambdaQuery().eq(PartRelationEntity::getPartId,part.getId()));
+            List<Long> childIds = partRelationList.stream().map(PartRelationEntity::getChildPartId).collect(Collectors.toList());
+            List<PartEntity> childPartList = partService.list(Wrappers.<PartEntity>lambdaQuery().in(BaseEntity::getId,childIds));
             if (CollectionUtils.isNotEmpty(childPartList)) {
                 //获取子件的所有玻璃粉牌号
                 List<String> materialList = childPartList.stream().filter(item -> StringUtils.isNotEmpty(item.getMaterial())).map(PartEntity::getMaterial).collect(Collectors.toList());
@@ -1380,14 +1505,31 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             }
             //包含说明之前有过这个温度曲线的订单
             //根据当前时间查询包含玻璃粉牌号的设备资源
-            List<EquipResourceEntity> equipResourceList = equipResourceService.list(Wrappers.<EquipResourceEntity>lambdaQuery()
-                    .eq(EquipResourceEntity::getWorkCenterId, craft.getWorkCenterId())
-                    .eq(EquipResourceEntity::getCraftId, craft.getCaId())
-                    .ge(EquipResourceEntity::getStartTime, prevProcessEnd)
-                    .eq(EquipResourceEntity::getGlassCode, glassCodeStr));
+            //玻璃饼订单查玻璃饼直接，其他订单查
+            List<EquipResourceEntity> equipResourceList = new ArrayList<>();
+            if(order.getYieldType() == YieldOrderEnum.YIELD_TYPE_3.getCode()){
+                equipResourceList = equipResourceService.list(Wrappers.<EquipResourceEntity>lambdaQuery()
+                        .eq(EquipResourceEntity::getWorkCenterId, craft.getWorkCenterId())
+                        .eq(EquipResourceEntity::getCraftId, craft.getCaId())
+                        .eq(EquipResourceEntity::getProcessId,craft.getPpsId())
+                        .ge(EquipResourceEntity::getStartTime, localDateTime)
+                        .eq(EquipResourceEntity::getGlassCode, glassCodeStr)
+                        .lt(EquipResourceEntity::getStartNum,part.getBlbDiameter())
+                        .ge(EquipResourceEntity::getEndNum,part.getBlbDiameter()));
+            }else{
+                equipResourceList = equipResourceService.list(Wrappers.<EquipResourceEntity>lambdaQuery()
+                        .eq(EquipResourceEntity::getWorkCenterId, craft.getWorkCenterId())
+                        .eq(EquipResourceEntity::getCraftId, craft.getCaId())
+                        .eq(EquipResourceEntity::getProcessId,craft.getPpsId())
+                        .ge(EquipResourceEntity::getStartTime, localDateTime)
+                        .eq(EquipResourceEntity::getGlassCode, glassCodeStr)
+                        .lt(EquipResourceEntity::getStartNum,part.getExternalDiameter())
+                        .ge(EquipResourceEntity::getEndNum,part.getExternalDiameter()));
+            }
+
             if (CollectionUtils.isNotEmpty(equipResourceList)) {
                 //计算生产所需产能，需将m2换算成dm2
-                BigDecimal sumCapacity = order.getYpArea().multiply(BigDecimal.valueOf(order.getYpQty()));
+                BigDecimal sumCapacity = BigDecimal.valueOf(order.getYpQty());
 
                 for (EquipResourceEntity equipResource : equipResourceList) {
                     if (equipResource.getRestCapacity().compareTo(sumCapacity) > 0) {
@@ -1395,10 +1537,19 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                         WorkPlanEntity workPlan = new WorkPlanEntity();
                         workPlan.setPlanStartTime(equipResource.getStartTime());
                         if ("0".equals(equipResource.getEquipType())) {
-                            workPlan.setPlanEndTime(equipResource.getStartTime().plusMinutes(equipResource.getStandardTime().longValue()));
+                            workPlan.setPlanEndTime(equipResource.getStartTime().plusMinutes(equipResource.getStandardTime().setScale(0, RoundingMode.CEILING).longValue()));
                         } else {
                             workPlan.setPlanEndTime(equipResource.getEndTime());
                         }
+                        Double personHours = 0.0;
+                        if("箱式排腊玻化工序".equals(processMap.get(craft.getPpsId()))){
+                            personHours = calPersonHoursByXsplbh(order,part);
+                        }else if("真空炉灌胶".equals(processMap.get(craft.getPpsId()))){
+                            personHours = calPersonHoursByZklgj(order,part);
+                        }else{
+                            personHours = calPersonHours(order,craft,part);
+                        }
+                        workPlan.setPlanEndTime(workPlan.getPlanEndTime().plusMinutes(personHours.longValue()));
                         workPlan.setWorkQty(order.getYpQty());
                         workPlan.setCaId(craft.getCaId());
                         workPlan.setPpsId(craft.getPpsId());
@@ -1411,7 +1562,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                         workPlan.setQualifiedQty(0);
                         workPlan.setUnqualifiedQty(0);
                         workPlan.setScrapQty(0);
-                        workPlan.setHourQuota(BigDecimal.valueOf(ChronoUnit.MINUTES.between(workPlan.getPlanStartTime(), workPlan.getPlanEndTime())));
+                        workPlan.setHourQuota((double)ChronoUnit.MINUTES.between(workPlan.getPlanStartTime(), workPlan.getPlanEndTime()));
                         workPlan.setEquipCode(equipResource.getEquipCode());
                         workPlan.setEquipName(equipResource.getEquipName());
                         workPlan.setEquipResourceId(equipResource.getId());
@@ -1419,7 +1570,20 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
 
                         equipResource.setRestCapacity(equipResource.getRestCapacity().subtract(sumCapacity));
                         equipResourceService.updateById(equipResource);
+
+                        LambdaQueryWrapper<EquipResourceEntity> equipWrapper = new LambdaQueryWrapper<>();
+                        equipWrapper.eq(EquipResourceEntity::getEquipCode, equipResource.getEquipCode());
+                        equipWrapper.eq(EquipResourceEntity::getDateTime, equipResource.getDateTime());
+                        equipWrapper.eq(EquipResourceEntity::getPeriod, equipResource.getPeriod());
+                        equipWrapper.ne(BaseEntity::getId,equipResource.getId());
+                        List<EquipResourceEntity> otherResourceList = equipResourceService.list(equipWrapper);
+                        BigDecimal rate = equipResource.getRestCapacity().divide(equipResource.getTotalCapacity(), 2, RoundingMode.HALF_UP);
+                        for(EquipResourceEntity otherResource : otherResourceList){
+                            otherResource.setRestCapacity(otherResource.getTotalCapacity().multiply(rate).setScale(0, RoundingMode.FLOOR));
+                            equipResourceService.updateById(otherResource);
+                        }
                         isSameFurnace = true;
+                        prevProcessEnd = workPlan.getPlanEndTime();
                     }
                     break;
                 }
@@ -1428,6 +1592,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
 
         }
         map.put("isSameFurnace", isSameFurnace);
+        map.put("prevProcessEnd" , prevProcessEnd);
         return map;
     }
 
@@ -1544,6 +1709,439 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
         return page.setRecords(list);
     }
 
+    public Double calPersonHours(YieldOrderEntity order,YieldOrderCraftEntity craft,PartEntity part){
+        Double personTime = 0.0;
+        List<PersonAbilityEntity> personAbilityList = personAbilityService.list(Wrappers.<PersonAbilityEntity>lambdaQuery()
+                .eq(PersonAbilityEntity::getWorkCenterId,craft.getWorkCenterId())
+                .eq(PersonAbilityEntity::getCraftId,craft.getCaId())
+                .eq(PersonAbilityEntity::getProcessId,craft.getPpsId()));
+        if(CollectionUtils.isNotEmpty(personAbilityList)){
+            int partType = personAbilityList.get(0).getPartType();
+            if(partType == WorkOrderEnum.STATUS_PART_TYPE_1.getCode()){
+                for(PersonAbilityEntity personAbility : personAbilityList){
+                    List<PersonAbilityVO> voList = JsonUtil.readValue(personAbility.getStandardTime(), new TypeReference<List<PersonAbilityVO>>() {});
+                    for(PersonAbilityVO vo : voList){
+                        if(part.getExternalDiameter() > vo.getStartNum() && part.getExternalDiameter() <= vo.getEndNum()){
+                            personTime = Double.parseDouble(vo.getStandardTime()) * order.getYpQty() + personAbility.getPrepareTime().doubleValue();
+                            break;
+                        }
+                    }
+
+                }
+
+            }else if(partType == WorkOrderEnum.STATUS_PART_TYPE_2.getCode()){
+
+                for(PersonAbilityEntity personAbility : personAbilityList){
+                    List<PersonAbilityVO> voList = JsonUtil.readValue(personAbility.getStandardTime(), new TypeReference<List<PersonAbilityVO>>() {});
+                    for(PersonAbilityVO vo : voList){
+                        if(part.getBlbDiameter() >vo.getStartNum() && part.getBlbDiameter() <= vo.getEndNum()){
+                            personTime = Double.parseDouble(vo.getStandardTime()) * order.getYpQty() + personAbility.getPrepareTime().doubleValue();
+                            break;
+                        }
+                    }
+
+                }
+
+            }else if(partType == WorkOrderEnum.STATUS_PART_TYPE_3.getCode()){
+                //芯数为子件插针数量
+                List<PartRelationEntity> partRelationList = partRelationService.list(Wrappers.<PartRelationEntity>lambdaQuery().eq(PartRelationEntity::getPartId,part.getId()));
+                if(CollectionUtils.isNotEmpty(partRelationList)){
+                    Double quota = 0.0;
+                    for(PartRelationEntity partRelation : partRelationList){
+                        PartEntity childPart = partService.getById(partRelation.getChildPartId());
+                        if(DsPartConstant.SIN_TER_TYPE_CZ.equals(childPart.getSinTerType())){
+                            //双面印字芯数需乘以2
+                            quota = "3".equals(childPart.getIsPrint()) ? childPart.getQuota()*2 : childPart.getQuota();
+                            break;
+                        }
+                    }
+                    for(PersonAbilityEntity personAbility : personAbilityList){
+                        List<PersonAbilityVO> voList = JsonUtil.readValue(personAbility.getStandardTime(), new TypeReference<List<PersonAbilityVO>>() {});
+                        for(PersonAbilityVO vo : voList){
+                            if(quota > vo.getStartNum() && quota <= vo.getEndNum()){
+                                personTime = Double.parseDouble(vo.getStandardTime()) * order.getYpQty() + personAbility.getPrepareTime().doubleValue();
+                                break;
+                            }
+                        }
+
+                    }
+                }
+
+            }else{
+                PersonAbilityEntity personAbility = personAbilityService.getOne(Wrappers.<PersonAbilityEntity>lambdaQuery()
+                        .eq(PersonAbilityEntity::getWorkCenterId,craft.getWorkCenterId())
+                        .eq(PersonAbilityEntity::getCraftId,craft.getCaId())
+                        .eq(PersonAbilityEntity::getProcessId,craft.getPpsId()));
+                personTime = Double.parseDouble(personAbility.getStandardTime()) * order.getYpQty() + personAbility.getPrepareTime().doubleValue();
+            }
+        }
+        return Math.ceil(personTime);
+    }
+
+
+    //玻璃封接组装
+    public Double calPersonHoursByBlfjzz(YieldOrderEntity order,PartEntity part){
+        Double result = 0.0;
+        if (part != null && part.getId() != null) {
+            List<PartRelationEntity> partRelationList = partRelationService.list(Wrappers.<PartRelationEntity>lambdaQuery().eq(PartRelationEntity::getPartId,part.getId()));
+            List<Long> childIds = partRelationList.stream().map(PartRelationEntity::getChildPartId).collect(Collectors.toList());
+            List<PartEntity> childPartList = partService.list(Wrappers.<PartEntity>lambdaQuery().in(BaseEntity::getId,childIds));
+            List<PartEntity> partCz = childPartList.stream().filter(item -> DsPartConstant.SIN_TER_TYPE_CZ.equals(item.getSinTerType())).collect(Collectors.toList());
+            List<PartEntity> partBlb = childPartList.stream().filter(item -> DsPartConstant.SIN_TER_TYPE_BLB.equals(item.getSinTerType())).collect(Collectors.toList());
+            boolean hb = false;
+            for (PartEntity part1 : partCz) {
+                hb = part1.getPartName().contains("焊杯");
+            }
+
+            double sumOfQuota = partCz.stream()
+                    .mapToDouble(PartEntity::getQuota) // 调用 getQuota() 方法
+                    .sum();
+            int x = partCz.size();
+            int y = partBlb.size();
+            if (sumOfQuota <= 5) {
+                result = (5.5 * sumOfQuota + 20) / 60 + 0.8;
+            }
+            if (sumOfQuota <= 20 && sumOfQuota > 5) {
+                result = (5.8 * sumOfQuota + 20) / 60 + 0.8;
+                if (y > 2) {
+                    result = 1.5 * result;
+                }
+                if (hb) {
+                    result = result + 0.5 * sumOfQuota / 60 + 0.2;
+                }
+                if (x > 3) {
+                    result = 1.2 * result + 3;
+                }
+            }
+            if (sumOfQuota <= 30 && sumOfQuota > 20) {
+                result = (6 * sumOfQuota + 20) / 60 + 0.8;
+                if (y > 2) {
+                    result = 1.6 * result;
+                }
+                if (hb) {
+                    result = result + (1 * sumOfQuota) / 60 + 0.2;
+                }
+                if (x > 3) {
+                    result = 1.5 * result + 5;
+                }
+            }
+            if (sumOfQuota <= 50 && sumOfQuota > 30) {
+                result = (6.2 * sumOfQuota + 25) / 60 + 1.3;
+                if (y > 2) {
+                    result = 1.8 * result;
+                }
+                if (hb) {
+                    result = result + (2 * sumOfQuota) / 60 + 0.3;
+                }
+                if (x > 3) {
+                    result = 1.8 * result + 6;
+                }
+            }
+            if (sumOfQuota <= 80 && sumOfQuota > 50) {
+                result = (6.4 * sumOfQuota + 25) / 60 + 1.5;
+                if (y > 2) {
+                    result = 2 * result;
+                }
+                if (hb) {
+                    result = result + (3 * sumOfQuota) / 60 + 0.5;
+                }
+                if (x > 3) {
+                    result = 2.2 * result + 9;
+                }
+            }
+            if (sumOfQuota <= 100 && sumOfQuota > 80) {
+                result = (6.5 * sumOfQuota + 25) / 60 + 1.8;
+                if (y > 2) {
+                    result = 2 * result;
+                }
+                if (hb) {
+                    result = result + (3.5 * sumOfQuota) / 60 + 0.7;
+                }
+                if (x > 3) {
+                    result = 2.5 * result + 12;
+                }
+            }
+            if (sumOfQuota > 100) {
+                result = (6.6 * sumOfQuota + 60) / 60 + 2.1;
+                if (y > 2) {
+                    result = 2 * result;
+                }
+                if (hb) {
+                    result = result + (4 * sumOfQuota) / 60 + 1;
+                }
+                if (x > 3) {
+                    result = 2.5 * result + 15;
+                }
+            }
+
+        }
+        return Math.ceil(result * order.getYpQty());
+    }
+
+    //箱式排腊玻化工序
+    public Double calPersonHoursByXsplbh(YieldOrderEntity order,PartEntity part){
+        Double result = 0.0;
+        if (part != null && part.getId() != null && part.getBlbDiameter() != null) {
+            Double n = part.getBlbDiameter();
+            double y = 0.0;
+            if (n <= 10) {
+                y = 1.0;
+            }
+            if (n <= 20 && n > 10) {
+                y = 2.0;
+            }
+            if (n <= 30 && n > 20) {
+                y = 3.0;
+            }
+            if (n <= 40 && n > 30) {
+                y = 4.0;
+            }
+            if (n <= 50 && n > 40) {
+                y = 5.0;
+            }
+            if (n <= 60 && n > 50) {
+                y = 6.0;
+            }
+            result = 0.6 + 0.6 * Math.pow(1.2, y);
+        }
+        return Math.ceil(result * order.getYpQty() + 19);
+    }
 
+    //玻璃封接卸模
+    public Double calPersonHoursByBlfjxm(YieldOrderEntity order,PartEntity part){
+        Double result = 0.0;
+        if (part != null && part.getId() != null) {
+            List<PartRelationEntity> partRelationList = partRelationService.list(Wrappers.<PartRelationEntity>lambdaQuery().eq(PartRelationEntity::getPartId,part.getId()));
+            List<Long> childIds = partRelationList.stream().map(PartRelationEntity::getChildPartId).collect(Collectors.toList());
+            List<PartEntity> childPartList = partService.list(Wrappers.<PartEntity>lambdaQuery().in(BaseEntity::getId,childIds));
+            if (childPartList != null && childPartList.size() > 0) {
+                double n = 0;
+                boolean pzm = false;
+                for (PartEntity childPart : childPartList) {
+                    if (childPart.getPartCode().contains("21E8-716")) {
+                        n = n + childPart.getQuota();
+                    }
+                    pzm = childPart.getSinTerType().equals(DsPartConstant.SIN_TER_TYPE_KT) && childPart.getConfigCode().equals("M4");
+                }
+                if (n <= 2) {
+                    List<PartEntity> partCz = childPartList.stream().filter(item -> DsPartConstant.SIN_TER_TYPE_CZ.equals(item.getSinTerType())).collect(Collectors.toList());
+                    if (partCz != null && partCz.size() > 0) {
+                        double sumOfQuota = partCz.stream()
+                                .mapToDouble(PartEntity::getQuota) // 调用 getQuota() 方法
+                                .sum();
+                        double y = 0;
+                        if (sumOfQuota <= 5) {
+                            y = 0;
+                        }
+                        if (sumOfQuota > 5 && sumOfQuota <= 20) {
+                            y = 1.0;
+                        }
+                        if (sumOfQuota > 20 && sumOfQuota <= 30) {
+                            y = 2.0;
+                        }
+                        if (sumOfQuota > 30 && sumOfQuota <= 50) {
+                            y = 3.0;
+                        }
+                        if (sumOfQuota > 50 && sumOfQuota <= 80) {
+                            y = 4.0;
+                        }
+                        if (sumOfQuota > 80) {
+                            y = 5.0;
+                        }
+                        result = 2 + Math.pow(1.2, y);
+                    }
+                }
+                if (n > 2) {
+                    List<PartEntity> partCz = childPartList.stream().filter(item -> DsPartConstant.SIN_TER_TYPE_CZ.equals(item.getSinTerType())).collect(Collectors.toList());
+                    if (partCz != null && partCz.size() > 0) {
+                        double sumOfQuota = partCz.stream()
+                                .mapToDouble(PartEntity::getQuota) // 调用 getQuota() 方法
+                                .sum();
+                        double y = 0;
+                        if (sumOfQuota <= 5) {
+                            y = 0;
+                        }
+                        if (sumOfQuota > 5 && sumOfQuota <= 20) {
+                            y = 1.0;
+                        }
+                        if (sumOfQuota > 20 && sumOfQuota <= 30) {
+                            y = 2.0;
+                        }
+                        if (sumOfQuota > 30 && sumOfQuota <= 50) {
+                            y = 3.0;
+                        }
+                        if (sumOfQuota > 50 && sumOfQuota <= 80) {
+                            y = 4.0;
+                        }
+                        if (sumOfQuota > 80 && sumOfQuota <= 100) {
+                            y = 5.0;
+                        }
+                        if (sumOfQuota > 100) {
+                            y = 6.0;
+                        }
+                        if (pzm) {
+                            result = 1.5 * (5.3 + Math.pow(2.2, y));
+                        } else {
+                            result = 5.3 + Math.pow(2.2, y);
+                        }
 
+                    }
+                }
+            }
+        }
+        return Math.ceil(result * order.getYpQty() + 3);
+    }
+
+    //玻璃封接灌胶
+    public Double calPersonHoursByBlfjgj(YieldOrderEntity order,PartEntity part){
+        Double result = 0.0;
+        if (part != null && part.getId() != null&&part.getExternalDiameter() != null) {
+            Double n = part.getExternalDiameter();
+            if (part.getKeyInfo().contains("聚矽硅烷")) {
+                if(n<=20){
+                    result=2.0;
+                }
+                if(n<=40&&n>20){
+                    result=2.5;
+                }
+                if(n<=60&&n>40){
+                    result=3.0;
+                }
+                if(n<=80&&n>60){
+                    result=4.0;
+                }
+                if(n>80){
+                    result=5.0;
+                }
+            }
+            if (part.getKeyInfo().contains("绝缘清漆")||part.getKeyInfo().contains("陶瓷保护剂")) {
+                if(n<=20){
+                    result=1.0;
+                }
+                if(n<=40&&n>20){
+                    result=1.3;
+                }
+                if(n<=60&&n>40){
+                    result=1.5;
+                }
+                if(n<=80&&n>60){
+                    result=2.0;
+                }
+                if(n>80){
+                    result=2.3;
+                }
+            }
+        }
+        return Math.ceil(result * order.getYpQty() + 4);
+    }
+
+    //真空炉灌胶
+    public Double calPersonHoursByZklgj(YieldOrderEntity order,PartEntity part){
+        Double result = 0.0;
+        if (part != null && part.getId() != null && part.getExternalDiameter() != null) {
+            List<PartRelationEntity> partRelationList = partRelationService.list(Wrappers.<PartRelationEntity>lambdaQuery().eq(PartRelationEntity::getPartId,part.getId()));
+            List<Long> childIds = partRelationList.stream().map(PartRelationEntity::getChildPartId).collect(Collectors.toList());
+            List<PartEntity> partCz = partService.list(Wrappers.<PartEntity>lambdaQuery().in(BaseEntity::getId,childIds).eq(PartEntity::getSinTerType,DsPartConstant.SIN_TER_TYPE_CZ));
+            boolean hb = false;
+            for (PartEntity childPart : partCz) {
+                hb = childPart.getPartName().contains("双头");
+            }
+            Double n = part.getExternalDiameter();
+            double sumOfQuota = partCz.stream()
+                    .mapToDouble(PartEntity::getQuota) // 调用 getQuota() 方法
+                    .sum();
+            if (!hb) {
+                if (n <= 15) {
+                    result = 6.6 + 1.5 * sumOfQuota;
+                }
+                if (n <= 30 && n > 15) {
+                    result = 8.6 + 1.5 * sumOfQuota;
+                }
+                if (n <= 50 && n > 30) {
+                    result = 11.6 + 1.5 * sumOfQuota;
+                }
+                if (n <= 80 && n > 50) {
+                    result = 13.6 + 1.5 * sumOfQuota;
+                }
+                if (n > 80) {
+                    result = 15.6 + 1.5 * sumOfQuota;
+                }
+                result = result * order.getYpQty() + 7;
+            } else {
+                if (n <= 15) {
+                    result = 6.6 + 3.5 * sumOfQuota;
+                }
+                if (n <= 30 && n > 15) {
+                    result = 8.6 + 3.5 * sumOfQuota;
+                }
+                if (n <= 50 && n > 30) {
+                    result = 11.6 + 3.5 * sumOfQuota;
+                }
+                if (n <= 80 && n > 50) {
+                    result = 13.6 + 3.5 * sumOfQuota;
+                }
+                if (n > 80) {
+                    result = 15.6 + 3.5 * sumOfQuota;
+                }
+                result = result * order.getYpQty() + 10;
+            }
+        }
+        return Math.ceil(result);
+    }
+    //单侧折针、双侧折针
+    public Double calPersonHoursByZz(YieldOrderEntity order,PartEntity part,String processName){
+        Double result = 0.0;
+        if (part != null && part.getId() != null) {
+            List<PartRelationEntity> partRelationList = partRelationService.list(Wrappers.<PartRelationEntity>lambdaQuery().eq(PartRelationEntity::getPartId,part.getId()));
+            List<Long> childIds = partRelationList.stream().map(PartRelationEntity::getChildPartId).collect(Collectors.toList());
+            List<PartEntity> partCz = partService.list(Wrappers.<PartEntity>lambdaQuery().in(BaseEntity::getId,childIds).eq(PartEntity::getSinTerType,DsPartConstant.SIN_TER_TYPE_CZ));
+            if (partCz != null && partCz.size() > 0) {
+                double n = 0;
+                for (PartEntity childPart : partCz) {
+                    if (childPart.getPartCode().contains("21ET8")) {
+                        n = n + childPart.getQuota();
+                    }
+                }
+                if (processName.equals("单侧折针")) {
+                    result = (130 + 20 * n) / 60;
+                } else {
+                    result = (130 + 35 * 2 * n) / 60;
+                }
+            }
+        }
+        return Math.ceil(result * order.getYpQty() + 2);
+    }
+
+    public static List<YieldOrderEntity> mergeYieldOrderList(List<YieldOrderEntity> originalList) {
+        // 空值校验
+        if (originalList == null || originalList.isEmpty()) {
+            return new ArrayList<>();
+        }
+
+        // 用于临时存储合并后的对象，key为partCode+prodIdent
+        Map<String, YieldOrderEntity> mergeMap = new HashMap<>();
+
+        for (YieldOrderEntity entity : originalList) {
+            // 空对象跳过
+            if (entity == null) {
+                continue;
+            }
+
+            // 生成唯一key（partCode和prodIdent组合）
+            String key = entity.getPartCode() + "_" + entity.getProductIdent();
+
+            if (mergeMap.containsKey(key)) {
+                // key已存在，累加ypQty
+                YieldOrderEntity existEntity = mergeMap.get(key);
+                Integer newQty = existEntity.getYpQty() + entity.getYpQty();
+                existEntity.setYpQty(newQty);
+            } else {
+                // key不存在，直接放入Map
+                mergeMap.put(key, entity);
+            }
+        }
+
+        // 将Map的值转换为List返回
+        return new ArrayList<>(mergeMap.values());
+    }
 }
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/EquipAbilityVO.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/EquipAbilityVO.java
index 0f86560c1..8d18bde9a 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/EquipAbilityVO.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/EquipAbilityVO.java
@@ -43,4 +43,8 @@ public class EquipAbilityVO extends EquipAbilityEntity {
 	@Serial
 	private static final long serialVersionUID = 1L;
 
+	private Integer startNum;
+
+	private Integer endNum;
+
 }
diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/PersonAbilityVO.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/PersonAbilityVO.java
index 2887f1270..d298c5600 100644
--- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/PersonAbilityVO.java
+++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/PersonAbilityVO.java
@@ -43,4 +43,8 @@ public class PersonAbilityVO extends PersonAbilityEntity {
 	@Serial
 	private static final long serialVersionUID = 1L;
 
+	private Integer startNum;
+
+	private Integer endNum;
+
 }

From 81535de8c8fc0651060c3feb27d8cee8bc77f186 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= <a15234804788@163.com>
Date: Wed, 18 Mar 2026 17:16:12 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desk/produce/pojo/vo/UnBingVo.java        |  4 ++
 .../service/impl/DsTaskingServiceImpl.java    |  2 +-
 .../order/service/IYieldOrderService.java     |  3 +-
 .../service/impl/YieldOrderServiceImpl.java   |  4 +-
 .../desk/produce/mapper/WorkOrderMapper.java  |  2 +-
 .../desk/produce/mapper/WorkOrderMapper.xml   |  7 ++-
 .../service/impl/MacToolUseServiceImpl.java   | 25 ++++++---
 .../service/impl/PdaSaveServiceImpl.java      | 51 +++++++++----------
 8 files changed, 59 insertions(+), 39 deletions(-)

diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/UnBingVo.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/UnBingVo.java
index 804836aeb..74e176df8 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/UnBingVo.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/UnBingVo.java
@@ -1,5 +1,6 @@
 package org.springblade.desk.produce.pojo.vo;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.util.List;
@@ -7,8 +8,11 @@ import java.util.List;
 @Data
 public class UnBingVo {
 
+    @Schema(description = "挂具编号")
     private String rsCode;
+    @Schema(description = "飞靶编号")
     private String fsCode;
+    @Schema(description = "设备编号")
     private String deviceCode;
 
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java
index d9c583dad..5aa5ac630 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java
@@ -975,7 +975,7 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 		}
 
 		// 1. 获取生产订单信息
-		YieldOrder yieldOrder = yieldOrderService.selectByPartCOdeAndBatchNo(partCode, batchNo);
+		YieldOrder yieldOrder = yieldOrderService.selectByPartCOdeAndBatchNo(partCode, batchNo, reworkOrder);
 		if (yieldOrder == null) {
 			throw new RuntimeException("无法在生产订单中获取零件版本号，零件号：" + partCode + "，批次号：" + batchNo);
 		}
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderService.java
index bb0d1c290..7475fdefb 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderService.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderService.java
@@ -211,11 +211,12 @@ public interface IYieldOrderService extends BaseService<YieldOrder> {
 
 	/**
 	 * 根据 零件号 和 批次号查询
+	 *
 	 * @param partCode
 	 * @param batchNo
 	 * @return
 	 */
-	YieldOrder selectByPartCOdeAndBatchNo(String partCode, String batchNo);
+	YieldOrder selectByPartCOdeAndBatchNo(String partCode, String batchNo, String reworkOrder);
 
 	/**
 	 * <p>方法名: getNewCardNo </p>
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java
index d6890d39c..a990f6aad 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java
@@ -716,8 +716,8 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie
 	}
 
 	@Override
-	public YieldOrder selectByPartCOdeAndBatchNo(String partCode, String batchNo) {
-		return workOrderMapper.selectByPartCOdeAndBatchNo(partCode, batchNo);
+	public YieldOrder selectByPartCOdeAndBatchNo(String partCode, String batchNo, String reworkOrder) {
+		return workOrderMapper.selectByPartCOdeAndBatchNo(partCode, batchNo, reworkOrder);
 	}
 
 	@Override
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkOrderMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkOrderMapper.java
index b3a54e0e3..bf191f99c 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkOrderMapper.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkOrderMapper.java
@@ -45,7 +45,7 @@ public interface WorkOrderMapper extends BaseMapper<WorkOrder> {
 
 	List<QueryByReadStatusVO> queryByReadStatusPage(IPage page, QueryByReadStatusDTO query);
 
-    YieldOrder selectByPartCOdeAndBatchNo(@Param("partCode") String partCode,@Param("batchNo") String batchNo);
+	YieldOrder selectByPartCOdeAndBatchNo(@Param("partCode") String partCode, @Param("batchNo") String batchNo, @Param("reworkOrder") String reworkOrder);
 
 	WorkOrderEntity selectByYoId(@Param("yoId") Long yoId);
 
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkOrderMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkOrderMapper.xml
index 549142177..ea47b6d78 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkOrderMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkOrderMapper.xml
@@ -185,7 +185,12 @@
         ORDER BY a.CREATE_TIME DESC
     </select>
     <select id="selectByPartCOdeAndBatchNo" resultType="org.springblade.desk.order.pojo.entity.YieldOrder">
-        select * from MES_YIELD_ORDER where IS_DELETED = 0  and PART_CODE = #{partCode} and BATCH_NO = #{batchNo}
+        SELECT * FROM (select yo.*
+        from MES_YIELD_ORDER yo inner join MES_WORK_ORDER wo on yo.ID = wo.YO_ID
+        where yo.IS_DELETED = 0
+          and yo.PART_CODE = #{partCode}
+          and yo.BATCH_NO = #{batchNo}
+          and wo.REWORK_CODE = #{reworkOrder}) WHERE ROWNUM = 1
     </select>
 
     <select id="selectByYoId" resultType="org.springblade.scheduling.pojo.entity.WorkOrderEntity">
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MacToolUseServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MacToolUseServiceImpl.java
index df41d7ce6..58608640e 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MacToolUseServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MacToolUseServiceImpl.java
@@ -9,7 +9,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.desk.dashboard.pojo.entity.BsProcessSetEntity;
 import org.springblade.desk.dashboard.service.IBsProcessSetService;
+import org.springblade.desk.device.pojo.entity.EquipmentEntity;
 import org.springblade.desk.device.pojo.entity.RackSetEntity;
+import org.springblade.desk.device.service.IEquipmentService;
 import org.springblade.desk.device.service.IRackSetService;
 import org.springblade.desk.produce.mapper.MacToolUseMapper;
 import org.springblade.desk.produce.pojo.entity.MacToolUse;
@@ -18,9 +20,11 @@ import org.springblade.desk.produce.pojo.entity.WorkPlan;
 import org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO;
 import org.springblade.desk.produce.service.IMacToolUseService;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import static com.fasterxml.jackson.databind.type.LogicalType.DateTime;
 
@@ -38,6 +42,8 @@ public class MacToolUseServiceImpl extends BaseServiceImpl<MacToolUseMapper, Mac
 
     private final IBsProcessSetService bsProcessSetService;
 
+    private final IEquipmentService equipmentService;
+
     @Override
     public String nextCode(int i) {
         // 编码模式
@@ -58,27 +64,34 @@ public class MacToolUseServiceImpl extends BaseServiceImpl<MacToolUseMapper, Mac
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void unMacToolUseBind(List<MacToolUse> mtuList) {
         MacToolUse mtu = null;
         Date now = new Date();
+        RackSetEntity bsRackSet;
+        List<RackSetEntity> bsRackSets = new ArrayList<>();
+        List<EquipmentEntity> equipments = equipmentService.listByIds(mtuList.stream().map(MacToolUse::getEquipmentCard).toList());
+        Map<Long, EquipmentEntity> equipmentMap = equipments.stream().collect(Collectors.toMap(EquipmentEntity::getId, v -> v));
         for (MacToolUse item : mtuList) {
-            if (mtu == null && item.getEquipmentCard() != null) {
+            EquipmentEntity equipment = equipmentMap.get(item.getEquipmentCard());
+            if (mtu == null && item.getEquipmentCard() != null && "烘箱设备".equals(equipment.getCategorys())) {
                 mtu = item;
             }
             item.setFinished(1);
             item.setManualUnBuildTime(now);
-            String deviceCode = item.getEquipmentCard() != null ? item.getMtnCode() : "";
+            String deviceCode = equipment != null ? equipment.getDeviceCode() : "";
             log.info("修改设备绑定状态:设备编号:{},批次号:{},槽号:{},方法名:unMacToolUseBind(),{}", deviceCode, item.getHangNum(), item.getMtnCode(), item.getFinished());
             // 将挂具状态改为空闲
-            if (item != null && item.getBsRackSet() != null) {
-                RackSetEntity bsRackSet = new RackSetEntity();
+            if (item.getBsRackSet() != null) {
+                bsRackSet = new RackSetEntity();
                 bsRackSet.setId(item.getBsRackSet());
                 bsRackSet.setBindQty((short) 0);
                 bsRackSet.setStatus(RackSetEntity.RS_STATUS_FREE);
-                rackSetService.updateById(bsRackSet);
+                bsRackSets.add(bsRackSet);
             }
-            this.updateById(item);
         }
+        rackSetService.updateBatchById(bsRackSets);
+        this.updateBatchById(mtuList);
         //this.haveHongXiaoTem(mtu);
     }
 
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaSaveServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaSaveServiceImpl.java
index 20822473b..86c14017a 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaSaveServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaSaveServiceImpl.java
@@ -314,6 +314,8 @@ public class PdaSaveServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
         MacToolUse mtu;
         //绑定日期
         Date nowDate = new Date();
+        List<MacToolUse> mtuList = new ArrayList<>();
+        List<WorkPlan> workPlans = new ArrayList<>();
         for (Long id : planList) {
             if (operate != null && mesQcProduceRunService.getDataByWpIdAndSlot(id, operate)) {
                 throw new ServiceException("此工序已有对应操作的记录，请勿重复操作");
@@ -322,7 +324,6 @@ public class PdaSaveServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
             mtu = new MacToolUse();
             mtu.setWpId(id);
             mtu.setBindType("sj");
-            // "玻璃饼排蜡玻化（箱式炉）".equals(ppsName) ||
             if ("配胶".equals(operate) || "玻璃饼压制".equals(ppsName) || "振光".equals(operate) || "玻璃饼印字".equals(ppsName)
                     || "I面涂覆".equals(operate) || "II面涂覆".equals(operate)) {
                 mtu.setFinished(1);
@@ -330,18 +331,19 @@ public class PdaSaveServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
                 log.info("修改设备绑定状态:设备编号:{},批次号:{},槽号:{},方法名:sjBindingCard(),{}", deviceCode, mtu.getHangNum(), mtu.getMtnCode(), mtu.getFinished());
             }
             this.packageMtu(mtu, null, null, equipment.getId(), code);
-            macToolUseService.save(mtu);
+            mtuList.add(mtu);
             //修改作业计划绑定状态为绑定
             workPlan.setBindStatus(WorkPlan.BIND_STATUS_BIND);
             workPlan.setPrintType(WorkPlan.PRINT_TYPE_PROCESS);
-            baseMapper.updateById(workPlan);
+            workPlans.add(workPlan);
         }
+        macToolUseService.saveBatch(mtuList);
+        baseMapper.updateById(workPlans);
+
         MesQcProduceRunEntity qcProduceRun = new MesQcProduceRunEntity();
         qcProduceRun.setMtnCode(code);
         qcProduceRun.setDeviceId(equipment != null ? equipment.getDeviceCode() : "");
         qcProduceRun.setInDate(new Date().toString());
-        qcProduceRun.setCreateMan(String.valueOf(AuthUtil.getUser().getUserId()));
-        qcProduceRun.setCreateTime(nowDate);
         // 操作的步骤
         qcProduceRun.setWorkSlot(operate);
         // 此次绑定的工序
@@ -386,25 +388,24 @@ public class PdaSaveServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void unBind(UnBingVo unBingVo) {
         if (StringUtils.isBlank(unBingVo.getRsCode()) && StringUtils.isBlank(unBingVo.getFsCode()) && StringUtils.isBlank(unBingVo.getDeviceCode())) {
             return;
         }
         // 查询挂具
-        RackSetEntity bsRackSet = rackSetService.getOne(Wrappers.<RackSetEntity>lambdaQuery().eq(RackSetEntity::getRsCode, unBingVo.getRsCode()));
+        RackSetEntity bsRackSet = rackSetService.getBsRackSetByCode(unBingVo.getRsCode());
         // 查询飞靶
-        FeiBaSetEntity bsFeiBaSet = feiBaSetService.getOne(Wrappers.<FeiBaSetEntity>lambdaQuery().eq(FeiBaSetEntity::getFsCode, unBingVo.getFsCode()));
+        FeiBaSetEntity bsFeiBaSet = feiBaSetService.getBsFeiBaSetByCode(unBingVo.getFsCode());
         //查询设备
-        EquipmentEntity equipmentCard = equipmentService.getOne(Wrappers.<EquipmentEntity>lambdaQuery().eq(EquipmentEntity::getDeviceCode, unBingVo.getDeviceCode()));
+        EquipmentEntity equipmentCard = equipmentService.getDeEquipmentCardByCode(unBingVo.getDeviceCode());
 
         // 如果都为空，则返回
         if (equipmentCard == null && bsFeiBaSet == null && bsRackSet == null) {
             return;
         }
         //绑定记录
-        List<MacToolUse> mtuList = macToolUseService.list(Wrappers.<MacToolUse>lambdaQuery()
-                .eq(MacToolUse::getBsFeiBaSet, bsFeiBaSet.getId()).eq(MacToolUse::getBsRackSet, bsRackSet.getId())
-                .eq(MacToolUse::getEquipmentCard, equipmentCard.getId()).eq(MacToolUse::getFinished, 0));
+        List<MacToolUse> mtuList = macToolUseService.listByParams(bsRackSet.getId(), bsFeiBaSet != null ? bsFeiBaSet.getId() : null, equipmentCard != null ? equipmentCard.getId() : null, null);
         macToolUseService.unMacToolUseBind(mtuList);
         this.unBindDetail(mtuList);
 
@@ -726,37 +727,33 @@ public class PdaSaveServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
     }
 
     private void unBindBsFeiBaSet(FeiBaSetEntity bsFeiBaSet) {
-        if (bsFeiBaSet != null) {
-            bsFeiBaSet.setBindQty((short) 0);
-            bsFeiBaSet.setStatus(FeiBaSetEntity.FS_STATUS_FREE);
-            feiBaSetService.updateById(bsFeiBaSet);
-        }
+        bsFeiBaSet.setBindQty((short) 0);
+        bsFeiBaSet.setStatus(FeiBaSetEntity.FS_STATUS_FREE);
+        feiBaSetService.updateById(bsFeiBaSet);
     }
 
     private void unBindDeEquipmentCard(EquipmentEntity equipmentCard) {
         //设备不为空是解绑设备
-        if (equipmentCard != null) {
-            equipmentCard.setBindQty(equipmentCard.getBindQty().subtract(BigDecimal.valueOf(1)));
-            if (equipmentCard.getBindQty().compareTo(BigDecimal.valueOf(0)) <= 0) {
-                equipmentCard.setBindQty(BigDecimal.valueOf(0));
-                equipmentCard.setStatus(0);
-            }
-            equipmentService.updateById(equipmentCard);
+        equipmentCard.setBindQty(equipmentCard.getBindQty().subtract(BigDecimal.valueOf(1)));
+        if (equipmentCard.getBindQty().compareTo(BigDecimal.valueOf(0)) <= 0) {
+            equipmentCard.setBindQty(BigDecimal.valueOf(0));
+            equipmentCard.setStatus(0);
         }
-
+        equipmentService.updateById(equipmentCard);
     }
 
     private void unBindDetail(List<MacToolUse> mtuList) {
-        if (mtuList == null || mtuList.isEmpty()) {
+        if (CollectionUtils.isEmpty(mtuList)) {
             return;
         }
-
+        List<WorkPlan> wpList = new ArrayList<>();
         for (MacToolUse mtu : mtuList) {
             //修改作业计划绑定状态
             WorkPlan wp = baseMapper.selectById(mtu.getWpId());
             wp.setBindStatus(WorkPlan.BIND_STATUS_FREE);
-            baseMapper.updateById(wp);
+            wpList.add(wp);
         }
+        baseMapper.updateById(wpList);
     }
 
     /**