过程模板详情

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/PrintThicknessChildCraft.java

@@ -0,0 +1,132 @@
+package org.springblade.desk.produce.pojo.dto;
+
+public class PrintThicknessChildCraft implements java.io.Serializable {
+    /**
+     * @return 程式编号
+     * @Author dxl
+     * @CreateTime 2022/11/7 9:29
+     */
+    private String code;
+    /**
+     * @return 名称一
+     * @Author dxl
+     * @CreateTime 2022/11/7 9:29
+     */
+    private String gauge_value1;
+    /**
+     * @return 参数一
+     * @Author dxl
+     * @CreateTime 2022/11/7 9:29
+     */
+
+    private String gauge_value2;
+    /**
+     * @return 名称二
+     * @Author dxl
+     * @CreateTime 2022/11/7 9:29
+     */
+    private String gauge_value3;
+    /**
+     * @return 参数二
+     * @Author dxl
+     * @CreateTime 2022/11/7 9:29
+     */
+    private String gauge_value4;
+    /**
+     * @return 名称三
+     * @Author dxl
+     * @CreateTime 2022/11/7 9:29
+     */
+    private String gauge_value5;
+    /**
+     * @return 参数三
+     * @Author dxl
+     * @CreateTime 2022/11/7 9:29
+     */
+
+    private String gauge_value6;
+    /**
+     * @return 名称设备编码
+     * @Author dxl
+     * @CreateTime 2022/11/7 9:29
+     */
+    private String deviceName;
+    /**
+     * @return 参数检测时间
+     * @Author dxl
+     * @CreateTime 2022/11/7 9:29
+     */
+    private String update_time;
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getGauge_value1() {
+        return gauge_value1;
+    }
+
+    public void setGauge_value1(String gauge_value1) {
+        this.gauge_value1 = gauge_value1;
+    }
+
+    public String getGauge_value2() {
+        return gauge_value2;
+    }
+
+    public void setGauge_value2(String gauge_value2) {
+        this.gauge_value2 = gauge_value2;
+    }
+
+    public String getGauge_value3() {
+        return gauge_value3;
+    }
+
+    public void setGauge_value3(String gauge_value3) {
+        this.gauge_value3 = gauge_value3;
+    }
+
+    public String getGauge_value4() {
+        return gauge_value4;
+    }
+
+    public void setGauge_value4(String gauge_value4) {
+        this.gauge_value4 = gauge_value4;
+    }
+
+    public String getGauge_value5() {
+        return gauge_value5;
+    }
+
+    public void setGauge_value5(String gauge_value5) {
+        this.gauge_value5 = gauge_value5;
+    }
+
+    public String getGauge_value6() {
+        return gauge_value6;
+    }
+
+    public void setGauge_value6(String gauge_value6) {
+        this.gauge_value6 = gauge_value6;
+    }
+
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
+    public String getUpdate_time() {
+        return update_time;
+    }
+
+    public void setUpdate_time(String update_time) {
+        this.update_time = update_time;
+    }
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/PrintThicknessCraftCard.java

@@ -0,0 +1,121 @@
+package org.springblade.desk.produce.pojo.dto;
+
+import java.util.List;
+
+
+public class PrintThicknessCraftCard implements java.io.Serializable {
+    /**
+     * @Description: 测厚明细
+     * @Author cdl
+     * @CreateTime 2024/3/7 11:08
+     */
+    List<PrintThicknessChildCraft> thicknessList;
+    /**
+     * 主槽流程卡号
+     */
+    private String mainCardNo;
+    /**
+     * 主槽零件号
+     */
+    private String mainPartCode;
+    /**
+     * 主槽批次号
+     */
+    private String mainBatchNo;
+    /**
+     * 主槽车间订单号
+     */
+    private String mainWoCode;
+    /**
+     * 流程卡号
+     */
+    private String cardNo;
+    /**
+     * 零件号
+     */
+    private String partCode;
+    /**
+     * 批次号
+     */
+    private String batchNo;
+    /**
+     * 车间订单号
+     */
+    private String woCode;
+
+    public PrintThicknessCraftCard(List<PrintThicknessChildCraft> thicknessList) {
+        this.thicknessList = thicknessList;
+    }
+
+    public List<PrintThicknessChildCraft> getThicknessList() {
+        return thicknessList;
+    }
+
+    public void setThicknessList(List<PrintThicknessChildCraft> thicknessList) {
+        this.thicknessList = thicknessList;
+    }
+
+    public String getCardNo() {
+        return cardNo;
+    }
+
+    public void setCardNo(String cardNo) {
+        this.cardNo = cardNo;
+    }
+
+    public String getPartCode() {
+        return partCode;
+    }
+
+    public void setPartCode(String partCode) {
+        this.partCode = partCode;
+    }
+
+    public String getBatchNo() {
+        return batchNo;
+    }
+
+    public void setBatchNo(String batchNo) {
+        this.batchNo = batchNo;
+    }
+
+    public String getWoCode() {
+        return woCode;
+    }
+
+    public void setWoCode(String woCode) {
+        this.woCode = woCode;
+    }
+
+    public String getMainCardNo() {
+        return mainCardNo;
+    }
+
+    public void setMainCardNo(String mainCardNo) {
+        this.mainCardNo = mainCardNo;
+    }
+
+    public String getMainPartCode() {
+        return mainPartCode;
+    }
+
+    public void setMainPartCode(String mainPartCode) {
+        this.mainPartCode = mainPartCode;
+    }
+
+    public String getMainBatchNo() {
+        return mainBatchNo;
+    }
+
+    public void setMainBatchNo(String mainBatchNo) {
+        this.mainBatchNo = mainBatchNo;
+    }
+
+    public String getMainWoCode() {
+        return mainWoCode;
+    }
+
+    public void setMainWoCode(String mainWoCode) {
+        this.mainWoCode = mainWoCode;
+    }
+}

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/MesRbFilePreserveSlotEntity.java

@@ -65,4 +65,6 @@ public class MesRbFilePreserveSlotEntity extends BaseEntity {
 	private String keepMan;
 	@TableField(exist = false)
 	private List<MesRbFilePreserveDetailDTO> childrenList;
+//	@TableField(exist = false)
+//	List<MesRbFilePreserveDetailEntity> childrenListNew;
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.java

@@ -9,6 +9,7 @@ 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.ProReTemplate;
 import org.springblade.desk.quality.pojo.entity.ReviewSheet;
 import org.springblade.desk.quality.pojo.entity.WorkPlanItem;
 import org.springblade.desk.quality.pojo.entity.WorkPlanItemDetail;
@@ -54,12 +55,15 @@ public interface WorkPlanMapper extends BaseMapper<WorkPlan> {
     WorkPlan getConcatMrByWpId(Long wpId);
     List<MesQcProduceRunEntity> listPrByWpIdIndex(Long wpId, Integer index,boolean aTrue);
     List<MacToolUse> getDataByWpIdAndIndexList(Long wpId, String indexNum);
+    List<MacToolUse> getDataByWpIdAndIndexListNew(Long wpId);
+
     List<MesQcProduceRunEntity> listPrByWpIdIndexAndMtnCode(Long wpId, Integer indexNum,String mtnCode);
     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<DsRbFilePreserve> getDataByWcIdAndPpsId(Long wcId, Long ppsId,boolean aTrue);
+    List<ProReTemplate> getDataByWcIdAndPpsId(Long wcId, Long ppsId, boolean aTrue);
     List<MesRbFilePreserveSlotEntity> getByRfpId(Long rfpId);
 //    MesQcProduceRunEntity getBoxInfoByWpIdMtnCode(Long wpId);
 
@@ -80,4 +84,8 @@ public interface WorkPlanMapper extends BaseMapper<WorkPlan> {
     List<WorkPlanItemDetail> listByWpiIdMes(Long wpiId);
 
     List<ReviewSheet> getQcReviewSheetListMes(String partCode,String batchNo);
+
+//    List<Long> getByOtherWpIdMes(Long woId);
+
+    List<MesRbFilePreserveDetailEntity> getByRfpsIdMesNew(Long id);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml

@@ -228,6 +228,10 @@
         select * from MES_WORK_ORDER a inner join MES_YIELD_ORDER  b on a.yo_id = b.id and a.yo_id = #{yoId}
     </select>
 
+    <select id="getByRfpsIdMesNew" resultType="org.springblade.desk.produce.pojo.entity.MesRbFilePreserveDetailEntity">
+        select * from MES_RB_FILE_PRESERVE_DETAIL a left  join MES_RB_FILE_PRESERVE_SLOT  b on a.rfps_id = b.id and a.rfps_id = #{id}
+    </select>
+
     <select id="listByWoIdAllMes" resultType="org.springblade.desk.produce.pojo.entity.WorkPlan">
         select a.* from MES_WORK_PLAN a where a.wo_id= #{woId} order by orders asc
     </select>
@@ -246,6 +250,12 @@
         where a.WP_ID=#{wpId} and a.mtu_index=#{indexNum} order by a.Id
     </select>
 
+    <select id="getDataByWpIdAndIndexListNew" 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 a.WP_ID=#{wpId}
+    </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
@@ -256,12 +266,20 @@
         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 id="getDataByWcIdAndPpsId" resultType="org.springblade.desk.produce.pojo.entity.DsRbFilePreserve">-->
-        select from DS_RB_FILE_PRESERVE a where 1=1
+<!--        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="getDataByWcIdAndPpsId" resultType="org.springblade.desk.quality.pojo.entity.ProReTemplate">
+        select from QA_PRO_RE_TEMPLATE a where 1=1
         <if test="wcId != null">
             and a.WC_ID = #{wcId}
         </if>
-        and a.PPS_ID = #{ppsId} and a.LINE = 2
+        and a.PPS_ID = #{ppsId} and a.LINE = 0
     </select>
 
 
@@ -275,7 +293,8 @@
 
     <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
+--         left join DS_RB_FILE_PRESERVE slot on a.Id = slot.RFP_ID
+        left join MES_DS_RB_FILE_PRESERVE MES_DS_RB_FILE_PRESERVE on a.Id = slot.RFP_ID
         where slot.RFP_ID =#{rfpId}
 
     </select>

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java

@@ -3,6 +3,7 @@
  */
 package org.springblade.desk.quality.controller;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -11,6 +12,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import lombok.Data;
@@ -36,9 +38,16 @@ import org.springblade.desk.dashboard.service.IDsPartService;
 import org.springblade.desk.dashboard.service.IDsPartVersionService;
 import org.springblade.desk.order.pojo.entity.YieldOrder;
 import org.springblade.desk.order.service.IYieldOrderService;
+import org.springblade.desk.produce.mapper.WorkPlanMapper;
+import org.springblade.desk.produce.pojo.dto.MesRbFilePreserveDetailDTO;
+import org.springblade.desk.produce.pojo.dto.PrintThicknessCraftCard;
+import org.springblade.desk.produce.pojo.entity.MacToolUse;
+import org.springblade.desk.produce.pojo.entity.MesRbFilePreserveDetailEntity;
+import org.springblade.desk.produce.pojo.entity.MesRbFilePreserveSlotEntity;
 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.springblade.desk.produce.service.IMesRbFilePreserveSlotService;
 import org.springblade.desk.produce.service.IWorkPlanService;
 import org.springblade.desk.quality.constant.InspectionTaskConst;
 import org.springblade.desk.quality.constant.QAModuleConst;
@@ -54,6 +63,7 @@ import org.springblade.desk.quality.service.IInspectionTaskService;
 import org.springblade.desk.quality.service.IReviewSheetSubService;
 import org.springblade.desk.quality.service.InspectionTaskService2;
 import org.springblade.desk.quality.wrapper.InspectionTaskDetailWrapper;
+import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
@@ -95,6 +105,8 @@ public class InspectionTaskController extends BladeController {
     IDsPartService dsPartService;
     @Resource
     private IYieldOrderService yieldOrderService;
+    @Resource
+    private WorkPlanMapper workPlanMapper;
     /**
      * [检验任务] 详情
      */
@@ -218,6 +230,77 @@ public class InspectionTaskController extends BladeController {
     }
 
 
+    @Operation(summary = "测厚数据打印")
+    @PostMapping(value = "/thicknessPrint")
+    public void thicknessPrint(@RequestBody JSONObject data, HttpServletRequest request, HttpServletResponse response) {
+
+        List<Long> idArr = JSONArray.parseArray(data.get("idArr").toString(), Long.class);
+        Short exportType = data.getShort("exportType");
+        if (idArr == null || idArr.size() == 0) {
+            return;
+        }
+        String reportId = data.getString("reportId");
+        if (reportId == null) {
+            return;
+        }
+        List<PrintThicknessCraftCard> list = service.printThicknessList(idArr);
+//        this.export(reportId, exportType, "流程卡打印", list, null, request, response);
+    }
+
+    @Resource
+    private IMesRbFilePreserveSlotService mesRbFilePreserveSlotService;
+
+    @Operation(summary = "获取热表电子档案维护-槽子明细及对应的明细")
+    @RequestMapping(value = "/getByRfpId/{pssId}", method = RequestMethod.GET)
+    public R getByRfpId(@PathVariable Long pssId) {
+
+        List<MesRbFilePreserveSlotEntity> preserveSlotList = new ArrayList<>();
+
+        QueryWrapper<WorkPlan> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("PPS_ID", pssId);
+        List<WorkPlan> workPlanList = workPlanMapper.selectList(queryWrapper);
+        WorkPlan plan = new WorkPlan();
+        if(null != workPlanList && workPlanList.size() > 0){
+            plan = workPlanList.get(0);
+        }
+
+        if(plan != null && plan.getId() != null){
+            List<MacToolUse> toolUseList = workPlanMapper.getDataByWpIdAndIndexListNew(plan.getId());
+            for(MacToolUse toolUse : toolUseList){
+                List<MesRbFilePreserveSlotEntity> list = mesRbFilePreserveSlotService.getByRfpId(Long.valueOf(toolUse.getRfpId()));
+                preserveSlotList.addAll(list);
+            }
+        }
+
+
+        JSONObject obj = new JSONObject();
+//        List<MesRbFilePreserveSlotEntity> preserveSlotList = workPlanMapper.getByRfpId(rfpId);
+        Integer insertIndex = 0;
+        if (preserveSlotList.size() > 0) {
+            List<MesRbFilePreserveDetailEntity> childrenList;
+            List<MesRbFilePreserveDetailDTO> childrenListNew = new ArrayList<>();
+            for (MesRbFilePreserveSlotEntity dsRbFilePreserveSlot : preserveSlotList) {
+                if(null != dsRbFilePreserveSlot.getInsertIndex()){
+                    if(Integer.parseInt(dsRbFilePreserveSlot.getInsertIndex()) > insertIndex){
+                        insertIndex = Integer.parseInt(dsRbFilePreserveSlot.getInsertIndex());
+                    }
+                }
+
+                childrenList = service.getByRfpsIdMesNew(dsRbFilePreserveSlot.getId());
+                for(MesRbFilePreserveDetailEntity children : childrenList){
+                    MesRbFilePreserveDetailDTO childrenDTO = new MesRbFilePreserveDetailDTO();
+                    BeanUtils.copyProperties(children, childrenDTO);
+                    childrenListNew.add(childrenDTO);
+                }
+                dsRbFilePreserveSlot.setChildrenList(childrenListNew);
+            }
+        }
+        obj.put("preserveSlotList",preserveSlotList);
+        obj.put("insertIndex",insertIndex);
+        return R.data(obj);
+    }
+
+
     /**
      * [检验任务] 自定义分页
      */

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTaskService.java

@@ -12,6 +12,8 @@ import org.apache.ibatis.annotations.Param;
 import org.springblade.common.exception.BusinessException;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.tool.api.R;
+import org.springblade.desk.produce.pojo.dto.PrintThicknessCraftCard;
+import org.springblade.desk.produce.pojo.entity.MesRbFilePreserveDetailEntity;
 import org.springblade.desk.quality.excel.InspectionTaskExcel;
 import org.springblade.desk.quality.pojo.entity.InspectionTask;
 import org.springblade.desk.quality.pojo.request.InspectionTaskSearch;
@@ -123,5 +125,6 @@ public interface IInspectionTaskService extends BaseService<InspectionTask> {
     InspectionTask refreshStatusAndQty(Long id);
 
     Object pagePrintSjEleFiles(Long woId, Integer yieldType,List<Boolean> planList, List<Boolean> moduleList);
-
+    List<PrintThicknessCraftCard>  printThicknessList(List<Long> idArr);
+    List<MesRbFilePreserveDetailEntity> getByRfpsIdMesNew(Long rfpsId);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java

@@ -48,10 +48,7 @@ import org.springblade.desk.order.pojo.entity.YieldOrder;
 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.*;
-import org.springblade.desk.produce.pojo.dto.PrintChildCheck;
-import org.springblade.desk.produce.pojo.dto.PrintChildCheckChild;
-import org.springblade.desk.produce.pojo.dto.TaskDataDto;
 import org.springblade.desk.produce.pojo.entity.*;
 import org.springblade.desk.produce.pojo.vo.ProduceMonitorSlotListVO;
 import org.springblade.desk.produce.service.IMesEquipmentCardService;
@@ -707,7 +704,19 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
                 prMacToolUse = workPlanMapper.getDataByWpIdAndIndex(workPlan.getId(), "2");
                 if (prMacToolUse != null && prMacToolUse.getId() != null) {
                     // 获取模板数据
-                    List<DsRbFilePreserve> dsRbFilePreserveList = 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);
+//                        }
+//                    }
+
+                    List<ProReTemplate> dsRbFilePreserveList = null;
                     if (workPlan.getPpsId() != null){
                         BsProcessSetEntity process = processSetService.getById(workPlan.getPpsId());
                         if("喷砂".equals(process.getName()) || "涂色标".equals(process.getName())) {
@@ -719,7 +728,9 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
                         }
                     }
 
+                    //sql不对
                     if (dsRbFilePreserveList != null && dsRbFilePreserveList.size() > 0) {
+                        //00000000000000
                         preserveSlotList = workPlanMapper.getByRfpId(dsRbFilePreserveList.get(0).getId());
                         qcProduceRunsList = workPlanMapper.listPrByWpIdIndex(workPlan.getId(), 2, Boolean.TRUE);
                         List<MesQcProduceRunEntity> runs = workPlanMapper.getBoxInfoByWpIdMtnCodeList(workPlan.getId());
@@ -1640,6 +1651,70 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
 
     }
 
+    @Override
+    public List<PrintThicknessCraftCard> printThicknessList(List<Long> idArr) {
+        List<PrintThicknessCraftCard> pcdLst = new ArrayList<>();
+//        for (Long woId : idArr) {
+//            List<PrintThicknessChildCraft> thicknessList = new ArrayList<>();
+//            PrintThicknessChildCraft printThicknessChildCraft;
+//            List<WorkPlanItemDetail> prItemDetails = null;
+//            // 获取与本单同槽相关订单的工序
+//            List<Long> byOtherWpId = workPlanMapper.getByOtherWpIdMes(woId);
+//            // 2025-07-23 线上迁移
+////            byOtherWpId.add(woId);
+//            String wpIdStr = "";
+//            if (byOtherWpId == null || byOtherWpId.size() == 0) {
+//                continue;
+//            }
+//            wpIdStr = StringUtils.join(byOtherWpId, ",");
+//
+//            // 拿出工序对应的测厚数据
+//            prItemDetails = prItemDetailService.listByWpIdAndCode(wpIdStr, "镀后测厚");
+//            if (prItemDetails != null && prItemDetails.size() > 0) {
+//                for (PrItemDetail prItemDetail : prItemDetails) {
+//                    printThicknessChildCraft = new PrintThicknessChildCraft();
+//                    printThicknessChildCraft.setCode(prItemDetail.getGaugeValue7());
+//                    printThicknessChildCraft.setGauge_value1(prItemDetail.getGaugeValue1());
+//                    printThicknessChildCraft.setGauge_value2(prItemDetail.getGaugeValue2());
+//                    printThicknessChildCraft.setGauge_value3(prItemDetail.getGaugeValue3());
+//                    printThicknessChildCraft.setGauge_value4(prItemDetail.getGaugeValue4());
+//                    printThicknessChildCraft.setGauge_value5(prItemDetail.getGaugeValue5() != null ?
+//                            prItemDetail.getGaugeValue5() : null);
+//                    printThicknessChildCraft.setGauge_value6(prItemDetail.getGaugeValue6());
+//                    printThicknessChildCraft.setDeviceName(prItemDetail.getGaugeValue8());
+//                    printThicknessChildCraft.setUpdate_time(prItemDetail.getUpdateTime() != null ?
+//                            DateTime.date2String(prItemDetail.getUpdateTime(), true, true) : null);
+//                    thicknessList.add(printThicknessChildCraft);
+//                }
+//            }
+//            // 组装打印集合
+//            PrintThicknessCraftCard pcd = new PrintThicknessCraftCard(thicknessList);
+//            WorkOrder wo = workOrderMapper.selectById(woId);
+//            pcd.setBatchNo(wo.getBatchNo());
+//            pcd.setCardNo(wo.getPjYieldOrder().getCardNo());
+//            pcd.setPartCode(wo.getPjYieldOrder().getPartCode());
+//            pcd.setWoCode(wo.getWoCode());
+//            // 填写主槽信息
+//            if (prItemDetails != null && prItemDetails.size() > 0) {
+//                PrItemDetail prItemDetail = prItemDetails.get(0);
+//                PrWorkOrder prWorkOrder = prItemDetail.getPrWorkPlanItem().getPrWorkPlan().getPrWorkOrder();
+//                pcd.setMainBatchNo(prWorkOrder.getBatchNo());
+//                pcd.setMainCardNo(prWorkOrder.getPjYieldOrder().getCardNo());
+//                pcd.setMainPartCode(prWorkOrder.getPjYieldOrder().getPartCode());
+//                pcd.setMainWoCode(prWorkOrder.getWoCode());
+//            }
+//            pcdLst.add(pcd);
+//        }
+        return pcdLst;
+    }
+
+    @Override
+    public List<MesRbFilePreserveDetailEntity> getByRfpsIdMesNew(Long id) {
+
+        List<MesRbFilePreserveDetailEntity> list = workPlanMapper.getByRfpsIdMesNew(id);
+        return list;
+    }
+
     private JSONObject metalParts(Long woId) {
         JSONObject obj = new JSONObject();
         // 子件订单信息