合并 45106 MES-产品检验总报表问题

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 ");

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;