Merge remote-tracking branch 'origin/dev' into dev

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml

@@ -2598,12 +2598,12 @@
         SUM( laprr.money ) AS money,
         lawo.warehouse_service_name AS warehouseServiceName,
         lawo.headquarters_name AS headquartersName,
-        GROUP_CONCAT(
+        GROUP_CONCAT(DISTINCT
         CONCAT( '受款方:', lacr2.indemnitor, '受款原因:', lacr2.reason, '受款金额:', lacr2.money )) AS indemnitorInfo,
-        IFNULL( SUM( lacr2.money ), 0 ) AS indemnitorMoney,
-        GROUP_CONCAT(
+        IFNULL( SUM(DISTINCT lacr2.money ), 0 ) AS indemnitorMoney,
+        GROUP_CONCAT(DISTINCT
         CONCAT( '赔款方:', lacr1.responsible_party, '赔款原因:', lacr1.reason_receiving_payment, '赔款金额:', lacr1.money )) AS responsibleInfo,
-        IFNULL( SUM( lacr1.money ), 0 ) AS responsibleMoney,
+        IFNULL( SUM(DISTINCT lacr1.money ), 0 ) AS responsibleMoney,
         GROUP_CONCAT( DISTINCT lapr.business_name ) AS businessName,
         GROUP_CONCAT( DISTINCT lapr.person_responsible_name ) AS personResponsibleName,
         IFNULL(SUM(  lapr.responsibility_ratio ),0) AS responsibilityRatio,
@@ -4140,16 +4140,16 @@
         lawo.commit_time AS commitTime,
         lawo.arbitration_time AS arbitrationTime,
         lawo.audit_time AS auditTime,
-        GROUP_CONCAT( laprr.result_type ) AS resultType,
+        GROUP_CONCAT(DISTINCT laprr.result_type ) AS resultType,
         SUM( laprr.money ) AS money,
         lawo.warehouse_service_name AS warehouseServiceName,
         lawo.headquarters_name AS headquartersName,
-        GROUP_CONCAT(
+        GROUP_CONCAT(DISTINCT
         CONCAT( '受款方:', lacr2.indemnitor, '受款原因:', lacr2.reason, '受款金额:', lacr2.money )) AS indemnitorInfo,
-        IFNULL( SUM( lacr2.money ), 0 ) AS indemnitorMoney,
-        GROUP_CONCAT(
+        IFNULL( SUM(DISTINCT lacr2.money ), 0 ) AS indemnitorMoney,
+        GROUP_CONCAT(DISTINCT
         CONCAT( '赔款方:', lacr1.responsible_party, '赔款原因:', lacr1.reason_receiving_payment, '赔款金额:', lacr1.money )) AS responsibleInfo,
-        IFNULL( SUM( lacr1.money ), 0 ) AS responsibleMoney,
+        IFNULL( SUM(DISTINCT lacr1.money ), 0 ) AS responsibleMoney,
         GROUP_CONCAT( DISTINCT lapr.business_name ) AS businessName,
         GROUP_CONCAT( DISTINCT lapr.person_responsible_name ) AS personResponsibleName,
         IFNULL(SUM(  lapr.responsibility_ratio ),0) AS responsibilityRatio,

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

@@ -234,7 +234,7 @@
         count(lta.id)-count(ltcls.id) noOutNum,
         sum(if( ltcls.id is null and now() <= DATE_ADD( lta.create_time, INTERVAL #{param.hoursTime} HOUR ),1,0)) noOutOverNum,
         sum(if(ltcll.start_date <= DATE_ADD( lta.create_time, INTERVAL #{param.hoursTime} HOUR ),1,0)) onTimeNum,
-        IFNULL(round(sum(if(ltcll.start_date <= DATE_ADD( lta.create_time, INTERVAL #{param.hoursTime} HOUR ),1,0))/count(ltcls.id)*100,2),'0.00') onTimeRate,
+        IFNULL(round(sum(if(ltcll.start_date <= DATE_ADD( lta.create_time, INTERVAL #{param.hoursTime} HOUR ),1,0))/count(lta.id)*100,2),'0.00') onTimeRate,
         round(sum(TIMESTAMPDIFF(SECOND, lta.create_time, ltcll.start_date))/count(ltcls.id)/3600,1) avgTime
         from logpm_trunkline_advance_detail lta
         left join logpm_warehouse_waybill lww on lww.id = lta.waybill_id
@@ -1328,6 +1328,7 @@
         lww.consignee consignee,
         lww.departure_warehouse_name departureWarehouseName,
         lww.destination_warehouse_name destinationWarehouseName,
+        IFNULL(lqd.delivery_type,lww.service_type) serviceType,
         GROUP_CONCAT(DISTINCT ltad.train_number) trainNumber,
         GROUP_CONCAT(DISTINCT ltcls.load_code) loadingLoadCode,
         GROUP_CONCAT(DISTINCT ltclsm.load_code) unloadLoadCode,
@@ -1423,6 +1424,7 @@
         lww.consignee,
         lww.departure_warehouse_name,
         lww.destination_warehouse_name,
+        lqd.delivery_type,lww.service_type,
         oat.day_time
         <trim prefix="HAVING" prefixOverrides="AND">
             <if test="param.trainNumber != null and param.trainNumber !='' ">
@@ -1446,6 +1448,11 @@
         lww.consignee consignee,
         lww.departure_warehouse_name departureWarehouseName,
         lww.destination_warehouse_name destinationWarehouseName,
+        CASE WHEN IFNULL(lqd.delivery_type,lww.service_type)=1 THEN '商配'
+        WHEN IFNULL(lqd.delivery_type,lww.service_type)=2 THEN '市配'
+        WHEN IFNULL(lqd.delivery_type,lww.service_type)=3 THEN '自提'
+        WHEN IFNULL(lqd.delivery_type,lww.service_type)=4 THEN '三方中转'
+        ELSE '未知' END serviceType,
         GROUP_CONCAT(DISTINCT ltad.train_number) trainNumber,
         GROUP_CONCAT(DISTINCT ltcls.load_code) loadingLoadCode,
         GROUP_CONCAT(DISTINCT ltclsm.load_code) unloadLoadCode,
@@ -1541,6 +1548,7 @@
         lww.consignee,
         lww.departure_warehouse_name,
         lww.destination_warehouse_name,
+        lqd.delivery_type,lww.service_type,
         oat.day_time
         <trim prefix="HAVING" prefixOverrides="AND">
             <if test="param.trainNumber != null and param.trainNumber !='' ">

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

@@ -158,7 +158,11 @@ public class ReportTimeServiceImpl implements IReportTimeService {
 		}
 
 		IPage<ReportPackgeStartTimeVO> iPage = reportTimeMapper.packageStartTimePage(page,reportTimeDTO);
-
+		List<ReportPackgeStartTimeVO> records = iPage.getRecords();
+		records.forEach(reportPackgeStartTimeVO -> {
+			reportPackgeStartTimeVO.setHoursTime(reportTimeDTO.getHoursTime());
+		});
+		iPage.setRecords(records);
 
 		return R.data(iPage);
 	}
@@ -181,6 +185,9 @@ public class ReportTimeServiceImpl implements IReportTimeService {
 		}
 
 		List<ReportPackgeStartTimeVO> list = reportTimeMapper.packageStartTimeExport(reportTimeDTO);
+		list.forEach(reportPackgeStartTimeVO -> {
+			reportPackgeStartTimeVO.setHoursTime(reportTimeDTO.getHoursTime());
+		});
 
 		//导出ls
 		ExcelUtil.export(response, "订制品发运时效报表导出", "订制品发运时效报表导出", list, ReportPackgeStartTimeVO.class);

blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportOrderAllTimeVO.java

@@ -34,6 +34,9 @@ public class ReportOrderAllTimeVO implements Serializable {
 	@ExcelProperty(value = "目的仓")
 	private String destinationWarehouseName;
 
+	@ExcelProperty(value = "订单类型")
+	private String serviceType;
+
 	@ExcelProperty(value = "客户车次号")
 	private String trainNumber;
 

blade-service/logpm-report/src/main/java/com/logpm/report/vo/ReportPackgeStartTimeVO.java

@@ -39,5 +39,8 @@ public class ReportPackgeStartTimeVO implements Serializable {
 	@ExcelProperty(value = "平均发运时效")
 	private String avgTime;
 
+	@ExcelProperty(value = "标准时效")
+	private Integer hoursTime;
+
 
 }

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/WaybillCheckListener.java

@@ -310,6 +310,7 @@ public class WaybillCheckListener {
 				trunklinePackageEntity.setThirdOperationPrice(thirdOperationPrice.multiply(new BigDecimal(num)));
 
 
+
 				BigDecimal systemFreightPrice = wayBillDetail.getFreightPrice();
 				BigDecimal price = wayBillDetail.getPrice();
 				BigDecimal systemPickupPrice = wayBillDetail.getPickupPrice();
@@ -320,20 +321,23 @@ public class WaybillCheckListener {
 				Integer systemWarehouseChargeType = wayBillDetail.getSystemWarehouseChargeType();
 				Integer systemDeliveryChargeType = wayBillDetail.getSystemDeliveryChargeType();
 
+				trunklinePackageEntity.setFreightChargeType(chargeType);
+				trunklinePackageEntity.setSystemFreightChargeType(systemChargeType);
+
 				if (systemChargeType == 1) {
 					trunklinePackageEntity.setSystemFreightPrice(systemFreightPrice.multiply(new BigDecimal(num)));
 				} else if (systemChargeType == 2) {
-					trunklinePackageEntity.setSystemFreightPrice(systemFreightPrice.multiply(trunklinePackageEntity.getWeight()));
+					trunklinePackageEntity.setSystemFreightPrice(systemFreightPrice.multiply(weight));
 				} else if (systemChargeType == 3) {
-					trunklinePackageEntity.setSystemFreightPrice(systemFreightPrice.multiply(trunklinePackageEntity.getVolume()));
+					trunklinePackageEntity.setSystemFreightPrice(systemFreightPrice.multiply(volume));
 				}
 
 				if (chargeType == 1) {
 					trunklinePackageEntity.setFreightPrice(price.multiply(new BigDecimal(num)));
 				} else if (chargeType == 2) {
-					trunklinePackageEntity.setFreightPrice(price.multiply(trunklinePackageEntity.getWeight()));
+					trunklinePackageEntity.setFreightPrice(price.multiply(weight));
 				} else if (chargeType == 3) {
-					trunklinePackageEntity.setFreightPrice(price.multiply(trunklinePackageEntity.getVolume()));
+					trunklinePackageEntity.setFreightPrice(price.multiply(volume));
 				}
 
 				if (systemPickupChargeType == 1) {

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

@@ -1155,7 +1155,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 				warehouseWayBillDetail.setSubtotalDeliveryFee(waybillDetailDTO.getSubtotalDeliveryFee());
 				warehouseWayBillDetail.setPickupPrice(waybillDetailDTO.getPickupPrice());
 				warehouseWayBillDetail.setFreightPrice(waybillDetailDTO.getFreightPrice());
-				warehouseWayBillDetail.setSystemChargeType(waybillDetailDTO.getSystemChargeType());
+				warehouseWayBillDetail.setSystemChargeType(waybillDetailDTO.getChargeType());
 				warehouseWayBillDetail.setSystemDeliveryChargeType(waybillDetailDTO.getSystemDeliveryChargeType());
 				warehouseWayBillDetail.setSystemPickupChargeType(waybillDetailDTO.getSystemPickupChargeType());
 				warehouseWayBillDetail.setSystemWarehouseChargeType(waybillDetailDTO.getSystemWarehouseChargeType());
@@ -5620,7 +5620,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 				warehouseWayBillDetail.setSubtotalFreight(waybillDetailDTO.getSubtotalFreight());
 				warehouseWayBillDetail.setPickupPrice(waybillDetailDTO.getPickupPrice());
 				warehouseWayBillDetail.setFreightPrice(waybillDetailDTO.getFreightPrice());
-				warehouseWayBillDetail.setSystemChargeType(waybillDetailDTO.getSystemChargeType());
+				warehouseWayBillDetail.setSystemChargeType(waybillDetailDTO.getChargeType());
 				warehouseWayBillDetail.setSystemDeliveryChargeType(waybillDetailDTO.getSystemDeliveryChargeType());
 				warehouseWayBillDetail.setSystemPickupChargeType(waybillDetailDTO.getSystemPickupChargeType());
 				warehouseWayBillDetail.setSystemWarehouseChargeType(waybillDetailDTO.getSystemWarehouseChargeType());