Merge branch 'dev-temp-xw-202502170000-45112' into dev

# Conflicts:
#	modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/AssemblyPartReportDaoImpl.java

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/daoimpl/report/ShipmentDetailReportDaoImpl.java

@@ -142,6 +142,9 @@ public class ShipmentDetailReportDaoImpl implements IShipmentDetailReportDao {
         if (!StringUtils.isEmpty(model.getPublishTimeStart()) && !StringUtils.isEmpty(model.getPublishTimeEnd())) {
             commonQueryHql.append("AND ms.publishTime between :publishTimeStart and :publishTimeEnd ");
         }
+        if (!StringUtils.isEmpty(model.getPlanArriveEndTime()) && !StringUtils.isEmpty(model.getPlanArriveEndTime())) {
+            commonQueryHql.append("AND ms.planArriveEndTime between :planArriveEndTimeStart and :planArriveEndTimeEnd ");
+        }
 
         //按照结束扫描时间倒叙
         orderByHql.append(" ORDER BY endScanTime DESC ");
@@ -207,5 +210,9 @@ public class ShipmentDetailReportDaoImpl implements IShipmentDetailReportDao {
             dataQuery.setParameter("publishTimeStart",model.getPublishTimeStart());
             dataQuery.setParameter("publishTimeEnd", model.getPublishTimeEnd());
         }
+        if (!StringUtils.isEmpty(model.getPlanArriveEndTimeStart()) && !StringUtils.isEmpty(model.getPlanArriveEndTimeEnd())) {
+            dataQuery.setParameter("planArriveEndTimeStart",model.getPlanArriveEndTimeStart());
+            dataQuery.setParameter("planArriveEndTimeEnd", model.getPlanArriveEndTimeEnd());
+        }
     }
 }

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;

pom.xml

@@ -171,6 +171,11 @@
             </dependency>
             <dependency>
                 <groupId>i3plus.pojo</groupId>
+                <artifactId>i3plus-pojo-platform</artifactId>
+                <version>${i3plus.pojo.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>i3plus.pojo</groupId>
                 <artifactId>i3plus-pojo-model</artifactId>
                 <version>${i3plus.pojo.version}</version>
             </dependency>