From da09e0afaffb2e89491ccffe2a4493167043828e Mon Sep 17 00:00:00 2001 From: "xiangwei.zhang" <752558143@qq.com> Date: Mon, 10 Feb 2025 10:58:08 +0800 Subject: [PATCH 1/5] =?UTF-8?q?44863=20PCN-=E9=9B=B6=E4=BB=B6=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E7=BB=84=E5=A2=9E=E5=8A=A0=E2=80=9C=E4=BD=BF=E7=94=A8?= =?UTF-8?q?BOM=E6=96=B9=E5=BC=8F=E2=80=9D=E6=9E=9A=E4=B8=BE=E6=9C=80?= =?UTF-8?q?=E7=BB=88=E7=A1=AE=E8=AE=A4=E7=89=88=E9=80=BB=E8=BE=91=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/base/MesWorkOrderService.java | 41 +++++++++++++++++++--- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java index de18e8a..3734d5e 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java @@ -967,10 +967,24 @@ public class MesWorkOrderService extends BaseMesService implements //查询产线信息 MesWorkCenter mesWorkCenter = getMesWorkCenter(mesWorkOrderDb.getOrganizeCode(),mesWorkOrderDb.getWorkCenterCode()); - MesProductVersion mesProductVersion = getMesProductVersion(mesWorkOrderDb.getOrganizeCode(),mesWorkOrderDb.getPartNo(),mesWorkOrderDb.getProductVersion()); - + String partProdGroupCode = mesWorkOrder.getPartProdGroupCode(); + MesProductVersion mesProductVersion = getMesProductVersion(mesWorkOrder.getOrganizeCode(), mesWorkOrder.getPartNo(), mesWorkOrder.getProductVersion()); + String bomVersion = mesProductVersion.getAlternativePartList(); + if (!StringUtil.isEmpty(partProdGroupCode)) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mesWorkOrder.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(partProdGroupCode, "partProdGroupCode", ddlPackBean); + List mesPartProdGroupList = mesPartProdGroupRao.findByHqlTopWhere(ddlPackBean, 1); + // 没有零件生产组用默认找生产版本、有的话找获取bom方式枚举，枚举是基于默认BOM 则直接找 + if (!mesPartProdGroupList.isEmpty()) { + MesPartProdGroup mesPartProdGroup = mesPartProdGroupList.get(0); + if (mesPartProdGroup.getEnableBomVersion() != null && mesPartProdGroup.getEnableBomVersion() == MesExtEnumUtil.ENABLE_BOM_VERSION.ENABLE_BOM_VERSION_2.getValue()) { + log.info("基于默认BOM获取BOM"); + bomVersion = ""; + } + } + } //物料+生产版本获取bom信息 - List mesBoms = mesBomService.findBomList(mesPart.getOrganizeCode(), mesPart, mesProductVersion.getAlternativePartList()); + List mesBoms = mesBomService.findBomList(mesPart.getOrganizeCode(), mesPart, bomVersion); //报工类型 if (MesExtEnumUtil.REPORT_TYPE.REPORT.getValue() == mesWorkOrder.getReportType()) { @@ -1068,7 +1082,7 @@ public class MesWorkOrderService extends BaseMesService implements mesWorkOrder.getAdjustQty(), mesWorkOrder.getReportedQty()); } } - String partProdGroupCode = mesWorkOrder.getPartProdGroupCode(); + /*String partProdGroupCode = mesWorkOrder.getPartProdGroupCode(); DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mesWorkOrder.getOrganizeCode()); DdlPreparedPack.getStringEqualPack(partProdGroupCode,"partProdGroupCode",ddlPackBean); List mesPartProdGroupList = mesPartProdGroupRao.findByHqlTopWhere(ddlPackBean, 1); @@ -1081,8 +1095,25 @@ public class MesWorkOrderService extends BaseMesService implements mesProductVersion = getMesProductVersion(mesWorkOrder.getOrganizeCode(), mesWorkOrder.getPartNo(), mesWorkOrder.getProductVersion()); bomVersion = mesProductVersion.getAlternativePartList(); } - } + }*/ + String partProdGroupCode = mesWorkOrder.getPartProdGroupCode(); + //获取生产版本， partProdGroupCode 不为空，查询的数据不为空，查询数据中的获取bom方式不为空且枚举是 基于默认BOM ，才bomversion = null 否则都是通过生产版本找bom + MesProductVersion mesProductVersion = getMesProductVersion(mesWorkOrder.getOrganizeCode(), mesWorkOrder.getPartNo(), mesWorkOrder.getProductVersion()); + String bomVersion = mesProductVersion.getAlternativePartList(); + if (!StringUtil.isEmpty(partProdGroupCode)) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(mesWorkOrder.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(partProdGroupCode, "partProdGroupCode", ddlPackBean); + List mesPartProdGroupList = mesPartProdGroupRao.findByHqlTopWhere(ddlPackBean, 1); + + if (!mesPartProdGroupList.isEmpty()) { + MesPartProdGroup mesPartProdGroup = mesPartProdGroupList.get(0); + if (mesPartProdGroup.getEnableBomVersion() != null && mesPartProdGroup.getEnableBomVersion() == MesExtEnumUtil.ENABLE_BOM_VERSION.ENABLE_BOM_VERSION_2.getValue()) { + log.info("基于默认BOM获取BOM"); + bomVersion = ""; + } + } + } //生成条码 String sn = getStringList(mesWorkOrderNew.getOrganizeCode(), AuthUtilExt.getUserName()); //保存数据 From 7ca161a717f27329247db537b796f07a837cc6f9 Mon Sep 17 00:00:00 2001 From: "xiangwei.zhang" <752558143@qq.com> Date: Mon, 10 Feb 2025 11:09:49 +0800 Subject: [PATCH 2/5] =?UTF-8?q?44985=20=E7=A6=BB=E7=BA=BF=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E5=8A=A0=E5=B7=A5=E8=A7=84=E5=88=99job=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E5=90=8E=E6=B2=A1=E6=9C=89=E7=94=9F=E6=88=90=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/busi/MesSortRuleCfgOfflineServiceImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSortRuleCfgOfflineServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSortRuleCfgOfflineServiceImpl.java index 579f699..7f75184 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSortRuleCfgOfflineServiceImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSortRuleCfgOfflineServiceImpl.java @@ -119,7 +119,7 @@ public class MesSortRuleCfgOfflineServiceImpl implements IMesSortRuleCfgOfflineS return; } //6.装配件获取的三种条件 - String custCode = mesCustomerPart.getCustCode(); + String custCode = mesPartProdGroup.getCustCode(); MesCustomerCarModel mesCustomerCarModel = getMesCustomerCarModel(custPartNo, organizeCode, custCode); if (mesCustomerCarModel == null) { return; @@ -141,6 +141,7 @@ public class MesSortRuleCfgOfflineServiceImpl implements IMesSortRuleCfgOfflineS String carModelCode = mesCustomerCarModel.getCarModelCode(); List assemblyList = getAssemblyList(detail.getWorkCenterCode(), carModelCode, workOrderPartList, mesPartProdGroup); //7.保存到离线表中 + List offlineList = new ArrayList<>(); for (MesWorkOrderAssembly orderAssembly : assemblyList) { MesProdRuleSortCfgOffline cfgOffline = new MesProdRuleSortCfgOffline(); BeanUtils.copyProperties(orderAssembly, cfgOffline); @@ -153,8 +154,10 @@ public class MesSortRuleCfgOfflineServiceImpl implements IMesSortRuleCfgOfflineS cfgOffline.setRemark(mesCustomerCarModel.getCarModelName()); cfgOffline.setOrganizeCode(organizeCode); ConvertBean.saveOrUpdate(cfgOffline, "OFFLINE-JOB"); - cfgOfflineRao.insert(cfgOffline); + offlineList.add(cfgOffline); } + cfgOfflineRao.saveAll(offlineList); + } @Transactional(propagation = Propagation.REQUIRES_NEW) @@ -333,7 +336,7 @@ public class MesSortRuleCfgOfflineServiceImpl implements IMesSortRuleCfgOfflineS DdlPackBean bomPackBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPreparedPack.getStringEqualPack(bomCode, "bomCode", bomPackBean); DdlPreparedPack.getStringEqualPack(partNo, MesExtConstWords.PART_NO, bomPackBean); - DdlPreparedPack.getStringEqualPack(effectiveTime, MesExtConstWords.EFF_START_TIME, bomPackBean); + DdlPreparedPack.getStringSmallerPack(effectiveTime, MesExtConstWords.EFF_START_TIME, bomPackBean); List bomList = bomRao.findByHqlWhere(bomPackBean); for (MesBom bom : bomList) { From 17e7e2dd45baccb72e6309f0dc5a117bd98cb68c Mon Sep 17 00:00:00 2001 From: "xiangwei.zhang" <752558143@qq.com> Date: Mon, 10 Feb 2025 11:18:22 +0800 Subject: [PATCH 3/5] =?UTF-8?q?44915=20=E6=8E=92=E5=BA=8F=E5=8A=A0?= =?UTF-8?q?=E5=B7=A5=E8=A7=84=E5=88=99=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E4=BB=A3=E7=A0=81=E3=80=81=E8=BD=A6=E5=9E=8B?= =?UTF-8?q?=E5=A4=A7=E7=B1=BB=E4=BB=A3=E7=A0=81=E3=80=81=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E8=A7=84=E5=88=99=E5=B1=95=E7=A4=BA=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E4=BB=A3=E7=A0=81=E3=80=81=E8=BD=A6=E5=9E=8B?= =?UTF-8?q?=E5=A4=A7=E7=B1=BB=E5=90=8D=E7=A7=B0=E6=90=9C=E7=B4=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/apiservice/serviceimpl/base/MesProdRuleSortCfgService.java | 4 ++++ .../main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java | 3 +++ 2 files changed, 7 insertions(+) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdRuleSortCfgService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdRuleSortCfgService.java index 8fe3a79..901e8f1 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdRuleSortCfgService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesProdRuleSortCfgService.java @@ -25,6 +25,10 @@ public class MesProdRuleSortCfgService extends BaseMesService Date: Mon, 10 Feb 2025 16:18:28 +0800 Subject: [PATCH 4/5] =?UTF-8?q?merge=20uat-temp-pzj-250123-Assembly-Report?= =?UTF-8?q?=20=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../daoimpl/report/AssemblyPartReportDaoImpl.java | 76 ++++++++++++---------- 1 file changed, 41 insertions(+), 35 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/AssemblyPartReportDaoImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/AssemblyPartReportDaoImpl.java index c9fddbf..1f069a4 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/AssemblyPartReportDaoImpl.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/AssemblyPartReportDaoImpl.java @@ -52,12 +52,12 @@ public class AssemblyPartReportDaoImpl implements IAssemblyPartReportDao { dataQueryHql.append("c.equipId "); dataQueryHql.append(") "); - StringBuilder countQueryHql= new StringBuilder(); + StringBuilder countQueryHql = new StringBuilder(); countQueryHql.append("select count(1)"); StringBuilder commonQueryHql = new StringBuilder(); commonQueryHql.append("FROM MesProductionAssembly a "); - commonQueryHql.append("JOIN MesProductionRecord b ON a.productionRecordId = b.id AND a.organizeCode=b.organizeCode "); - commonQueryHql.append("JOIN MesEquipment c ON b.equipmentCode = c.equipmentCode AND c.organizeCode=b.organizeCode "); + commonQueryHql.append("JOIN MesProductionRecord b ON a.organizeCode=b.organizeCode AND a.productionRecordId = b.id "); + commonQueryHql.append("JOIN MesEquipment c ON c.organizeCode=b.organizeCode AND b.equipmentCode = c.equipmentCode "); commonQueryHql.append("WHERE 1=1 "); commonQueryHql.append("AND a.organizeCode = :organizeCode "); commonQueryHql.append("AND b.organizeCode = :organizeCode "); @@ -68,66 +68,69 @@ public class AssemblyPartReportDaoImpl implements IAssemblyPartReportDao { commonQueryHql.append("AND a.isValid = :isValid "); commonQueryHql.append("AND b.isValid = :isValid "); commonQueryHql.append("AND c.isValid = :isValid "); + if (!StringUtils.isEmpty(model.getCustSn())) { + commonQueryHql.append("AND a.custSn like :custSn "); + } // like 条码 - if(!StringUtils.isEmpty(model.getSerialNumber())){ + if (!StringUtils.isEmpty(model.getSerialNumber())) { commonQueryHql.append("AND a.serialNumber like :serialNumber "); } // = 装配件条码确认规则 - if (!StringUtils.isEmpty(model.getMatchRule())){ + if (!StringUtils.isEmpty(model.getMatchRule())) { commonQueryHql.append("AND a.matchRule = :matchRule "); } // like 零件号 - if(!StringUtils.isEmpty(model.getPartNo())){ + if (!StringUtils.isEmpty(model.getPartNo())) { commonQueryHql.append("AND a.partNo like :partNo "); } //like 主零件号 - if(!StringUtils.isEmpty(model.getPartName())){ + if (!StringUtils.isEmpty(model.getPartName())) { commonQueryHql.append("AND a.partName like :partName "); } //like 装配零件号 - if(!StringUtils.isEmpty(model.getAssemblyPartNo())){ + if (!StringUtils.isEmpty(model.getAssemblyPartNo())) { commonQueryHql.append("AND a.assemblyPartNo like :assemblyPartNo "); } //like 装配件零件名称 - if(!StringUtils.isEmpty(model.getAssemblyPartName())){ + if (!StringUtils.isEmpty(model.getAssemblyPartName())) { commonQueryHql.append("AND a.assemblyPartName like :assemblyPartName "); } //like 装配条码 - if(!StringUtils.isEmpty(model.getAssemblySn())){ + if (!StringUtils.isEmpty(model.getAssemblySn())) { commonQueryHql.append("AND a.assemblySn like :assemblySn "); } // = 是否跳过 - if(model.getIsSkip() != null){ + if (model.getIsSkip() != null) { commonQueryHql.append("AND a.isSkip = :isSkip "); } //like 创建人 - if(!StringUtils.isEmpty(model.getCreateUser())){ + if (!StringUtils.isEmpty(model.getCreateUser())) { commonQueryHql.append("AND a.createUser like :createUser "); } //范围时间 创建时间 - if (!StringUtils.isEmpty(model.getCreateDateTimeStart()) && !StringUtils.isEmpty(model.getCreateDateTimeEnd())){ + if (!StringUtils.isEmpty(model.getCreateDateTimeStart()) && !StringUtils.isEmpty(model.getCreateDateTimeEnd())) { commonQueryHql.append("AND a.createDatetime between :createDateTimeStart and :createDateTimeEnd "); } //like 产线 - if(!StringUtils.isEmpty(model.getWorkCenterCode())){ + if (!StringUtils.isEmpty(model.getWorkCenterCode())) { commonQueryHql.append("AND a.workCenterCode like :workCenterCode "); } //like 工位编号 - if(!StringUtils.isEmpty(model.getWorkCellCode())){ + if (!StringUtils.isEmpty(model.getWorkCellCode())) { commonQueryHql.append("AND a.workCellCode like :workCellCode "); } - if (model.getMatchType()!=null){ + if (model.getMatchType() != null) { commonQueryHql.append("AND a.matchRule = :matchRule "); } //like 加工单号 - if(!StringUtils.isEmpty(model.getWorkOrderNo())){ + if (!StringUtils.isEmpty(model.getWorkOrderNo())) { commonQueryHql.append("AND b.workOrderNo like :workOrderNo "); } //like 设备名称 - if(!StringUtils.isEmpty(model.getEquipmentName())){ + if (!StringUtils.isEmpty(model.getEquipmentName())) { commonQueryHql.append("AND c.equipmentName like :equipmentName "); } - if (model.getEquipId()!=null){ + if (model.getEquipId() != null) { commonQueryHql.append("AND c.equipId = :equipId "); } commonQueryHql.append("ORDER BY a.createDatetime DESC "); @@ -149,53 +152,56 @@ public class AssemblyPartReportDaoImpl implements IAssemblyPartReportDao { dataQuery.setParameter("organizeCode", model.getOrganizeCode()); dataQuery.setParameter("isDeleted", CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); dataQuery.setParameter("isValid", CommonEnumUtil.IS_VAILD.VAILD.getValue()); - if(!StringUtils.isEmpty(model.getSerialNumber())){ + if (!StringUtils.isEmpty(model.getCustSn())) { + dataQuery.setParameter("custSn", model.getCustSn() + "%"); + } + if (!StringUtils.isEmpty(model.getSerialNumber())) { dataQuery.setParameter("serialNumber", model.getSerialNumber() + "%"); } - if (model.getMatchType()!=null){ + if (model.getMatchType() != null) { dataQuery.setParameter("matchType", model.getMatchType()); } - if(!StringUtils.isEmpty(model.getPartNo())){ + if (!StringUtils.isEmpty(model.getPartNo())) { dataQuery.setParameter("partNo", model.getPartNo() + "%"); } - if(!StringUtils.isEmpty(model.getPartName())){ + if (!StringUtils.isEmpty(model.getPartName())) { dataQuery.setParameter("partName", model.getPartName() + "%"); } - if(!StringUtils.isEmpty(model.getAssemblyPartNo())){ + if (!StringUtils.isEmpty(model.getAssemblyPartNo())) { dataQuery.setParameter("assemblyPartNo", model.getAssemblyPartNo() + "%"); } - if(!StringUtils.isEmpty(model.getAssemblyPartName())){ + if (!StringUtils.isEmpty(model.getAssemblyPartName())) { dataQuery.setParameter("assemblyPartName", model.getAssemblyPartName() + "%"); } - if(!StringUtils.isEmpty(model.getAssemblySn())){ + if (!StringUtils.isEmpty(model.getAssemblySn())) { dataQuery.setParameter("assemblySn", model.getAssemblySn() + "%"); } - if(model.getIsSkip() != null){ + if (model.getIsSkip() != null) { dataQuery.setParameter("isSkip", model.getIsSkip()); } - if(!StringUtils.isEmpty(model.getCreateUser())){ + if (!StringUtils.isEmpty(model.getCreateUser())) { dataQuery.setParameter("createUser", model.getCreateUser() + "%"); } - if (!StringUtils.isEmpty(model.getCreateDateTimeStart()) && !StringUtils.isEmpty(model.getCreateDateTimeEnd())){ + if (!StringUtils.isEmpty(model.getCreateDateTimeStart()) && !StringUtils.isEmpty(model.getCreateDateTimeEnd())) { dataQuery.setParameter("createDateTimeStart", model.getCreateDateTimeStart()); dataQuery.setParameter("createDateTimeEnd", model.getCreateDateTimeEnd()); } - if(!StringUtils.isEmpty(model.getWorkCenterCode())){ + if (!StringUtils.isEmpty(model.getWorkCenterCode())) { dataQuery.setParameter("workCenterCode", model.getWorkCenterCode() + "%"); } - if(!StringUtils.isEmpty(model.getWorkCellCode())){ + if (!StringUtils.isEmpty(model.getWorkCellCode())) { dataQuery.setParameter("workCellCode", model.getWorkCellCode() + "%"); } - if (model.getMatchType()!=null){ + if (model.getMatchType() != null) { dataQuery.setParameter("matchRule", model.getMatchRule()); } - if(!StringUtils.isEmpty(model.getWorkOrderNo())){ + if (!StringUtils.isEmpty(model.getWorkOrderNo())) { dataQuery.setParameter("workOrderNo", model.getWorkOrderNo() + "%"); } - if(!StringUtils.isEmpty(model.getEquipmentName())){ + if (!StringUtils.isEmpty(model.getEquipmentName())) { dataQuery.setParameter("equipmentName", model.getEquipmentName() + "%"); } - if (model.getEquipId()!=null){ + if (model.getEquipId() != null) { dataQuery.setParameter("equipId", model.getEquipId()); } } From ae830a3c9caac1be8984fc75e02ba64b7e52fd55 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 14 Feb 2025 14:20:21 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=2045106=20MES-=E4=BA=A7=E5=93=81=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E6=80=BB=E6=8A=A5=E8=A1=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/daoimpl/report/MesInspectionProductDataReportDao.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/MesInspectionProductDataReportDao.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/MesInspectionProductDataReportDao.java index 3a422b8..5190274 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/MesInspectionProductDataReportDao.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/MesInspectionProductDataReportDao.java @@ -112,10 +112,10 @@ public class MesInspectionProductDataReportDao implements IMesInspectionProductD hql.append(" and mpi.inspectionDate <= :inspectionDateEnd "); } if (!StringUtils.isEmpty(model.getModifyDateTimeStart())) { - hql.append(" and mpi.modifyDatetime >= :modifyDateTimeStart "); + hql.append(" and mpi.modifyDatetime >= :modifyDatetimeStart "); } if (!StringUtils.isEmpty(model.getModifyDateTimeEnd())) { - hql.append(" and mpi.modifyDatetime <= :modifyDateTimeEnd "); + hql.append(" and mpi.modifyDatetime <= :modifyDatetimeEnd "); } if (!StringUtils.isEmpty(model.getPartNo())) { hql.append(" and mpi.partNo like :partNo ");