From 023ae2beba289a516a21a2bc719c8a67df1d72fa Mon Sep 17 00:00:00 2001 From: pangyang <475446853@qq.com> Date: Fri, 20 Mar 2026 12:05:25 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=87=E7=A8=8B=E6=A8=A1=E6=9D=BF=E8=AF=A6?= =?UTF-8?q?=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/dto/PrintThicknessChildCraft.java | 132 ++++++++++++++++++ .../pojo/dto/PrintThicknessCraftCard.java | 121 ++++++++++++++++ .../entity/MesRbFilePreserveSlotEntity.java | 2 + .../desk/produce/mapper/WorkPlanMapper.java | 10 +- .../desk/produce/mapper/WorkPlanMapper.xml | 27 +++- .../controller/InspectionTaskController.java | 83 +++++++++++ .../service/IInspectionTaskService.java | 5 +- .../impl/InspectionTaskServiceImpl.java | 85 ++++++++++- 8 files changed, 454 insertions(+), 11 deletions(-) create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/PrintThicknessChildCraft.java create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/PrintThicknessCraftCard.java diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/PrintThicknessChildCraft.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/PrintThicknessChildCraft.java new file mode 100644 index 00000000..bbf91e73 --- /dev/null +++ b/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; + } +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/PrintThicknessCraftCard.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/dto/PrintThicknessCraftCard.java new file mode 100644 index 00000000..ea0fd657 --- /dev/null +++ b/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 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 thicknessList) { + this.thicknessList = thicknessList; + } + + public List getThicknessList() { + return thicknessList; + } + + public void setThicknessList(List 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; + } +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/MesRbFilePreserveSlotEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/MesRbFilePreserveSlotEntity.java index 17c0a5df..5ab2e78f 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/MesRbFilePreserveSlotEntity.java +++ b/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 childrenList; +// @TableField(exist = false) +// List childrenListNew; } 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 e0e6e632..1ae0708c 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 @@ -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 getConcatMrByWpId(Long wpId); List listPrByWpIdIndex(Long wpId, Integer index,boolean aTrue); List getDataByWpIdAndIndexList(Long wpId, String indexNum); + List getDataByWpIdAndIndexListNew(Long wpId); + List listPrByWpIdIndexAndMtnCode(Long wpId, Integer indexNum,String mtnCode); List getBoxInfoByWpIdMtnCodeList(Long wpId); List getByRfpsId(Long rfpsId); MacToolUse getHangNumIsNull(Long wpId); MacToolUse getDataByWpIdAndIndex(Long wpId, String numberIndex); - List getDataByWcIdAndPpsId(Long wcId, Long ppsId,boolean aTrue); +// List getDataByWcIdAndPpsId(Long wcId, Long ppsId,boolean aTrue); + List getDataByWcIdAndPpsId(Long wcId, Long ppsId, boolean aTrue); List getByRfpId(Long rfpId); // MesQcProduceRunEntity getBoxInfoByWpIdMtnCode(Long wpId); @@ -80,4 +84,8 @@ public interface WorkPlanMapper extends BaseMapper { List listByWpiIdMes(Long wpiId); List getQcReviewSheetListMes(String partCode,String batchNo); + +// List getByOtherWpIdMes(Long woId); + + List getByRfpsIdMesNew(Long id); } 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 1235c2c1..8b465963 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 @@ -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} + + @@ -246,6 +250,12 @@ where a.WP_ID=#{wpId} and a.mtu_index=#{indexNum} order by a.Id + + - + select from QA_PRO_RE_TEMPLATE a where 1=1 and a.WC_ID = #{wcId} - and a.PPS_ID = #{ppsId} and a.LINE = 2 + and a.PPS_ID = #{ppsId} and a.LINE = 0 @@ -275,7 +293,8 @@ 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 ecc0197a..94fa00c6 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 @@ -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 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 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 preserveSlotList = new ArrayList<>(); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("PPS_ID", pssId); + List 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 toolUseList = workPlanMapper.getDataByWpIdAndIndexListNew(plan.getId()); + for(MacToolUse toolUse : toolUseList){ + List list = mesRbFilePreserveSlotService.getByRfpId(Long.valueOf(toolUse.getRfpId())); + preserveSlotList.addAll(list); + } + } + + + JSONObject obj = new JSONObject(); +// List preserveSlotList = workPlanMapper.getByRfpId(rfpId); + Integer insertIndex = 0; + if (preserveSlotList.size() > 0) { + List childrenList; + List 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); + } + + /** * [检验任务] 自定义分页 */ 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 36b23497..7ae11ed3 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 @@ -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 refreshStatusAndQty(Long id); Object pagePrintSjEleFiles(Long woId, Integer yieldType,List planList, List moduleList); - + List printThicknessList(List idArr); + List getByRfpsIdMesNew(Long rfpsId); } 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 a7d4fb07..46cd62de 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 @@ -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.PrintChildCheck; -import org.springblade.desk.produce.pojo.dto.PrintChildCheckChild; -import org.springblade.desk.produce.pojo.dto.TaskDataDto; +import org.springblade.desk.produce.pojo.dto.*; 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 dsRbFilePreserveList = null; +// List 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 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 0) { + //00000000000000 preserveSlotList = workPlanMapper.getByRfpId(dsRbFilePreserveList.get(0).getId()); qcProduceRunsList = workPlanMapper.listPrByWpIdIndex(workPlan.getId(), 2, Boolean.TRUE); List runs = workPlanMapper.getBoxInfoByWpIdMtnCodeList(workPlan.getId()); @@ -1640,6 +1651,70 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl printThicknessList(List idArr) { + List pcdLst = new ArrayList<>(); +// for (Long woId : idArr) { +// List thicknessList = new ArrayList<>(); +// PrintThicknessChildCraft printThicknessChildCraft; +// List prItemDetails = null; +// // 获取与本单同槽相关订单的工序 +// List 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 getByRfpsIdMesNew(Long id) { + + List list = workPlanMapper.getByRfpsIdMesNew(id); + return list; + } + private JSONObject metalParts(Long woId) { JSONObject obj = new JSONObject(); // 子件订单信息