diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml
index 418ecd870..3b6150678 100644
--- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml
+++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml
@@ -350,6 +350,8 @@
sum(IFNULL(t.njgNum,0))+sum(IFNULL(t.jgNum,0)) startNum,
sum(IFNULL(t.jgNum,0)) onTimeNum,
IFNULL(round(sum(IFNULL(t.jgNum,0))/sum(lww.total_count)*100,2),'0.00') onTimeRate,
+ sum(lww.total_count-t.njgNum-t.jgNum) noOutNum,
+ sum(if(now() <= DATE_ADD( lww.create_time, INTERVAL #{param.hoursTime} HOUR ),lww.total_count-t.njgNum-t.jgNum,0)) noOutOverNum,
round(sum(TIMESTAMPDIFF(SECOND, lww.create_time, t.startTime))/(sum(IFNULL(t.njgNum,0))+sum(IFNULL(t.jgNum,0)))/3600,1) avgTime
from logpm_warehouse_waybill lww
left join logpm_warehouse_warehouse waw on waw.id = lww.departure_warehouse_id
@@ -454,7 +456,9 @@
sum(IFNULL(t.njgNum,0))+sum(IFNULL(t.jgNum,0)) startNum,
sum(IFNULL(t.jgNum,0)) onTimeNum,
IFNULL(concat(round(sum(IFNULL(t.jgNum,0))/sum(lww.total_count)*100,2),'%'),'0.00%') onTimeRate,
- round(sum(TIMESTAMPDIFF(SECOND, lww.create_time, t.startTime))/(sum(IFNULL(t.njgNum,0))+sum(IFNULL(t.jgNum,0)))/3600,1) '平均发运时效'
+ sum(lww.total_count-t.njgNum-t.jgNum) noOutNum,
+ sum(if(now() <= DATE_ADD( lww.create_time, INTERVAL #{param.hoursTime} HOUR ),lww.total_count-t.njgNum-t.jgNum,0)) noOutOverNum,
+ round(sum(TIMESTAMPDIFF(SECOND, lww.create_time, t.startTime))/(sum(IFNULL(t.njgNum,0))+sum(IFNULL(t.jgNum,0)))/3600,1) avgTime
from logpm_warehouse_waybill lww
left join logpm_warehouse_warehouse waw on waw.id = lww.departure_warehouse_id
left join (
@@ -1355,6 +1359,7 @@
sum(if(ldplm.order_package_status='70',1,0)) signNum
from logpm_trunkline_advance_detail ltad
left join logpm_warehouse_waybill lww on lww.id = ltad.waybill_id
+ left join logpm_warehouse_warehouse waw on waw.id = lww.destination_warehouse_id
left join logpm_distribution_parcel_list ldpls on ldpls.warehouse_id = lww.departure_warehouse_id and ldpls.order_package_code = ltad.order_package_code
left join logpm_trunkline_cars_load_scan ltcls on ltcls.scan_code = ldpls.order_package_code and ltcls.warehouse_id = ldpls.warehouse_id
left join logpm_trunkline_cars_load_line ltcll on ltcll.load_id = ltcls.load_id and ltcll.node_id = ltcls.warehouse_id
@@ -1366,6 +1371,12 @@
where ltad.waybill_id is not null
and ltad.create_time > '2024-10-22 00:00:00'
and lww.departure_warehouse_id != lww.destination_warehouse_id
+
+ and waw.business_line in
+
+ #{item}
+
+
and ltad.create_time >= #{param.startTime}
@@ -1479,6 +1490,7 @@
sum(if(ldplm.order_package_status='70',1,0)) signNum
from logpm_trunkline_advance_detail ltad
left join logpm_warehouse_waybill lww on lww.id = ltad.waybill_id
+ left join logpm_warehouse_warehouse waw on waw.id = lww.destination_warehouse_id
left join logpm_distribution_parcel_list ldpls on ldpls.warehouse_id = lww.departure_warehouse_id and ldpls.order_package_code = ltad.order_package_code
left join logpm_trunkline_cars_load_scan ltcls on ltcls.scan_code = ldpls.order_package_code and ltcls.warehouse_id = ldpls.warehouse_id
left join logpm_trunkline_cars_load_line ltcll on ltcll.load_id = ltcls.load_id and ltcll.node_id = ltcls.warehouse_id
@@ -1490,6 +1502,12 @@
where ltad.waybill_id is not null
and ltad.create_time > '2024-10-22 00:00:00'
and lww.departure_warehouse_id != lww.destination_warehouse_id
+
+ and waw.business_line in
+
+ #{item}
+
+
and ltad.create_time >= #{param.startTime}
diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportTimeServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportTimeServiceImpl.java
index f5ba4d20a..e000686d7 100644
--- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportTimeServiceImpl.java
+++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportTimeServiceImpl.java
@@ -215,7 +215,11 @@ public class ReportTimeServiceImpl implements IReportTimeService {
}
IPage iPage = reportTimeMapper.zeroStartTimePage(page,reportTimeDTO);
-
+ List records = iPage.getRecords();
+ records.forEach(reportPackgeStartTimeVO -> {
+ reportPackgeStartTimeVO.setHoursTime(reportTimeDTO.getHoursTime());
+ });
+ iPage.setRecords(records);
return R.data(iPage);
}
@@ -238,6 +242,9 @@ public class ReportTimeServiceImpl implements IReportTimeService {
}
List list = reportTimeMapper.zeroStartTimeExport(reportTimeDTO);
+ list.forEach(reportPackgeStartTimeVO -> {
+ reportPackgeStartTimeVO.setHoursTime(reportTimeDTO.getHoursTime());
+ });
//导出ls
ExcelUtil.export(response, "零担发运时效报表导出", "零担发运时效报表导出", list, ReportPackgeStartTimeVO.class);
@@ -264,7 +271,11 @@ public class ReportTimeServiceImpl implements IReportTimeService {
}
IPage iPage = reportTimeMapper.packageTransferTimePage(page,reportTimeDTO);
-
+ List records = iPage.getRecords();
+ records.forEach(reportPackgeTransferTimeVO -> {
+ reportPackgeTransferTimeVO.setHoursTime(reportTimeDTO.getHoursTime());
+ });
+ iPage.setRecords(records);
return R.data(iPage);
}
@@ -286,6 +297,10 @@ public class ReportTimeServiceImpl implements IReportTimeService {
}
List list = reportTimeMapper.packageTransferTimeExport(reportTimeDTO);
+ list.forEach(reportPackgeTransferTimeVO -> {
+ reportPackgeTransferTimeVO.setHoursTime(reportTimeDTO.getHoursTime());
+ });
+
//导出ls
ExcelUtil.export(response, "订制品中转时效报表导出", "订制品中转时效报表导出", list, ReportPackgeTransferTimeVO.class);
@@ -301,7 +316,11 @@ public class ReportTimeServiceImpl implements IReportTimeService {
reportTimeDTO.setEndTime(CommonUtil.getEndByDateStr(reportTimeDTO.getEndTimeStr()));
IPage iPage = reportTimeMapper.zeroTransferTimePage(page,reportTimeDTO);
-
+ List records = iPage.getRecords();
+ records.forEach(reportPackgeTransferTimeVO -> {
+ reportPackgeTransferTimeVO.setHoursTime(reportTimeDTO.getHoursTime());
+ });
+ iPage.setRecords(records);
return R.data(iPage);
}
@@ -312,6 +331,10 @@ public class ReportTimeServiceImpl implements IReportTimeService {
reportTimeDTO.setEndTime(CommonUtil.getEndByDateStr(reportTimeDTO.getEndTimeStr()));
List list = reportTimeMapper.zeroTransferTimeExport(reportTimeDTO);
+ list.forEach(reportPackgeTransferTimeVO -> {
+ reportPackgeTransferTimeVO.setHoursTime(reportTimeDTO.getHoursTime());
+ });
+
//导出ls
ExcelUtil.export(response, "零担中转时效报表导出", "零担中转时效报表导出", list, ReportPackgeTransferTimeVO.class);
diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportPackgeTransferTimeVO.java b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportPackgeTransferTimeVO.java
index a307f03c1..fca9beb88 100644
--- a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportPackgeTransferTimeVO.java
+++ b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportPackgeTransferTimeVO.java
@@ -40,4 +40,7 @@ public class ReportPackgeTransferTimeVO implements Serializable {
@ExcelProperty(value = "平均中转时效")
private String avgTime;
+ @ExcelProperty(value = "标准时效")
+ private Integer hoursTime;
+
}
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
index 83bdf5116..8b470c959 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
@@ -4510,7 +4510,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl