Merge branch 'dev' into pre-production

blade-service/logpm-factory-data/logpm-factory-data-paterson/src/main/java/com/logpm/factorydata/paterson/interceptor/FactoryAccountsInterceptor.java

@@ -104,7 +104,7 @@ public class FactoryAccountsInterceptor implements HandlerInterceptor {
 						return false;
 					}
 					// 将 authTime 转换为时间并与当前时间比较
-					DateTime authDateTime = DateUtil.date(authTime * 1000); // 将时间戳转换为 DateTime
+					DateTime authDateTime = DateUtil.date(authTime); // 将时间戳转换为 DateTime
 					// 将 authTime 转换为时间并与当前时间比较
 					long timeDifferenceInSeconds = DateUtil.between(authDateTime, currentDate, DateUnit.MS);
 					if (timeDifferenceInSeconds > authTime1) {

blade-service/logpm-report/src/main/java/com/logpm/report/config/MybatisPlusConfig.java

@@ -63,7 +63,7 @@ public class MybatisPlusConfig implements WebMvcConfigurer {
 			AnnotationAwareOrderComparator.sort(queryInterceptorArray);
 			paginationInterceptor.setQueryInterceptors(queryInterceptorArray);
 		}
-		paginationInterceptor.setMaxLimit(mybatisPlusProperties.getPageLimit());
+		paginationInterceptor.setMaxLimit(-1L);
 		paginationInterceptor.setOverflow(mybatisPlusProperties.getOverflow());
 		paginationInterceptor.setOptimizeJoin(mybatisPlusProperties.getOptimizeJoin());
 		paginationInterceptor.setDbType(DbType.MYSQL);

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/TrunklinePickupMapper.xml

@@ -295,7 +295,7 @@
         when ifnull(ldsa.type_service, '1') = '4' then '三方中转' end as type_service,
         count(distinct t.order_code) orderNum, sum(t.quantity) num
               from logpm_distribution_parcel_list t
-        join logpm_distribution_stock_article ldsa on ldsa.order_code = t.order_code and ldsa.is_deleted = 0
+        join logpm_distribution_stock_article ldsa on ldsa.id = t.stock_article_id and ldsa.is_deleted = 0
                        left join logpm_warehouse_warehouse lww on lww.id = t.warehouse_id
               where t.warehouse_entry_time_end >= #{query.startCreateTime} and t.warehouse_entry_time_end <= #{query.endCreateTime}
                 and t.is_transfer = 0 and ldsa.type_service != '2'