From 48c98a15d52d6e06ce338f97cd57fd25b5ffb51e 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 11:45:24 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=8E=A5=E5=8F=A3=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desk/produce/pojo/dto/DeviceBindDTO.java  |  6 +-
 .../desk/produce/pojo/vo/SjEcBingCardVo.java  | 34 ++++++++
 .../produce/mapper/BsAdditionalMessMapper.xml | 27 +-----
 .../mapper/MesBsAdditionalMessMapper.xml      | 30 +++++++
 .../service/impl/PdaLoadServiceImpl.java      | 27 +-----
 .../service/impl/PdaSaveServiceImpl.java      | 86 +++++++++----------
 .../service/impl/PlateAroundServiceImpl.java  | 24 +++---
 .../service/impl/WorkPlanServiceImpl.java     | 14 ++-
 8 files changed, 123 insertions(+), 125 deletions(-)
 create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MesBsAdditionalMessMapper.xml

diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/DeviceBindDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/DeviceBindDTO.java
index ca816c75..f56affe6 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/DeviceBindDTO.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/DeviceBindDTO.java
@@ -37,13 +37,13 @@ public class DeviceBindDTO {
 	@Schema(description = "是否解绑")
 	private String unFsBool;
 
-	@Schema(description = "")
+	@Schema(description = "掺镀件面积")
 	private String dopedParts;
 
-	@Schema(description = "")
+	@Schema(description = "网面积")
 	private String net;
 
-	@Schema(description = "")
+	@Schema(description = "挂具面积")
 	private String rack;
 
 
diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/SjEcBingCardVo.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/SjEcBingCardVo.java
index 7485d88e..5c7e8acf 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/SjEcBingCardVo.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/SjEcBingCardVo.java
@@ -1,25 +1,59 @@
 package org.springblade.desk.produce.pojo.vo;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.util.List;
 
+/**
+ * @author litao
+ */
 @Data
 public class SjEcBingCardVo {
+
+    @Schema(description = "设备ID")
     private Long ecId;
+
+    @Schema(description = "")
     private String operate;
+
+    @Schema(description = "此次绑定数量")
     private String bindNum;
+
+    @Schema(description = "此次绑定设定的温度")
     private String heat;
+
+    @Schema(description = "工序名称")
     private String ppsName;
+
+    @Schema(description = "工序ID集合")
     private List<Long> planList;
+
+    @Schema(description = "")
     private String rsName;
+
+    @Schema(description = "")
     private String oneData;
+
+    @Schema(description = "")
     private String twoData;
+
+    @Schema(description = "")
     private String threeData;
+
+    @Schema(description = "")
     private String fourData;
+
+    @Schema(description = "")
     private String fiveData;
+
+    @Schema(description = "")
     private String sixData;
+
+    @Schema(description = "")
     private String sevenData;
+
+    @Schema(description = "")
     private String eightData;
 
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/BsAdditionalMessMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/BsAdditionalMessMapper.xml
index 9b578ae1..e2744d2f 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/BsAdditionalMessMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/BsAdditionalMessMapper.xml
@@ -1,30 +1,5 @@
 <?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.MesBsAdditionalMessMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="mesBsAdditionalMessResultMap" type="org.springblade.desk.produce.pojo.entity.MesBsAdditionalMessEntity">
-        <result column="ID" property="id"/>
-        <result column="ONE_DATA" property="oneData"/>
-        <result column="TWO_DATA" property="twoData"/>
-        <result column="THREE_DATA" property="threeData"/>
-        <result column="FOUR_DATA" property="fourData"/>
-        <result column="TYPE" property="type"/>
-        <result column="DOU_ONE_DATA" property="douOneData"/>
-        <result column="MEMO" property="memo"/>
-        <result column="CREATE_USER" property="createUser"/>
-        <result column="CREATE_DEPT" property="createDept"/>
-        <result column="CREATE_TIME" property="createTime"/>
-        <result column="UPDATE_USER" property="updateUser"/>
-        <result column="UPDATE_TIME" property="updateTime"/>
-        <result column="STATUS" property="status"/>
-        <result column="IS_DELETED" property="isDeleted"/>
-    </resultMap>
-
-
-    <select id="selectMesBsAdditionalMessPage" resultMap="mesBsAdditionalMessResultMap">
-        select * from MES_BS_ADDITIONAL_MESS where is_deleted = 0
-    </select>
-
+<mapper namespace="org.springblade.desk.produce.mapper.BsAdditionalMessMapper">
 
 </mapper>
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MesBsAdditionalMessMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MesBsAdditionalMessMapper.xml
new file mode 100644
index 00000000..9b578ae1
--- /dev/null
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MesBsAdditionalMessMapper.xml
@@ -0,0 +1,30 @@
+<?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.MesBsAdditionalMessMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="mesBsAdditionalMessResultMap" type="org.springblade.desk.produce.pojo.entity.MesBsAdditionalMessEntity">
+        <result column="ID" property="id"/>
+        <result column="ONE_DATA" property="oneData"/>
+        <result column="TWO_DATA" property="twoData"/>
+        <result column="THREE_DATA" property="threeData"/>
+        <result column="FOUR_DATA" property="fourData"/>
+        <result column="TYPE" property="type"/>
+        <result column="DOU_ONE_DATA" property="douOneData"/>
+        <result column="MEMO" property="memo"/>
+        <result column="CREATE_USER" property="createUser"/>
+        <result column="CREATE_DEPT" property="createDept"/>
+        <result column="CREATE_TIME" property="createTime"/>
+        <result column="UPDATE_USER" property="updateUser"/>
+        <result column="UPDATE_TIME" property="updateTime"/>
+        <result column="STATUS" property="status"/>
+        <result column="IS_DELETED" property="isDeleted"/>
+    </resultMap>
+
+
+    <select id="selectMesBsAdditionalMessPage" resultMap="mesBsAdditionalMessResultMap">
+        select * from MES_BS_ADDITIONAL_MESS where is_deleted = 0
+    </select>
+
+
+</mapper>
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java
index 787feb3b..8dd4a87f 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java
@@ -2,16 +2,12 @@ package org.springblade.desk.produce.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springblade.common.exception.BusinessException;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.desk.basic.mapper.CraftAbilityMapper;
 import org.springblade.desk.basic.pojo.entity.*;
@@ -32,20 +28,13 @@ import org.springblade.desk.produce.pojo.vo.LoadSubOrderVO;
 import org.springblade.desk.produce.pojo.vo.PdaProRelevantVO;
 import org.springblade.desk.produce.service.*;
 import org.springblade.desk.quality.pojo.entity.InspectionTask;
-import org.springblade.desk.quality.pojo.entity.WorkPlanItem;
-import org.springblade.desk.quality.pojo.vo.WorkPlanItemDetailVO;
-import org.springblade.desk.quality.pojo.vo.WorkPlanItemVO;
 import org.springblade.desk.quality.service.IInspectionTaskService;
-import org.springblade.desk.quality.service.IPlanTestService;
 import org.springblade.desk.quality.service.IWorkPlanItemService;
 import org.springblade.scheduling.pojo.entity.CraftAbilityEntity;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -64,22 +53,8 @@ public class PdaLoadServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
 
     private final IBsProcessSetService bsProcessSetService;
 
-    private final IDsProcessService dsProcessService;
-
-    private final IPrReworkProcessService prReworkProcessService;
-
-    private final IWorkPlanItemService workPlanItemService;
-
     private final IInspectionTaskService inspectionTaskService;
 
-    private final IWorkOrderRunService workOrderRunService;
-
-    private final IDsProcessMeasuringToolService processMeasuringToolService;
-
-    private final IDsProcessProjectService dsProcessProjectService;
-
-    private final IMakeRecService makeRecService;
-
     private final IMacToolUseService macToolUseService;
 
     private final IBasicClazzService basicClazzService;
@@ -110,7 +85,7 @@ public class PdaLoadServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
 
     private final IWorkCenterService workCenterService;
 
-    @Value("${request.device.prefixId}")
+//    @Value("${request.device.prefixId}")
     private String prefixId;
 
     @Override
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 08357bc4..20822473 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
@@ -3,7 +3,6 @@ package org.springblade.desk.produce.service.impl;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.BeanUtils;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.google.common.collect.Lists;
@@ -14,7 +13,6 @@ import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.desk.basic.service.IRelTeamSetUserService;
 import org.springblade.desk.dashboard.pojo.entity.BsProcessSetEntity;
 import org.springblade.desk.dashboard.pojo.entity.BsTeamSetEntity;
 import org.springblade.desk.dashboard.pojo.entity.PrReworkProcessEntity;
@@ -37,23 +35,17 @@ import org.springblade.desk.produce.pojo.vo.SjEcBingCardVo;
 import org.springblade.desk.produce.pojo.vo.UnBingDeviceVo;
 import org.springblade.desk.produce.pojo.vo.UnBingVo;
 import org.springblade.desk.produce.service.*;
-import org.springblade.desk.quality.service.IInspectionTaskService;
-import org.springblade.desk.quality.service.IPlanTestService;
-import org.springblade.desk.quality.service.IWorkPlanItemService;
-import org.springblade.scheduling.pojo.entity.ProcessSetEntity;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
-import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
 import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import static com.fasterxml.jackson.databind.type.LogicalType.DateTime;
-
 /**
  * 车间作业计划 服务实现类
  *
@@ -76,8 +68,6 @@ public class PdaSaveServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
 
     private final IFeiBaSetService feiBaSetService;
 
-    private final IMesEquipmentCardService mesEquipmentCardService;
-
     private final IMesQcProduceRunService mesQcProduceRunService;
 
     private final IYieldOrderService yieldOrderService;
@@ -301,26 +291,31 @@ public class PdaSaveServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void sjBindingCard(SjEcBingCardVo sjEcBingCardVo) {
-        MesEquipmentCardEntity equipmentCard = null;
-        // "玻璃饼排蜡玻化（箱式炉）".equals(ppsName) ||
-        if (!("配胶".equals(sjEcBingCardVo.getOperate()) || "玻璃饼印字".equals(sjEcBingCardVo.getPpsName()) || "I面涂覆".equals(sjEcBingCardVo.getOperate()) || "II面涂覆".equals(sjEcBingCardVo.getOperate()))) {
-            if (sjEcBingCardVo.getEcId() == null) {
+        Long ecId = sjEcBingCardVo.getEcId();
+        String operate = sjEcBingCardVo.getOperate();
+        String bindNum = sjEcBingCardVo.getBindNum();
+        String heat = sjEcBingCardVo.getHeat();
+        String ppsName = sjEcBingCardVo.getPpsName();
+        List<Long> planList = sjEcBingCardVo.getPlanList();
+        EquipmentEntity equipment = null;
+        if (!("配胶".equals(operate) || "玻璃饼印字".equals(ppsName) || "I面涂覆".equals(operate) || "II面涂覆".equals(operate))) {
+            if (ecId == null) {
                 throw new ServiceException("请扫描对应的设备");
             } else {
-                equipmentCard = mesEquipmentCardService.getById(sjEcBingCardVo.getEcId());
+                equipment = this.getEquipmentCardByEcId(ecId);
             }
         }
         //同槽号
         String code = macToolUseService.nextCode(3);
         //处理绑定信息
-        WorkPlan workPlan = null;
-        MesQcProduceRunEntity qcProduceRun = null;
-        MacToolUse mtu = null;
+        WorkPlan workPlan;
+        MacToolUse mtu;
         //绑定日期
         Date nowDate = new Date();
-        for (Long id : sjEcBingCardVo.getPlanList()) {
-            if (sjEcBingCardVo.getOperate() != null && mesQcProduceRunService.getDataByWpIdAndSlot(id, sjEcBingCardVo.getOperate())) {
+        for (Long id : planList) {
+            if (operate != null && mesQcProduceRunService.getDataByWpIdAndSlot(id, operate)) {
                 throw new ServiceException("此工序已有对应操作的记录，请勿重复操作");
             }
             workPlan = baseMapper.selectById(id);
@@ -328,59 +323,56 @@ public class PdaSaveServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
             mtu.setWpId(id);
             mtu.setBindType("sj");
             // "玻璃饼排蜡玻化（箱式炉）".equals(ppsName) ||
-            if ("配胶".equals(sjEcBingCardVo.getOperate()) || "玻璃饼压制".equals(sjEcBingCardVo.getPpsName()) || "振光".equals(sjEcBingCardVo.getOperate()) || "玻璃饼印字".equals(sjEcBingCardVo.getPpsName())
-                    || "I面涂覆".equals(sjEcBingCardVo.getOperate()) || "II面涂覆".equals(sjEcBingCardVo.getOperate())) {
+            if ("配胶".equals(operate) || "玻璃饼压制".equals(ppsName) || "振光".equals(operate) || "玻璃饼印字".equals(ppsName)
+                    || "I面涂覆".equals(operate) || "II面涂覆".equals(operate)) {
                 mtu.setFinished(1);
                 String deviceCode = mtu.getEquipmentCard() != null ? mtu.getMtnCode() : "";
                 log.info("修改设备绑定状态:设备编号:{},批次号:{},槽号:{},方法名:sjBindingCard(),{}", deviceCode, mtu.getHangNum(), mtu.getMtnCode(), mtu.getFinished());
             }
-            mtu.setMtnCode(code);
-            mtu.setUpdateTime(nowDate);
-            mtu.setCreateMan(AuthUtil.getUser().getUserId());
-            mtu.setEquipmentCard(equipmentCard.getId());
+            this.packageMtu(mtu, null, null, equipment.getId(), code);
             macToolUseService.save(mtu);
             //修改作业计划绑定状态为绑定
             workPlan.setBindStatus(WorkPlan.BIND_STATUS_BIND);
             workPlan.setPrintType(WorkPlan.PRINT_TYPE_PROCESS);
             baseMapper.updateById(workPlan);
         }
-        qcProduceRun = new MesQcProduceRunEntity();
+        MesQcProduceRunEntity qcProduceRun = new MesQcProduceRunEntity();
         qcProduceRun.setMtnCode(code);
-        qcProduceRun.setDeviceId(equipmentCard != null ? equipmentCard.getDeviceCode() : "");
+        qcProduceRun.setDeviceId(equipment != null ? equipment.getDeviceCode() : "");
         qcProduceRun.setInDate(new Date().toString());
         qcProduceRun.setCreateMan(String.valueOf(AuthUtil.getUser().getUserId()));
         qcProduceRun.setCreateTime(nowDate);
         // 操作的步骤
-        qcProduceRun.setWorkSlot(sjEcBingCardVo.getOperate());
+        qcProduceRun.setWorkSlot(operate);
         // 此次绑定的工序
-        qcProduceRun.setDataOne(sjEcBingCardVo.getPpsName());
+        qcProduceRun.setDataOne(ppsName);
         // 此次绑定设定的温度
-        qcProduceRun.setDataTwo(sjEcBingCardVo.getHeat());
+        qcProduceRun.setDataTwo(heat);
         // 此次绑定的数量
-        qcProduceRun.setDataThree(sjEcBingCardVo.getBindNum());
-        if ("配胶".equals(sjEcBingCardVo.getOperate())) {
+        qcProduceRun.setDataThree(bindNum);
+        if ("配胶".equals(operate)) {
             qcProduceRun.setDataFour(sjEcBingCardVo.getOneData()); //灌封胶牌号
             qcProduceRun.setDataFive(sjEcBingCardVo.getTwoData());//灌封胶批次号
             qcProduceRun.setDataSix(sjEcBingCardVo.getThreeData());//组分A重量
             qcProduceRun.setDataSeven(sjEcBingCardVo.getFourData());//组分B重量
         }
-        if ("玻璃饼压制".equals(sjEcBingCardVo.getPpsName())) {
+        if ("玻璃饼压制".equals(ppsName)) {
             qcProduceRun.setDataFour(sjEcBingCardVo.getOneData()); //灌封胶牌号
             qcProduceRun.setDataFive(sjEcBingCardVo.getTwoData());//灌封胶批次号
             qcProduceRun.setDataSix(sjEcBingCardVo.getThreeData());
             qcProduceRun.setDataSeven(sjEcBingCardVo.getFourData());
         }
-        if ("振光".equals(sjEcBingCardVo.getOperate())) {
+        if ("振光".equals(operate)) {
             qcProduceRun.setDataFour(sjEcBingCardVo.getOneData()); //玻化温度
         }
-        if ("玻璃饼印字".equals(sjEcBingCardVo.getPpsName())) {
+        if ("玻璃饼印字".equals(ppsName)) {
             qcProduceRun.setDataFour(sjEcBingCardVo.getOneData()); //油墨物料号
             qcProduceRun.setDataFive(sjEcBingCardVo.getTwoData());//印字板编号
         }
         List<JSONObject> eneUsed;
         ArrayList<String> params;
-        if ("玻璃封接清洗".equals(sjEcBingCardVo.getPpsName())) {
-            if ("清洗".equals(sjEcBingCardVo.getOperate())) {
+        if ("玻璃封接清洗".equals(ppsName)) {
+            if ("清洗".equals(operate)) {
                 params = Lists.newArrayList("TempPV1");
                 Date date = new Date(nowDate.getTime() - 6000);
                 eneUsed = null;//httpRequestService.getEneUsed(qcProduceRun.getDeviceId(), params, DateTime.date2String(date, true, true), DateTime.getTimeNow());
@@ -390,7 +382,7 @@ public class PdaSaveServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
                 }
             }
         }
-        mesQcProduceRunService.saveOrUpdate(qcProduceRun);
+        mesQcProduceRunService.save(qcProduceRun);
     }
 
     @Override
@@ -403,7 +395,7 @@ public class PdaSaveServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
         // 查询飞靶
         FeiBaSetEntity bsFeiBaSet = feiBaSetService.getOne(Wrappers.<FeiBaSetEntity>lambdaQuery().eq(FeiBaSetEntity::getFsCode, unBingVo.getFsCode()));
         //查询设备
-        MesEquipmentCardEntity equipmentCard = mesEquipmentCardService.getOne(Wrappers.<MesEquipmentCardEntity>lambdaQuery().eq(MesEquipmentCardEntity::getDeviceCode, unBingVo.getDeviceCode()));
+        EquipmentEntity equipmentCard = equipmentService.getOne(Wrappers.<EquipmentEntity>lambdaQuery().eq(EquipmentEntity::getDeviceCode, unBingVo.getDeviceCode()));
 
         // 如果都为空，则返回
         if (equipmentCard == null && bsFeiBaSet == null && bsRackSet == null) {
@@ -741,15 +733,15 @@ public class PdaSaveServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan
         }
     }
 
-    private void unBindDeEquipmentCard(MesEquipmentCardEntity equipmentCard) {
+    private void unBindDeEquipmentCard(EquipmentEntity equipmentCard) {
         //设备不为空是解绑设备
         if (equipmentCard != null) {
-            equipmentCard.setBindQty(equipmentCard.getBindQty() - 1);
-            if (equipmentCard.getBindQty() <= 0) {
-                equipmentCard.setBindQty(0);
+            equipmentCard.setBindQty(equipmentCard.getBindQty().subtract(BigDecimal.valueOf(1)));
+            if (equipmentCard.getBindQty().compareTo(BigDecimal.valueOf(0)) <= 0) {
+                equipmentCard.setBindQty(BigDecimal.valueOf(0));
                 equipmentCard.setStatus(0);
             }
-            mesEquipmentCardService.updateById(equipmentCard);
+            equipmentService.updateById(equipmentCard);
         }
 
     }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PlateAroundServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PlateAroundServiceImpl.java
index a923ec19..d5d1a2a5 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PlateAroundServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PlateAroundServiceImpl.java
@@ -10,7 +10,6 @@ import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.core.mp.support.Condition;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.desk.dashboard.pojo.entity.BsTeamSetEntity;
@@ -19,13 +18,13 @@ import org.springblade.desk.dashboard.service.IDsPartService;
 import org.springblade.desk.order.pojo.entity.YieldOrder;
 import org.springblade.desk.order.service.IYieldOrderService;
 import org.springblade.desk.produce.mapper.PlateAroundMapper;
+import org.springblade.desk.produce.mapper.WorkPlanMapper;
 import org.springblade.desk.produce.pojo.dto.PlateAroundDto;
 import org.springblade.desk.produce.pojo.dto.SavePlateAroundDto;
 import org.springblade.desk.produce.pojo.entity.*;
 import org.springblade.desk.produce.pojo.vo.AfterPlateInVO;
 import org.springblade.desk.produce.pojo.vo.PlateAroundVO;
 import org.springblade.desk.produce.service.*;
-import org.springblade.job.pojo.entity.JobInfo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -36,8 +35,6 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import static com.fasterxml.jackson.databind.type.LogicalType.DateTime;
-
 /**
  * 镀前镀后 服务实现类
  *
@@ -54,14 +51,13 @@ public class PlateAroundServiceImpl extends BaseServiceImpl<PlateAroundMapper, P
 
     private final IPlateAroundDelLogService plateAroundDelLogService;
 
-    private final IWorkPlanService workPlanService;
-
     private final IPdaLoadService pdaLoadService;
 
     private final IWorkOrderRunService workOrderRunService;
 
     private final IDsPartService dsPartService;
 
+    private final WorkPlanMapper workPlanMapper;
 
     @Override
     public IPage<PlateAroundVO> queryByReadStatus(IPage<PlateAroundVO> page, PlateAroundDto plateAroundDto) {
@@ -192,7 +188,7 @@ public class PlateAroundServiceImpl extends BaseServiceImpl<PlateAroundMapper, P
         for (PlateAround plateAround : list) {
             this.savePlateAround(AuthUtil.getUser(), plateAround, paType, next, Boolean.FALSE);
             if (paType.equals(PlateAround.AFTER_PLAN_IN)) {
-                WorkPlan prWorkPlan = workPlanService.getById(plateAround.getWpId());
+                WorkPlan prWorkPlan = workPlanMapper.selectById(plateAround.getWpId());
                 wo = workOrderService.getById(prWorkPlan.getWoId());
                 wo.setHandoverTime( date);
                 woList.add(wo);
@@ -237,7 +233,7 @@ public class PlateAroundServiceImpl extends BaseServiceImpl<PlateAroundMapper, P
         PlateAround newPa = null;
         PlateAround oldPa=null;
         Date date = new Date();
-        WorkPlan wp = workPlanService.getById(plateAround.getWpId());
+        WorkPlan wp = workPlanMapper.selectById(plateAround.getWpId());
         if (paType.equals(PlateAround.BEFORE_PLAT_IN) || paType.equals(PlateAround.AFTER_PLAN_IN)) {
             plateAround.setPaType(paType);
             plateAround.setCreateUser(user.getUserId());
@@ -250,7 +246,7 @@ public class PlateAroundServiceImpl extends BaseServiceImpl<PlateAroundMapper, P
             plateAround = this.updatePrPlateAround(plateAround);
             baseMapper.insert(plateAround);
             if (paType.equals(PlateAround.BEFORE_PLAT_IN)) {
-                WorkPlan nextWorkPlan = workPlanService.getById(wp.getNextWpId());
+                WorkPlan nextWorkPlan = workPlanMapper.selectById(wp.getNextWpId());
                 if (nextWorkPlan != null && nextWorkPlan.getNextWpId()== null) {
                     throw new ServiceException("pda.nextWorkPlan.noNext");
                 }
@@ -272,7 +268,7 @@ public class PlateAroundServiceImpl extends BaseServiceImpl<PlateAroundMapper, P
                         }
                         prWorkOrder.setOemType(WorkOrder.OEM_TYPE_WHOLE);
                         nextWorkPlan.setPlanEndTime(LocalDateTime.now());
-                        workPlanService.updateById(nextWorkPlan);
+                        workPlanMapper.updateById(nextWorkPlan);
                         //产生外协生产进度记录信息
                         WorkOrderRun wr = new WorkOrderRun();
                         wr.setWoId(prWorkOrder.getId());
@@ -294,7 +290,7 @@ public class PlateAroundServiceImpl extends BaseServiceImpl<PlateAroundMapper, P
                         workOrderService.updateById(prWorkOrder);
                     }
                 }
-                wp = workPlanService.getById(wp.getId());
+                wp = workPlanMapper.selectById(wp.getId());
                 //通知下序进行镀前出库
                 if (nextWorkPlan.getMakeTeam() != null) {
                     String str = "流程卡号：【" + prWorkOrder.getCardNo() + "】，零件号：【" + prWorkOrder
@@ -304,14 +300,14 @@ public class PlateAroundServiceImpl extends BaseServiceImpl<PlateAroundMapper, P
                 }
                 //镀前入库后默认拉满当前工序完成进度
                 wp.setFactEndTime(date);
-                workPlanService.updateById(wp);
+                workPlanMapper.updateById(wp);
             }
             if (paType.equals(PlateAround.AFTER_PLAN_IN)) {
                 WorkOrder prWorkOrder = workOrderService.getById(wp.getWoId());
                 pdaLoadService.checkPrWorkOrder(prWorkOrder.getCardNo());
             }
         }else {
-            WorkPlan nextWorkPlan = workPlanService.getById(plateAround.getWpId());
+            WorkPlan nextWorkPlan = workPlanMapper.selectById(plateAround.getWpId());
             if (wp.getNextWpId() != null && nextWorkPlan.getNextWpId() == null) {
                 throw new ServiceException("pda.nextWorkPlan.noNext");
             }
@@ -321,7 +317,7 @@ public class PlateAroundServiceImpl extends BaseServiceImpl<PlateAroundMapper, P
                     //调用自动分派处理类
                     WorkOrderRun wor = workOrderRunService.getById(nextWorkPlan.getWoId());
                    // pjAutomaticDispatchService.beforePlatingAutomatic(wp.getPrWorkOrder().getCardNo(), pfUserInfo);
-                    wp = workPlanService.getById(wp.getId());
+                    wp = workPlanMapper.selectById(wp.getId());
                     //如果当前序是供应商，下序分派至班组(不是检验)，或者其他供应商则调用erp关闭订单(待定)
                     if (nextWorkPlan.getOcId() != null && nextWorkPlan.getNextWpId() != null) {
                         if (nextWorkPlan.getPpsId()!= null) {
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkPlanServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkPlanServiceImpl.java
index 34288b9f..57fd4dc8 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkPlanServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkPlanServiceImpl.java
@@ -1,5 +1,6 @@
 package org.springblade.desk.produce.service.impl;
 
+import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
@@ -19,6 +20,7 @@ import org.springblade.desk.dashboard.pojo.entity.BsTeamSetEntity;
 import org.springblade.desk.dashboard.pojo.entity.DsProcessMeasuringToolEntity;
 import org.springblade.desk.dashboard.pojo.entity.DsProcessProjectEntity;
 import org.springblade.desk.dashboard.service.*;
+import org.springblade.desk.produce.mapper.PlateAroundMapper;
 import org.springblade.desk.produce.mapper.WorkPlanMapper;
 import org.springblade.desk.produce.pojo.entity.*;
 import org.springblade.desk.produce.pojo.vo.ProduceMonitorWorkPlanVO;
@@ -26,11 +28,9 @@ import org.springblade.desk.produce.pojo.vo.WorkPlanVO;
 import org.springblade.desk.produce.service.*;
 import org.springblade.desk.quality.pojo.entity.InspectionTask;
 import org.springblade.desk.quality.pojo.entity.WorkPlanItem;
-import org.springblade.desk.quality.pojo.entity.WorkPlanItemDetail;
 import org.springblade.desk.quality.pojo.vo.WorkPlanItemDetailVO;
 import org.springblade.desk.quality.pojo.vo.WorkPlanItemVO;
 import org.springblade.desk.quality.service.IInspectionTaskService;
-import org.springblade.desk.quality.service.IPlanTestService;
 import org.springblade.desk.quality.service.IWorkPlanItemService;
 import org.springblade.scheduling.pojo.entity.WorkPlanEntity;
 import org.springframework.beans.BeanUtils;
@@ -42,8 +42,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import static net.sf.jsqlparser.util.validation.metadata.NamedObject.user;
-
 /**
  * 车间作业计划 服务实现类
  *
@@ -76,15 +74,13 @@ public class WorkPlanServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPla
 
     private final IMacToolUseService macToolUseService;
 
-    private final IPlanTestService planTestService;
-
     private final IRelTeamSetUserService relTeamSetUserService;
 
     private final ICenterTeamService centerTeamService;
 
     private final IWorkCenterService workCenterService;
 
-    private final IPlateAroundService plateAroundService;
+    private final PlateAroundMapper plateAroundMapper;
 
     @Override
     public void addWorkPlan(WorkOrder wo, List<WorkPlan> wpList, List<Long> deleteIds) {
@@ -282,8 +278,8 @@ public class WorkPlanServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPla
         if ("1".equals(frontWp.getOem()) && "1".equals(prWorkPlan.getOem())) {
             return;
         }
-        PlateAround pa = plateAroundService.getPrPlateAround(prWorkPlan.getId(), PlateAround.BEFORE_PLAN_OUT);
-        if (pa == null) {
+        List<PlateAround> list = plateAroundMapper.selectList(Wrappers.lambdaQuery(PlateAround.class).eq(PlateAround::getWpId, prWorkPlan.getId()).eq(PlateAround::getPaType, PlateAround.BEFORE_PLAN_OUT).orderByDesc(PlateAround::getId));
+        if (CollectionUtils.isEmpty(list)) {
             if ("1".equals(frontWp.getOem())) {
                 //上序外协，本序如果可以接收，验证镀前出库记录
                 throw new ServiceException("工序加工单位不同，未找到镀前出库记录，无法接收！");