Merge branch 'dev' into pre-production

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
+        <if test="param.businessLineList != null and param.businessLineList.size() > 0">
+            and waw.business_line in
+            <foreach collection="param.businessLineList" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
         <if test="param.startTime != null ">
             and ltad.create_time &gt;= #{param.startTime}
         </if>
@@ -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
+        <if test="param.businessLineList != null and param.businessLineList.size() > 0">
+            and waw.business_line in
+            <foreach collection="param.businessLineList" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
         <if test="param.startTime != null ">
             and ltad.create_time &gt;= #{param.startTime}
         </if>

blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportTimeServiceImpl.java

@@ -215,7 +215,11 @@ public class ReportTimeServiceImpl implements IReportTimeService {
 		}
 
 		IPage<ReportPackgeStartTimeVO> iPage = reportTimeMapper.zeroStartTimePage(page,reportTimeDTO);
-
+		List<ReportPackgeStartTimeVO> 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<ReportPackgeStartTimeVO> 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<ReportPackgeTransferTimeVO> iPage = reportTimeMapper.packageTransferTimePage(page,reportTimeDTO);
-
+		List<ReportPackgeTransferTimeVO> 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<ReportPackgeTransferTimeVO> 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<ReportPackgeTransferTimeVO> iPage = reportTimeMapper.zeroTransferTimePage(page,reportTimeDTO);
-
+		List<ReportPackgeTransferTimeVO> 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<ReportPackgeTransferTimeVO> list = reportTimeMapper.zeroTransferTimeExport(reportTimeDTO);
+		list.forEach(reportPackgeTransferTimeVO -> {
+			reportPackgeTransferTimeVO.setHoursTime(reportTimeDTO.getHoursTime());
+		});
+
 
 		//导出ls
 		ExcelUtil.export(response, "零担中转时效报表导出", "零担中转时效报表导出", list, ReportPackgeTransferTimeVO.class);

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;
+
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@@ -4510,7 +4510,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		Integer unloadNumber = carsLoadEntity.getUnloadNumber();
 		BigDecimal freightPrice;
 		if(!NumberUtil.equals(unloadNumber,0)){
-			freightPrice = countTransportCost.divide(new BigDecimal(unloadNumber),2, RoundingMode.HALF_UP);
+			freightPrice = countTransportCost.divide(new BigDecimal(unloadNumber),8, RoundingMode.HALF_UP);
 		} else {
 			freightPrice = BigDecimal.ZERO;
 		}