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 070ec96..d692035 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 @@ -93,7 +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.getStringRightLikerPack(model.getManageCode(), MesExtConstWords.GROUP_NO, 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); diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java index 617c640..ec95fe4 100644 --- a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java +++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java @@ -444,6 +444,8 @@ public class MesExtConstWords { public static final String PERSON_RESPONSIBLE_USER_NAME = "personResponsibleUserName"; //责任部长用户名 public static final String RESPONSIBLE_MINISTER_USER_NAME = "responsibleMinisterUserName"; + //分组号 + public static final String GROUP_NO = "groupNo"; //时间[开始/结束]条件