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
index f0f88c04..100ad909 100644
--- 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
@@ -15,7 +15,7 @@ import java.util.Date;
  * @author litao
  */
 @Data
-@TableName("DS_RB_FILE_PRESERVE")
+@TableName("MES_DS_RB_FILE_PRESERVE")
 @Schema(description = "DsRbFilePreserve对象")
 @EqualsAndHashCode(callSuper = true)
 public class DsRbFilePreserve extends BaseEntity {
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/ProcessQualityMaintenanceController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/ProcessQualityMaintenanceController.java
index 04b9950d..8b030904 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/ProcessQualityMaintenanceController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/ProcessQualityMaintenanceController.java
@@ -9,6 +9,7 @@ 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.tool.api.R;
+import org.springblade.desk.device.pojo.entity.EquipmentEntity;
 import org.springblade.desk.produce.pojo.dto.RetrospectDefendDTO;
 import org.springblade.desk.produce.pojo.entity.DsRbFilePreserve;
 import org.springblade.desk.produce.pojo.entity.MesEquipmentCardEntity;
@@ -16,6 +17,7 @@ import org.springblade.desk.produce.pojo.entity.MesQcProduceRunEntity;
 import org.springblade.desk.produce.pojo.vo.*;
 import org.springblade.desk.produce.service.IMakeRecService;
 import org.springblade.desk.produce.service.IProcessQualityMaintenanceService;
+import org.springblade.desk.quality.pojo.entity.ProReTemplate;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -67,7 +69,7 @@ public class ProcessQualityMaintenanceController extends BladeController {
     @GetMapping("/getRbFilePreserveByWpId")
     @ApiOperationSupport(order = 5)
     @Operation(summary = "根据工序查询模板")
-    public R<List<DsRbFilePreserve>> getRbFilePreserveByWpId(Long wpId) {
+    public R<List<ProReTemplate>> getRbFilePreserveByWpId(Long wpId) {
         return R.data(proQuaMainService.getRbFilePreserveByWpId(wpId));
     }
 
@@ -81,7 +83,7 @@ public class ProcessQualityMaintenanceController extends BladeController {
     @GetMapping("/queryEquipmentCard")
     @ApiOperationSupport(order = 7)
     @Operation(summary = "获取设备卡片")
-    public R<IPage<MesEquipmentCardEntity>> queryEquipmentCard(String deviceCode, Query query) {
+    public R<IPage<EquipmentEntity>> queryEquipmentCard(String deviceCode, Query query) {
         return R.data(proQuaMainService.queryEquipmentCard(Condition.getPage(query), deviceCode));
     }
 
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IProcessQualityMaintenanceService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IProcessQualityMaintenanceService.java
index 9dab7907..f21162c0 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IProcessQualityMaintenanceService.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IProcessQualityMaintenanceService.java
@@ -1,11 +1,13 @@
 package org.springblade.desk.produce.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.desk.device.pojo.entity.EquipmentEntity;
 import org.springblade.desk.produce.pojo.dto.RetrospectDefendDTO;
 import org.springblade.desk.produce.pojo.entity.DsRbFilePreserve;
 import org.springblade.desk.produce.pojo.entity.MesEquipmentCardEntity;
 import org.springblade.desk.produce.pojo.entity.MesQcProduceRunEntity;
 import org.springblade.desk.produce.pojo.vo.*;
+import org.springblade.desk.quality.pojo.entity.ProReTemplate;
 
 import java.util.List;
 
@@ -23,11 +25,11 @@ public interface IProcessQualityMaintenanceService {
 
     List<ProduceMonitorFileSlotVO> getDataByMtnCode(Long wpId, String mtnCode);
 
-    List<DsRbFilePreserve> getRbFilePreserveByWpId(Long wpId);
+    List<ProReTemplate> getRbFilePreserveByWpId(Long wpId);
 
     GetByRfpIdVO getByRfpId(Long rfpId);
 
-    IPage<MesEquipmentCardEntity> queryEquipmentCard(IPage<MesEquipmentCardEntity> page, String deviceCode);
+    IPage<EquipmentEntity> queryEquipmentCard(IPage<EquipmentEntity> page, String deviceCode);
 
     List<MesQcProduceRunEntity> getDataByMtnCodeSj(Long wpId, String mtnCode);
 
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/ProcessQualityMaintenanceServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/ProcessQualityMaintenanceServiceImpl.java
index 3c00e1a4..946b45b7 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/ProcessQualityMaintenanceServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/ProcessQualityMaintenanceServiceImpl.java
@@ -13,11 +13,17 @@ import org.springblade.desk.basic.pojo.entity.CenterTeam;
 import org.springblade.desk.basic.service.ICenterTeamService;
 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.service.IEquipmentService;
 import org.springblade.desk.produce.pojo.dto.MesRbFilePreserveDetailDTO;
 import org.springblade.desk.produce.pojo.dto.WorkPlanDto;
 import org.springblade.desk.produce.pojo.entity.*;
 import org.springblade.desk.produce.pojo.vo.*;
 import org.springblade.desk.produce.service.*;
+import org.springblade.desk.quality.pojo.entity.ProReTemplate;
+import org.springblade.desk.quality.service.IProReTemplateDetailService;
+import org.springblade.desk.quality.service.IProReTemplateService;
+import org.springblade.desk.quality.service.IProReTemplateTankService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -47,13 +53,13 @@ public class ProcessQualityMaintenanceServiceImpl implements IProcessQualityMain
 
     private final IMesRbFilePreserveSlotService dsRbFilePreserveSlotService;
 
-    private final IDsRbFilePreserveService dsRbFilePreserveService;
+    private final IProReTemplateService  proReTemplateService;
 
     private final IBsProcessSetService bsProcessSetService;
 
     private final IMesRbFilePreserveDetailService dsRbFilePreserveDetailService;
 
-    private final IMesEquipmentCardService mesEquipmentCardService;
+    private final IEquipmentService mesEquipmentCardService;
 
     private final IPdaLoadService pdaLoadService;
 
@@ -101,7 +107,7 @@ public class ProcessQualityMaintenanceServiceImpl implements IProcessQualityMain
             rbFilePreserveSlotList = dsRbFilePreserveSlotService.getByRfpId(Long.valueOf(prMacToolUse.getRfpId()));
         } else {
             // 线上
-            List<DsRbFilePreserve> dsRbFilePreserveList = dsRbFilePreserveService.getDataByWcIdAndPpsId(wcId, workPlan.getPpsId(), true);
+            List<ProReTemplate> dsRbFilePreserveList = proReTemplateService.getDataByWcIdAndPpsId(wcId, workPlan.getPpsId(), true);
             if (CollectionUtils.isNotEmpty(dsRbFilePreserveList)) {
                 rbFilePreserveSlotList = dsRbFilePreserveSlotService.getByRfpId(dsRbFilePreserveList.get(0).getId());
             }
@@ -112,14 +118,14 @@ public class ProcessQualityMaintenanceServiceImpl implements IProcessQualityMain
     }
 
     @Override
-    public List<DsRbFilePreserve> getRbFilePreserveByWpId(Long wpId) {
+    public List<ProReTemplate> getRbFilePreserveByWpId(Long wpId) {
         WorkPlan workPlan = workPlanService.getById(wpId);
         BsProcessSetEntity procedureSet = bsProcessSetService.getById(workPlan.getPpsId());
         if ("喷砂".equals(procedureSet.getName()) || "涂色标".equals(procedureSet.getName()) || "超声波清洗".equals(procedureSet.getName())) {
-            return dsRbFilePreserveService.getDataByWcIdAndPpsId(null, procedureSet.getId(), Boolean.FALSE);
+            return proReTemplateService.getDataByWcIdAndPpsId(null, procedureSet.getId(), Boolean.FALSE);
         } else if (workPlan.getMakeTeam() != null) {
             CenterTeam centerTeam = centerTeamService.getByTsId(workPlan.getMakeTeam());
-            return dsRbFilePreserveService.getDataByWcIdAndPpsId(centerTeam.getWcId(), procedureSet.getId(), Boolean.FALSE);
+            return proReTemplateService.getDataByWcIdAndPpsId(centerTeam.getWcId(), procedureSet.getId(), Boolean.FALSE);
         }
         return null;
     }
@@ -155,10 +161,10 @@ public class ProcessQualityMaintenanceServiceImpl implements IProcessQualityMain
     }
 
     @Override
-    public IPage<MesEquipmentCardEntity> queryEquipmentCard(IPage<MesEquipmentCardEntity> page, String deviceCode) {
-        LambdaQueryWrapper<MesEquipmentCardEntity> wrapper = Wrappers.lambdaQuery(MesEquipmentCardEntity.class);
+    public IPage<EquipmentEntity> queryEquipmentCard(IPage<EquipmentEntity> page, String deviceCode) {
+        LambdaQueryWrapper<EquipmentEntity> wrapper = Wrappers.lambdaQuery(EquipmentEntity.class);
         if (StringUtils.isNotBlank(deviceCode)) {
-            wrapper.like(MesEquipmentCardEntity::getDeviceCode, deviceCode).or().like(MesEquipmentCardEntity::getDeviceName, deviceCode);
+            wrapper.like(EquipmentEntity::getDeviceCode, deviceCode).or().like(EquipmentEntity::getDeviceName, deviceCode);
         }
         return mesEquipmentCardService.page(page, wrapper);
     }
@@ -185,7 +191,7 @@ public class ProcessQualityMaintenanceServiceImpl implements IProcessQualityMain
         if (ecId == null) {
             throw new ServiceException("请选择设备!!!");
         }
-        MesEquipmentCardEntity equipmentCard = mesEquipmentCardService.getById(ecId);
+        EquipmentEntity equipmentCard = mesEquipmentCardService.getById(ecId);
         // 如果mtnCode不为null，则代表是修改，否则为新增
         if (StringUtils.isNotBlank(mtnCode)) {
             for (MesQcProduceRunEntity qcProduceRun : qcProduceRunList) {
@@ -262,7 +268,7 @@ public class ProcessQualityMaintenanceServiceImpl implements IProcessQualityMain
             }
             WorkPlan workPlan = workPlanService.getById(wpId);
             MacToolUse prMacToolUse;
-            MesEquipmentCardEntity equipmentCard = mesEquipmentCardService.getById(ecId);
+            EquipmentEntity equipmentCard = mesEquipmentCardService.getById(ecId);
             String code = macToolUseService.nextCode(2);
             workPlan.setPrintType((short) 1);
 
@@ -271,6 +277,7 @@ public class ProcessQualityMaintenanceServiceImpl implements IProcessQualityMain
             prMacToolUse.setWpId(workPlan.getId());
             prMacToolUse.setEquipmentCard(equipmentCard.getId());
             prMacToolUse.setFinished(1);
+            prMacToolUse.setBindTime(new Date());
             prMacToolUse.setCreateMan(AuthUtil.getUserId());
             prMacToolUse.setRfpId(rfpId.toString());
             prMacToolUse.setMtnCode(code);
@@ -402,7 +409,7 @@ public class ProcessQualityMaintenanceServiceImpl implements IProcessQualityMain
             MesRbFilePreserveDetailEntity dsRbFilePreserveDetail = childrenList.get(i);
             if (childrenList.get(0).getRfpdTime() != null) {
                 String time = childrenList.get(0).getRfpdTime();
-                if (org.apache.commons.lang3.StringUtils.isNotBlank(time)) {
+                if (StringUtils.isNotBlank(time)) {
                     time = time.replace("-", "/");
                 }
                 qcProduceRun.setInDate(time);
@@ -410,7 +417,7 @@ public class ProcessQualityMaintenanceServiceImpl implements IProcessQualityMain
             if (childrenList.size() > 1 && childrenList.get(1).getRfpdTime() != null) {
 
                 String time = childrenList.get(1).getRfpdTime();
-                if (org.apache.commons.lang3.StringUtils.isNotBlank(time)) {
+                if (StringUtils.isNotBlank(time)) {
                     time = time.replace("-", "/");
                 }
                 qcProduceRun.setOutDate(time);
@@ -419,7 +426,7 @@ public class ProcessQualityMaintenanceServiceImpl implements IProcessQualityMain
                 if (i == 0) {
                     qcProduceRun.setDataOne(dsRbFilePreserveDetail.getParamValue());
                     String time = dsRbFilePreserveDetail.getRfpdTime();
-                    if (org.apache.commons.lang3.StringUtils.isNotBlank(time)) {
+                    if (StringUtils.isNotBlank(time)) {
                         time = time.replace("-", "/");
                     }
                     qcProduceRun.setInDate(time);
@@ -427,7 +434,7 @@ public class ProcessQualityMaintenanceServiceImpl implements IProcessQualityMain
                 } else if (i == 1) {
                     qcProduceRun.setDataTwo(dsRbFilePreserveDetail.getParamValue());
                     String time = dsRbFilePreserveDetail.getRfpdTime();
-                    if (org.apache.commons.lang3.StringUtils.isNotBlank(time)) {
+                    if (StringUtils.isNotBlank(time)) {
                         time = time.replace("-", "/");
                     }
                     qcProduceRun.setOutDate(time);