From f3cf26d8ff7dd71865a0b6ba1b6c752721a1e78d Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 29 Dec 2023 16:30:03 +0800 Subject: [PATCH] plc collect pd --- .../serviceimpl/busi/ep/SxEpProductDataReportFormService.java | 8 +++++++- .../i3plus/ext/mes/pojo/model/SxProductDataReportParamModel.java | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/ep/SxEpProductDataReportFormService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/ep/SxEpProductDataReportFormService.java index 221e358..070ec96 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/ep/SxEpProductDataReportFormService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/ep/SxEpProductDataReportFormService.java @@ -6,7 +6,6 @@ import cn.estsh.i3plus.ext.mes.pojo.model.SxProductDataReportAttributeModel; import cn.estsh.i3plus.ext.mes.pojo.model.SxProductDataReportParamModel; import cn.estsh.i3plus.ext.mes.pojo.model.SxProductDataReportResultModel; import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords; -import cn.estsh.i3plus.ext.mes.pojo.util.MesExtEnumUtil; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; @@ -94,6 +93,7 @@ public class SxEpProductDataReportFormService implements ISxEpProductDataReportF DdlPreparedPack.getStringEqualPack(model.getWorkOrderNo(), MesExtConstWords.ORDER_NO, ddlPackBean); DdlPreparedPack.getStringEqualPack(model.getProductSn(), MesExtConstWords.PRODUCT_SN, ddlPackBean); DdlPreparedPack.getStringEqualPack(model.getSerialNumber(), MesExtConstWords.SERIAL_NUMBER, ddlPackBean); + DdlPreparedPack.getStringRightLikerPack(model.getManageCode(), MesExtConstWords.MANAGE_CODE, ddlPackBean); DdlPreparedPack.getStringEqualPack(model.getPartNo(), MesExtConstWords.PART_NO, ddlPackBean); DdlPreparedPack.timeBuilder(model.getCreateDatetimeStart(), model.getCreateDatetimeEnd(), MesExtConstWords.CREATE_DATE_TIME, ddlPackBean, true); count = productDataRepository.findByHqlWhereCount(ddlPackBean); @@ -111,6 +111,7 @@ public class SxEpProductDataReportFormService implements ISxEpProductDataReportF map.put(MesExtConstWords.WORK_CELL_CODE, productData.getWorkCellCode()); // map.put(MesExtConstWords.WORK_CELL_NAME, productData.getWorkCellName()); map.put(MesExtConstWords.ORDER_NO, productData.getOrderNo()); + map.put(MesExtConstWords.MANAGE_CODE, productData.getGroupNo().contains(MesExtConstWords.AND) ? productData.getGroupNo().split(MesExtConstWords.AND)[0] : productData.getGroupNo()); map.put(MesExtConstWords.SERIAL_NUMBER, productData.getSerialNumber()); map.put(MesExtConstWords.PRODUCT_SN, productData.getProductSn()); map.put(MesExtConstWords.PART_NO, productData.getPartNo()); @@ -171,6 +172,11 @@ public class SxEpProductDataReportFormService implements ISxEpProductDataReportF model4.setFieldName("生产工单号"); attributeModelList.add(model4); + SxProductDataReportAttributeModel model1 = new SxProductDataReportAttributeModel(); + model1.setFieldCode(MesExtConstWords.MANAGE_CODE); + model1.setFieldName("管理编码"); + attributeModelList.add(model1); + SxProductDataReportAttributeModel model3 = new SxProductDataReportAttributeModel(); model3.setFieldCode(MesExtConstWords.SERIAL_NUMBER); model3.setFieldName("过程条码"); diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/SxProductDataReportParamModel.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/SxProductDataReportParamModel.java index d84ab91..e8b5bc3 100644 --- a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/SxProductDataReportParamModel.java +++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/SxProductDataReportParamModel.java @@ -41,6 +41,9 @@ public class SxProductDataReportParamModel implements Serializable { @ApiParam("产品条码") private String serialNumber; + @ApiParam("管理编码") + private String manageCode; + @ApiParam("物料编码") private String partNo;