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 add7c5a..221e358 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 @@ -92,6 +92,7 @@ public class SxEpProductDataReportFormService implements ISxEpProductDataReportF DdlPreparedPack.getStringEqualPack(model.getWorkCenterCode(), MesExtConstWords.WORK_CENTER_CODE, ddlPackBean); DdlPreparedPack.getStringEqualPack(model.getWorkCellCode(), MesExtConstWords.WORK_CELL_CODE, ddlPackBean); 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.getStringEqualPack(model.getPartNo(), MesExtConstWords.PART_NO, ddlPackBean); DdlPreparedPack.timeBuilder(model.getCreateDatetimeStart(), model.getCreateDatetimeEnd(), MesExtConstWords.CREATE_DATE_TIME, ddlPackBean, true); @@ -106,11 +107,12 @@ public class SxEpProductDataReportFormService implements ISxEpProductDataReportF Map map = new HashMap<>(); map.put(MesExtConstWords.CREATE_DATE_TIME, productData.getCreateDatetime()); map.put(MesExtConstWords.WORK_CENTER_CODE, productData.getWorkCenterCode()); - map.put(MesExtConstWords.WORK_CENTER_NAME, productData.getWorkCenterName()); +// map.put(MesExtConstWords.WORK_CENTER_NAME, productData.getWorkCenterName()); map.put(MesExtConstWords.WORK_CELL_CODE, productData.getWorkCellCode()); - map.put(MesExtConstWords.WORK_CELL_NAME, productData.getWorkCellName()); +// map.put(MesExtConstWords.WORK_CELL_NAME, productData.getWorkCellName()); map.put(MesExtConstWords.ORDER_NO, productData.getOrderNo()); map.put(MesExtConstWords.SERIAL_NUMBER, productData.getSerialNumber()); + map.put(MesExtConstWords.PRODUCT_SN, productData.getProductSn()); map.put(MesExtConstWords.PART_NO, productData.getPartNo()); map.put(MesExtConstWords.PART_DESC, productData.getPartDesc()); @@ -121,9 +123,9 @@ public class SxEpProductDataReportFormService implements ISxEpProductDataReportF } } - if (map.containsKey(MesExtConstWords.RESULT_BIG) && !StringUtils.isEmpty(map.get(MesExtConstWords.RESULT_BIG))) { - map.put(MesExtConstWords.RESULT_BIG, MesExtEnumUtil.EP_PRODUCT_DATA_RESULT.valueOfDescription(map.get(MesExtConstWords.RESULT_BIG))); - } +// if (map.containsKey(MesExtConstWords.RESULT_BIG) && !StringUtils.isEmpty(map.get(MesExtConstWords.RESULT_BIG))) { +// map.put(MesExtConstWords.RESULT_BIG, MesExtEnumUtil.EP_PRODUCT_DATA_RESULT.valueOfDescription(map.get(MesExtConstWords.RESULT_BIG))); +// } list.add(map); } @@ -149,28 +151,33 @@ public class SxEpProductDataReportFormService implements ISxEpProductDataReportF model0.setFieldName("生产线代码"); attributeModelList.add(model0); - SxProductDataReportAttributeModel model1 = new SxProductDataReportAttributeModel(); - model1.setFieldCode(MesExtConstWords.WORK_CENTER_NAME); - model1.setFieldName("生产线名称"); - attributeModelList.add(model1); +// SxProductDataReportAttributeModel model1 = new SxProductDataReportAttributeModel(); +// model1.setFieldCode(MesExtConstWords.WORK_CENTER_NAME); +// model1.setFieldName("生产线名称"); +// attributeModelList.add(model1); SxProductDataReportAttributeModel model2 = new SxProductDataReportAttributeModel(); model2.setFieldCode(MesExtConstWords.WORK_CELL_CODE); model2.setFieldName("工位代码"); attributeModelList.add(model2); - SxProductDataReportAttributeModel model3 = new SxProductDataReportAttributeModel(); - model3.setFieldCode(MesExtConstWords.WORK_CELL_NAME); - model3.setFieldName("工位名称"); - attributeModelList.add(model3); +// SxProductDataReportAttributeModel model3 = new SxProductDataReportAttributeModel(); +// model3.setFieldCode(MesExtConstWords.WORK_CELL_NAME); +// model3.setFieldName("工位名称"); +// attributeModelList.add(model3); SxProductDataReportAttributeModel model4 = new SxProductDataReportAttributeModel(); model4.setFieldCode(MesExtConstWords.ORDER_NO); model4.setFieldName("生产工单号"); attributeModelList.add(model4); + SxProductDataReportAttributeModel model3 = new SxProductDataReportAttributeModel(); + model3.setFieldCode(MesExtConstWords.SERIAL_NUMBER); + model3.setFieldName("过程条码"); + attributeModelList.add(model3); + SxProductDataReportAttributeModel model5 = new SxProductDataReportAttributeModel(); - model5.setFieldCode(MesExtConstWords.SERIAL_NUMBER); + model5.setFieldCode(MesExtConstWords.PRODUCT_SN); model5.setFieldName("产品条码"); attributeModelList.add(model5); 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 806c234..d84ab91 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 @@ -36,6 +36,9 @@ public class SxProductDataReportParamModel implements Serializable { private String workOrderNo; @ApiParam("产品条码") + private String productSn; + + @ApiParam("产品条码") private String serialNumber; @ApiParam("物料编码")