feat(all): 车次成本明细报表

1 修改报表逻辑

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/QualityDeliverEntity.java

@@ -520,9 +520,9 @@ public class QualityDeliverEntity extends TenantEntity {
 	@ApiModelProperty(value = "到达地址")
 	private String arriveAddress;
 	/**
-	 * 签收人id
+	 * 签收归属司机id
 	 */
-	@ApiModelProperty(value = "签收人id")
+	@ApiModelProperty(value = "签收归属司机id")
 	private String signUserId;
 	/**
 	 * 签收人
@@ -564,6 +564,11 @@ public class QualityDeliverEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "签收车辆id")
 	private Long signCarId;
+	/**
+	 * 签收归属司机
+	 */
+	@ApiModelProperty(value = "签收归属司机")
+	private String signDriverName;
 	/**
 	 * 签收类型（按件签收 批量签收 补录）
 	 */

blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/ExpenseDispatchTrainDetailEntity.java

@@ -45,6 +45,12 @@ public class ExpenseDispatchTrainDetailEntity extends TenantEntity {
 	@ApiModelProperty(value = "配送车辆")
 	@ExcelProperty("配送车辆")
 	private String deliveryVehicle;
+	/**
+	 * 配送司机
+	 */
+	@ApiModelProperty(value = "配送司机")
+	@ExcelProperty("配送司机")
+	private String deliveryDriver;
 	/**
 	 * 配送车型
 	 */
@@ -106,11 +112,11 @@ public class ExpenseDispatchTrainDetailEntity extends TenantEntity {
 	@ExcelIgnore
 	private String carrierType;
 	/**
-	 * 配送司机
+	 * 配送备注
 	 */
-	@ApiModelProperty(value = "配送司机")
-	@ExcelProperty("配送司机")
-	private String deliveryDriver;
+	@ApiModelProperty(value = "配送备注")
+	@ExcelProperty("配送备注")
+	private String deliveryRemark;
 	/**
 	 * 计划总件数
 	 */

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/SignforReportListener.java

@@ -89,6 +89,7 @@ public class SignforReportListener implements ReportService {
 					.warehouseId(warehouseId)
 					.orderPackageCode(detail.getPackageCode())
 					.signUserId(vo.getDriverId())
+					.signDriverName(vo.getDriverName())
 					.signUserName(bean.getOperator())
 					.signTime(bean.getOperatorTime())
 					.signCarNumber(vo.getVehicleName())

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

@@ -3205,7 +3205,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		distributionLoadVO.setVehicleId(distributionLoadscanEntity.getVehicleId());
 		distributionLoadVO.setTrainNumber(distributionDeliveryListEntity.getTrainNumber());
 
-		distributionLoadVO.setDriverId(Convert.toStr(distributionLoadscanEntity.getSigningUserId()));
+		distributionLoadVO.setDriverId(Convert.toStr(distributionLoadscanEntity.getDriverId()));
 
 		if (StringUtil.isNotBlank(distributionLoadscanEntity.getVehicleName())) {
 			// 获取车辆类型
@@ -3275,7 +3275,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 
 
 		distributionLoadVO.setDriverName(distributionLoadscanEntity.getDriverName());
-		distributionLoadVO.setDriverId(Convert.toStr(distributionLoadscanEntity.getSigningUserId()));
+		distributionLoadVO.setDriverId(Convert.toStr(distributionLoadscanEntity.getDriverId()));
 		distributionLoadVO.setVehicleName(distributionLoadscanEntity.getVehicleName());
 		distributionLoadVO.setVehicleId(distributionLoadscanEntity.getVehicleId());
 		if (StringUtil.isNotBlank(distributionLoadscanEntity.getVehicleName())) {
@@ -7184,9 +7184,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		DistributionLoadscanEntity distributionLoadscanEntity = pushList.get(0);
 		distributionLoadVO.setTrainNumber(distributionDeliveryListEntity.getTrainNumber());
 		distributionLoadVO.setDriverName(distributionLoadscanEntity.getDriverName());
+		distributionLoadVO.setDriverId(distributionLoadscanEntity.getDriverId());
 		distributionLoadVO.setVehicleName(distributionLoadscanEntity.getVehicleName());
 		distributionLoadVO.setVehicleId(distributionLoadscanEntity.getVehicleId());
-		distributionLoadVO.setDriverId(Convert.toStr(distributionLoadscanEntity.getSigningUserId()));
 		distributionLoadVO.setOperatMode(operatMode);
 		DistributionReservationEntity byId = distributionReservationService.getById(distributionLoadscanEntity.getReservationId());
 		if (!Func.isEmpty(byId)) {

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/QualityDeliverServiceImpl.java

@@ -130,7 +130,8 @@ public class QualityDeliverServiceImpl extends BaseServiceImpl<QualityDeliverMap
 								trainDetailEntity.setDistributionType(deliveryType);
 							}
 							trainDetailEntity.setDestinationWarehouse(qualityDeliverEntity.getWarehouseName());
-							trainDetailEntity.setDeliveryDriver(qualityDeliverEntity.getSignUserName());
+							trainDetailEntity.setDeliveryDriver(qualityDeliverEntity.getSignDriverName());
+							trainDetailEntity.setDeliveryRemark(qualityDeliverEntity.getDeliveryRemark());
 							if (ObjectUtil.isNotEmpty(qualityDeliverEntity.getPlanNum())) {
 								totalPlanNumber = NumberUtil.add(totalPlanNumber, qualityDeliverEntity.getPlanNum());
 							}