feat(all): 成本报表

1 优化成本报表
2 增加中转成本报表

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

@@ -88,6 +88,11 @@ public class QualityDeliverEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "客户地址")
 	private String customAddress;
+	/**
+	 * 开单时间
+	 */
+	@ApiModelProperty(value = "开单时间")
+	private Date openOrderTime;
 	/**
 	 * 运单发货单位id
 	 */
@@ -594,6 +599,11 @@ public class QualityDeliverEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "滞留数量")
 	private Integer retentionNum;
+	/**
+	 * 配送总成本
+	 */
+	@ApiModelProperty(value = "配送总成本")
+	private String totalDistributionCost;
 	/**
 	 * 配送成本
 	 */
@@ -664,5 +674,21 @@ public class QualityDeliverEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "仓库成本")
 	private BigDecimal warehouseCost;
+	/**
+	 * 结算时间
+	 */
+	@ApiModelProperty(value = "结算时间")
+	private Date settlementTime;
+	/**
+	 * 结算金额
+	 */
+	@ApiModelProperty(value = "结算金额")
+	private Double settlementAmount;
+	/**
+	 * 异动金额
+	 */
+	@ApiModelProperty(value = "异动金额")
+	private Double changeAmount;
+
 
 }

blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/dto/ExpenseDispatchTrainDetailChangeDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.statistics.dto;
+
+import com.logpm.statistics.entity.ExpenseDispatchTrainDetailChangeEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 配送成本-车辆成本结算表-异动记录 数据传输对象实体类
+ *
+ * @author zqb
+ * @since 2024-12-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ExpenseDispatchTrainDetailChangeDTO extends ExpenseDispatchTrainDetailChangeEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/dto/ExpenseWarehouseTransitChangeDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.statistics.dto;
+
+import com.logpm.statistics.entity.ExpenseWarehouseTransitChangeEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 仓储成本-中转仓作业成本-操作记录 数据传输对象实体类
+ *
+ * @author zqb
+ * @since 2024-12-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ExpenseWarehouseTransitChangeDTO extends ExpenseWarehouseTransitChangeEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/dto/ExpenseWarehouseTransitChangeImageDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.statistics.dto;
+
+import com.logpm.statistics.entity.ExpenseWarehouseTransitChangeImageEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 仓储成本-中转仓作业成本-操作-图片 数据传输对象实体类
+ *
+ * @author zqb
+ * @since 2024-12-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ExpenseWarehouseTransitChangeImageDTO extends ExpenseWarehouseTransitChangeImageEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/dto/ExpenseWarehouseTransitDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.statistics.dto;
+
+import com.logpm.statistics.entity.ExpenseWarehouseTransitEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 中转仓仓储作业明细 数据传输对象实体类
+ *
+ * @author zqb
+ * @since 2024-12-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ExpenseWarehouseTransitDTO extends ExpenseWarehouseTransitEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/dto/ExpenseWarehouseTransitMonthDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.statistics.dto;
+
+import com.logpm.statistics.entity.ExpenseWarehouseTransitMonthEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 中转仓月度仓储作业账单 数据传输对象实体类
+ *
+ * @author zqb
+ * @since 2024-12-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ExpenseWarehouseTransitMonthDTO extends ExpenseWarehouseTransitMonthEntity {
+	private static final long serialVersionUID = 1L;
+
+}

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

@@ -16,6 +16,7 @@
  */
 package com.logpm.statistics.entity;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -39,191 +40,229 @@ public class ExpenseDispatchOrderDetailEntity extends TenantEntity {
 	 * 品牌
 	 */
 	@ApiModelProperty(value = "品牌")
+	@ExcelProperty("品牌")
 	private String brand;
 	/**
 	 * 订单编号
 	 */
 	@ApiModelProperty(value = "订单编号")
+	@ExcelProperty("订单编号")
 	private String orderCode;
 	/**
 	 * 运单号
 	 */
 	@ApiModelProperty(value = "运单号")
+	@ExcelProperty("运单号")
 	private String waybillNumber;
 	/**
 	 * 目的仓
 	 */
 	@ApiModelProperty(value = "目的仓")
+	@ExcelProperty("目的仓")
 	private String destinationWarehouse;
 	/**
 	 * 发货单位
 	 */
 	@ApiModelProperty(value = "发货单位")
+	@ExcelProperty("发货单位")
 	private String shippingOrg;
 	/**
 	 * 收货单位
 	 */
 	@ApiModelProperty(value = "收货单位")
+	@ExcelProperty("收货单位")
 	private String consigneeOrg;
 	/**
-	 * 运单类型
+	 * 配送类型
 	 */
-	@ApiModelProperty(value = "运单类型")
+	@ApiModelProperty(value = "配送类型")
+	@ExcelProperty("配送类型")
 	private String waybillType;
 	/**
 	 * 开单时间
 	 */
 	@ApiModelProperty(value = "开单时间")
+	@ExcelProperty("开单时间")
 	private String documentCreationTime;
 	/**
-	 * 货物品类
-	 */
-	@ApiModelProperty(value = "货物品类")
-	private String goodsCategories;
-	/**
-	 * 品类件数
+	 * 总件数
 	 */
-	@ApiModelProperty(value = "品类件数")
-	private String categoryPieceCount;
+	@ApiModelProperty(value = "总件数")
+	@ExcelProperty("总件数")
+	private Integer totalQuantity;
 	/**
-	 * 品类数
+	 * 复核件数
 	 */
-	@ApiModelProperty(value = "品类数")
-	private String categoryCount;
+	@ApiModelProperty(value = "复核件数")
+	@ExcelProperty("复核件数")
+	private Integer reviewNumber;
 	/**
-	 * 总件数
+	 * 结算件数
 	 */
-	@ApiModelProperty(value = "总件数")
-	private String totalQuantity;
+	@ApiModelProperty(value = "结算件数")
+	@ExcelProperty("结算件数")
+	private Integer settlementNumber;
 	/**
 	 * 总重量
 	 */
 	@ApiModelProperty(value = "总重量")
-	private String totalWeight;
+	@ExcelProperty("总重量")
+	private Double totalWeight;
 	/**
 	 * 总体积
 	 */
 	@ApiModelProperty(value = "总体积")
-	private String totalVolume;
+	@ExcelProperty("总体积")
+	private Double totalVolume;
 	/**
 	 * 配送总成本
 	 */
 	@ApiModelProperty(value = "配送总成本")
-	private String totalDistributionCost;
+	@ExcelProperty("配送总成本")
+	private Double totalDistributionCost;
 	/**
 	 * 配送成本
 	 */
 	@ApiModelProperty(value = "配送成本")
-	private String distributionCost;
+	@ExcelProperty("配送成本")
+	private Double distributionCost;
 	/**
 	 * 撕标签成本
 	 */
 	@ApiModelProperty(value = "撕标签成本")
-	private String inventoryDistributionCost;
+	@ExcelProperty("撕标签成本")
+	private Double inventoryDistributionCost;
 	/**
 	 * 上楼费成本
 	 */
 	@ApiModelProperty(value = "上楼费成本")
-	private String stairCarryingFee;
+	@ExcelProperty("上楼费成本")
+	private Double stairCarryingFee;
 	/**
 	 * 分货费成本
 	 */
 	@ApiModelProperty(value = "分货费成本")
-	private String goodsAllocationCost;
+	@ExcelProperty("分货费成本")
+	private Double goodsAllocationCost;
 	/**
 	 * 平移费成本
 	 */
 	@ApiModelProperty(value = "平移费成本")
-	private String repositioningCost;
+	@ExcelProperty("平移费成本")
+	private Double repositioningCost;
 	/**
 	 * 装卸费成本
 	 */
 	@ApiModelProperty(value = "装卸费成本")
-	private String handlingCost;
+	@ExcelProperty("装卸费成本")
+	private Double handlingCost;
 	/**
 	 * 公里数成本
 	 */
 	@ApiModelProperty(value = "公里数成本")
-	private String mileageCost;
+	@ExcelProperty("公里数成本")
+	private Double mileageCost;
 	/**
 	 * 补贴公里数成本
 	 */
 	@ApiModelProperty(value = "补贴公里数成本")
-	private String subsidizedKilometerCost;
+	@ExcelProperty("补贴公里数成本")
+	private Double subsidizedKilometerCost;
 	/**
 	 * 超区公里数成本
 	 */
 	@ApiModelProperty(value = "超区公里数成本")
-	private String excessZoneMileageCost;
+	@ExcelProperty("超区公里数成本")
+	private Double excessZoneMileageCost;
 	/**
 	 * 点位补贴费成本
 	 */
 	@ApiModelProperty(value = "点位补贴费成本")
-	private String locationSubsidyCost;
+	@ExcelProperty("点位补贴费成本")
+	private Double locationSubsidyCost;
 	/**
 	 * 保底费成本
 	 */
 	@ApiModelProperty(value = "保底费成本")
-	private String minimumGuaranteeCost;
+	@ExcelProperty("保底费成本")
+	private Double minimumGuaranteeCost;
 	/**
 	 * 油费成本
 	 */
 	@ApiModelProperty(value = "油费成本")
-	private String fuelCost;
+	@ExcelProperty("油费成本")
+	private Double fuelCost;
 	/**
 	 * 其他成本
 	 */
 	@ApiModelProperty(value = "其他成本")
-	private String otherCosts;
+	@ExcelProperty("其他成本")
+	private Double otherCosts;
+	/**
+	 * 异动金额
+	 */
+	@ApiModelProperty(value = "异动金额")
+	@ExcelProperty("异动金额")
+	private Double changeAmount;
 	/**
 	 * 配送公里数
 	 */
 	@ApiModelProperty(value = "配送公里数")
-	private String deliveryKilometers;
+	@ExcelProperty("配送公里数")
+	private Double deliveryKilometers;
 	/**
 	 * 发货人
 	 */
 	@ApiModelProperty(value = "发货人")
+	@ExcelProperty("发货人")
 	private String shipper;
 	/**
 	 * 发货人手机
 	 */
 	@ApiModelProperty(value = "发货人手机")
+	@ExcelProperty("发货人手机")
 	private String shippingPhone;
 	/**
 	 * 发货地址
 	 */
 	@ApiModelProperty(value = "发货地址")
+	@ExcelProperty("发货地址")
 	private String shippingAddress;
 	/**
 	 * 到站
 	 */
 	@ApiModelProperty(value = "到站")
+	@ExcelProperty("到站")
 	private String arrivalStation;
 	/**
 	 * 发站仓
 	 */
 	@ApiModelProperty(value = "发站仓")
+	@ExcelProperty("发站仓")
 	private String departureWarehouse;
 	/**
 	 * 收货人
 	 */
 	@ApiModelProperty(value = "收货人")
+	@ExcelProperty("收货人")
 	private String consignee;
 	/**
 	 * 收货人手机号
 	 */
 	@ApiModelProperty(value = "收货人手机号")
+	@ExcelProperty("收货人手机号")
 	private String consigneePhone;
 	/**
 	 * 收货地址
 	 */
 	@ApiModelProperty(value = "收货地址")
+	@ExcelProperty("收货地址")
 	private String consigneeAddress;
 	/**
 	 * 客户车次
 	 */
 	@ApiModelProperty(value = "客户车次")
+	@ExcelProperty("客户车次")
 	private String customerTrip;
 
 }

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

@@ -0,0 +1,65 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.statistics.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+import java.util.Date;
+
+/**
+ * 配送成本-车辆成本结算表-异动明细 实体类
+ *
+ * @author zqb
+ * @since 2024-07-29
+ */
+@Data
+@TableName("logpm_expense_dispatch_train_detail_change")
+@ApiModel(value = "ExpenseDispatchTrainDetailChange对象", description = "配送成本-车辆成本结算表-异动明细")
+@EqualsAndHashCode(callSuper = true)
+public class ExpenseDispatchTrainDetailChangeEntity extends TenantEntity {
+	/**
+	 * 异动金额
+	 */
+	@ApiModelProperty(value = "异动金额")
+	private Double changeAmount;
+	/**
+	 * 异动备注
+	 */
+	@ApiModelProperty(value = "异动备注")
+	private String changeNote;
+	/**
+	 * 异动时间
+	 */
+	@ApiModelProperty(value = "异动时间")
+	private Date changeTime;
+	/**
+	 * 异动操作人
+	 */
+	@ApiModelProperty(value = "异动操作人")
+	private String changeOperator;
+	/**
+	 * 结算表id
+	 */
+	@ApiModelProperty(value = "结算表id")
+	private String detailId;
+
+}

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

@@ -16,6 +16,8 @@
  */
 package com.logpm.statistics.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import io.swagger.annotations.ApiModel;
@@ -23,176 +25,277 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
 
+import java.util.Date;
+
 /**
- * 配送成本-车次成本明细表 实体类
+ * 配送成本-车辆成本结算表 实体类
  *
  * @author zqb
  * @since 2024-07-29
  */
 @Data
 @TableName("logpm_expense_dispatch_train_detail")
-@ApiModel(value = "ExpenseDispatchTrainDetail对象", description = "配送成本-车次成本明细表")
+@ApiModel(value = "ExpenseDispatchTrainDetail对象", description = "配送成本-车辆成本结算表")
 @EqualsAndHashCode(callSuper = true)
 public class ExpenseDispatchTrainDetailEntity extends TenantEntity {
+
+	/**
+	 * 配送车辆
+	 */
+	@ApiModelProperty(value = "配送车辆")
+	@ExcelProperty("配送车辆")
+	private String deliveryVehicle;
+	/**
+	 * 配送车型
+	 */
+	@ApiModelProperty(value = "配送车型")
+	@ExcelProperty("配送车型")
+	private String distributionModel;
 	/**
 	 * 车次号
 	 */
 	@ApiModelProperty(value = "车次号")
+	@ExcelProperty("车次号")
 	private String trainNumber;
+	/**
+	 * 结算状态
+	 */
+	@ApiModelProperty(value = "结算状态")
+	@ExcelProperty("结算状态 ")
+	private String settlementStatus;
 	/**
 	 * 配送日期
 	 */
 	@ApiModelProperty(value = "配送日期")
+	@ExcelProperty("车次号")
 	private String deliveryDate;
 	/**
 	 * 目的仓
 	 */
 	@ApiModelProperty(value = "目的仓")
+	@ExcelProperty("目的仓")
 	private String destinationWarehouse;
+	/**
+	 * 配送类型
+	 */
+	@ApiModelProperty(value = "配送类型")
+	@ExcelProperty("配送类型")
+	private String distributionType;
 	/**
 	 * 客户名称
 	 */
 	@ApiModelProperty(value = "客户名称")
+	@ExcelIgnore
 	private String customerName;
 	/**
 	 * 订单自编号
 	 */
 	@ApiModelProperty(value = "订单自编号")
+	@ExcelIgnore
 	private String orderCode;
-	/**
-	 * 配送类型
-	 */
-	@ApiModelProperty(value = "配送类型")
-	private String distributionType;
-	/**
-	 * 配送车辆
-	 */
-	@ApiModelProperty(value = "配送车辆")
-	private String deliveryVehicle;
-	/**
-	 * 配送车型
-	 */
-	@ApiModelProperty(value = "配送车型")
-	private String distributionModel;
 	/**
 	 * 承运方名称
 	 */
 	@ApiModelProperty(value = "承运方名称")
+	@ExcelProperty("承运方名称")
 	private String carrierName;
 	/**
 	 * 承运方类型
 	 */
 	@ApiModelProperty(value = "承运方类型")
+	@ExcelIgnore
 	private String carrierType;
 	/**
 	 * 配送司机
 	 */
 	@ApiModelProperty(value = "配送司机")
+	@ExcelProperty("配送司机")
 	private String deliveryDriver;
 	/**
 	 * 计划总件数
 	 */
 	@ApiModelProperty(value = "计划总件数")
-	private String plannedTotalQuantity;
+	@ExcelProperty("计划总件数")
+	private Integer plannedTotalQuantity;
 	/**
 	 * 订单总数
 	 */
 	@ApiModelProperty(value = "订单总数")
-	private String totalOrderQuantity;
+	@ExcelProperty("订单总数")
+	private Integer totalOrderQuantity;
 	/**
 	 * 库存品件数
 	 */
 	@ApiModelProperty(value = "库存品件数")
-	private String inventoryItemCount;
+	@ExcelProperty("库存品件数")
+	private Integer inventoryItemCount;
 	/**
 	 * 装车总件数
 	 */
 	@ApiModelProperty(value = "装车总件数")
-	private String totalLoadedPieces;
+	@ExcelProperty("装车总件数")
+	private Integer totalLoadedPieces;
 	/**
 	 * 签收总件数
 	 */
 	@ApiModelProperty(value = "签收总件数")
-	private String totalReceiptCost;
+	@ExcelProperty("签收总件数")
+	private Integer totalReceiptCost;
 	/**
 	 * 配送总成本
 	 */
 	@ApiModelProperty(value = "配送总成本")
-	private String totalDistributionCost;
+	@ExcelProperty("配送总成本")
+	private Double totalDistributionCost;
 	/**
 	 * 配送成本
 	 */
 	@ApiModelProperty(value = "配送成本")
-	private String distributionCost;
+	@ExcelProperty("配送成本")
+	private Double distributionCost;
 	/**
 	 * 整车成本
 	 */
 	@ApiModelProperty(value = "整车成本")
-	private String wholeVehicleCost;
+	@ExcelProperty("整车成本")
+	private Double wholeVehicleCost;
 	/**
 	 * 库存品配送成本
 	 */
 	@ApiModelProperty(value = "库存品配送成本")
-	private String inventoryDistributionCost;
+	@ExcelProperty("库存品配送成本")
+	private Double inventoryDistributionCost;
 	/**
 	 * 撕标签成本
 	 */
 	@ApiModelProperty(value = "撕标签成本")
-	private String tagRemovalCost;
+	@ExcelIgnore
+	private Double tagRemovalCost;
 	/**
 	 * 上楼费成本
 	 */
 	@ApiModelProperty(value = "上楼费成本")
-	private String stairCarryingFee;
+	@ExcelProperty("上楼费成本")
+	private Double stairCarryingFee;
 	/**
 	 * 分货费成本
 	 */
 	@ApiModelProperty(value = "分货费成本")
-	private String goodsAllocationCost;
+	@ExcelProperty("分货费成本")
+	private Double goodsAllocationCost;
 	/**
 	 * 平移费成本
 	 */
 	@ApiModelProperty(value = "平移费成本")
-	private String repositioningCost;
+	@ExcelProperty("平移费成本")
+	private Double repositioningCost;
 	/**
 	 * 装卸费成本
 	 */
 	@ApiModelProperty(value = "装卸费成本")
-	private String handlingCost;
+	@ExcelProperty("装卸费成本")
+	private Double handlingCost;
 	/**
 	 * 公里数成本
 	 */
 	@ApiModelProperty(value = "公里数成本")
-	private String mileageCost;
+	@ExcelProperty("公里数成本")
+	private Double mileageCost;
 	/**
 	 * 补贴公里数成本
 	 */
 	@ApiModelProperty(value = "补贴公里数成本")
-	private String subsidizedKilometerCost;
+	@ExcelProperty("补贴公里数成本")
+	private Double subsidizedKilometerCost;
 	/**
 	 * 超区公里数成本
 	 */
 	@ApiModelProperty(value = "超区公里数成本")
-	private String excessZoneMileageCost;
+	@ExcelProperty("超区公里数成本")
+	private Double excessZoneMileageCost;
 	/**
 	 * 点位补贴费成本
 	 */
 	@ApiModelProperty(value = "点位补贴费成本")
-	private String locationSubsidyCost;
+	@ExcelProperty("点位补贴费成本")
+	private Double locationSubsidyCost;
 	/**
 	 * 保底费成本
 	 */
 	@ApiModelProperty(value = "保底费成本")
-	private String minimumGuaranteeCost;
+	@ExcelProperty("保底费成本")
+	private Double minimumGuaranteeCost;
 	/**
 	 * 油费成本
 	 */
 	@ApiModelProperty(value = "油费成本")
-	private String fuelCost;
+	@ExcelProperty("油费成本")
+	private Double fuelCost;
 	/**
 	 * 其他成本
 	 */
 	@ApiModelProperty(value = "其他成本")
-	private String otherCosts;
+	@ExcelProperty("其他成本")
+	private Double otherCosts;
+	/**
+	 * 异动金额
+	 */
+	@ApiModelProperty(value = "异动金额")
+	@ExcelProperty("异动金额")
+	private Double changeAmount;
+	/**
+	 * 异动时间
+	 */
+	@ApiModelProperty(value = "异动时间")
+	@ExcelProperty("异动时间")
+	private Date changeTime;
+	/**
+	 * 异动操作人
+	 */
+	@ApiModelProperty(value = "异动操作人")
+	@ExcelProperty("异动操作人")
+	private String changeOperator;
+	/**
+	 * 结算金额
+	 */
+	@ApiModelProperty(value = "结算金额")
+	@ExcelProperty("结算金额")
+	private Double settlementAmount;
+	/**
+	 * 结算时间-年
+	 */
+	@ApiModelProperty(value = "结算时间-年")
+	@ExcelIgnore
+	private Integer settlementYear;
+	/**
+	 * 结算时间-月
+	 */
+	@ApiModelProperty(value = "结算时间-月")
+	@ExcelIgnore
+	private Integer settlementMonth;
+	/**
+	 * 结算时间-日
+	 */
+	@ApiModelProperty(value = "结算时间-日")
+	@ExcelIgnore
+	private Integer settlementDay;
+	/**
+	 * 结算时间
+	 */
+	@ApiModelProperty(value = "结算时间")
+	@ExcelProperty("结算时间")
+	private Date settlementTime;
+	/**
+	 * 结算备注
+	 */
+	@ApiModelProperty(value = "结算备注")
+	@ExcelProperty("结算备注")
+	private String settlementNote;
+	/**
+	 * 结算人
+	 */
+	@ApiModelProperty(value = "结算人")
+	@ExcelProperty("结算人")
+	private String settlementUser;
 
 }

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

@@ -16,6 +16,8 @@
  */
 package com.logpm.statistics.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import io.swagger.annotations.ApiModel;
@@ -38,116 +40,154 @@ public class ExpenseDispatchWarehouseMonthEntity extends TenantEntity {
 	 * 目的仓
 	 */
 	@ApiModelProperty(value = "目的仓")
+	@ExcelProperty("目的仓")
 	private String destinationWarehouse;
+
 	/**
 	 * 成本结算时间
 	 */
-	@ApiModelProperty(value = "成本结算时间")
-	private String costSettlementTime;
+	@ApiModelProperty(value = "成本结算时间-年")
+	@ExcelIgnore
+	private Integer settlementYear;
+
 	/**
-	 * 车次总数
+	 * 成本结算时间
 	 */
-	@ApiModelProperty(value = "车次总数")
-	private String totalTrainService;
+	@ApiModelProperty(value = "成本结算时间-月")
+	@ExcelIgnore
+	private Integer settlementMonth;
 	/**
-	 * 配送计划总数
+	 * 成本结算时间
 	 */
-	@ApiModelProperty(value = "配送计划总数")
-	private String distributionPlanQuantity;
+	@ApiModelProperty(value = "成本结算时间")
+	@ExcelProperty("成本结算时间")
+	private String settlementTime;
 	/**
-	 * 订单总数
+	 * 车辆车次总数
 	 */
-	@ApiModelProperty(value = "订单总数")
-	private String totalOrderQuantity;
+	@ApiModelProperty(value = "车辆车次总数")
+	@ExcelProperty("车辆车次总数")
+	private Integer totalTrainService;
 	/**
 	 * 计划总件数
 	 */
 	@ApiModelProperty(value = "计划总件数")
-	private String plannedTotalQuantity;
+	@ExcelProperty("计划总件数")
+	private Integer plannedTotalQuantity;
 	/**
 	 * 库存品件数
 	 */
 	@ApiModelProperty(value = "库存品件数")
-	private String inventoryItemCount;
+	@ExcelProperty("库存品件数")
+	private Integer inventoryItemCount;
 	/**
 	 * 装车总件数
 	 */
 	@ApiModelProperty(value = "装车总件数")
-	private String totalLoadedPieces;
+	@ExcelProperty("装车总件数")
+	private Integer totalLoadedPieces;
 	/**
 	 * 签收总件数
 	 */
 	@ApiModelProperty(value = "签收总件数")
-	private String totalReceiptCost;
+	@ExcelProperty("签收总件数")
+	private Integer totalReceiptCost;
 	/**
 	 * 配送总成本
 	 */
 	@ApiModelProperty(value = "配送总成本")
-	private String totalDistributionCost;
+	@ExcelProperty("配送总成本")
+	private Double totalDistributionCost;
 	/**
 	 * 配送成本
 	 */
 	@ApiModelProperty(value = "配送成本")
-	private String distributionCost;
+	@ExcelProperty("配送成本")
+	private Double distributionCost;
 	/**
 	 * 库存品配送成本
 	 */
 	@ApiModelProperty(value = "库存品配送成本")
-	private String inventoryDistributionCost;
+	@ExcelProperty("库存品配送成本")
+	private Double inventoryDistributionCost;
 	/**
 	 * 上楼费成本
 	 */
 	@ApiModelProperty(value = "上楼费成本")
-	private String stairCarryingFee;
+	@ExcelProperty("上楼费成本")
+	private Double stairCarryingFee;
 	/**
 	 * 分货费成本
 	 */
 	@ApiModelProperty(value = "分货费成本")
-	private String goodsAllocationCost;
+	@ExcelProperty("分货费成本")
+	private Double goodsAllocationCost;
 	/**
 	 * 平移费成本
 	 */
 	@ApiModelProperty(value = "平移费成本")
-	private String repositioningCost;
+	@ExcelProperty("平移费成本")
+	private Double repositioningCost;
 	/**
 	 * 装卸费成本
 	 */
 	@ApiModelProperty(value = "装卸费成本")
-	private String handlingCost;
+	@ExcelProperty("装卸费成本")
+	private Double handlingCost;
 	/**
 	 * 公里数成本
 	 */
 	@ApiModelProperty(value = "公里数成本")
-	private String mileageCost;
+	@ExcelProperty("公里数成本")
+	private Double mileageCost;
 	/**
 	 * 补贴公里数成本
 	 */
 	@ApiModelProperty(value = "补贴公里数成本")
-	private String subsidizedKilometerCost;
+	@ExcelProperty("补贴公里数成本")
+	private Double subsidizedKilometerCost;
 	/**
 	 * 超区公里数成本
 	 */
 	@ApiModelProperty(value = "超区公里数成本")
-	private String excessZoneMileageCost;
+	@ExcelProperty("超区公里数成本")
+	private Double excessZoneMileageCost;
 	/**
 	 * 点位补贴费成本
 	 */
 	@ApiModelProperty(value = "点位补贴费成本")
-	private String locationSubsidyCost;
+	@ExcelProperty("点位补贴费成本")
+	private Double locationSubsidyCost;
 	/**
 	 * 保底费成本
 	 */
 	@ApiModelProperty(value = "保底费成本")
-	private String minimumGuaranteeCost;
+	@ExcelProperty("保底费成本")
+	private Double minimumGuaranteeCost;
 	/**
 	 * 油费成本
 	 */
 	@ApiModelProperty(value = "油费成本")
-	private String fuelCost;
+	@ExcelProperty("油费成本")
+	private Double fuelCost;
 	/**
 	 * 其他成本
 	 */
 	@ApiModelProperty(value = "其他成本")
-	private String otherCosts;
+	@ExcelProperty("其他成本")
+	private Double otherCosts;
+
+	/**
+	 * 异动金额
+	 */
+	@ApiModelProperty(value = "异动金额")
+	@ExcelProperty("异动金额")
+	private Double changeAmount;
+	/**
+	 * 结算金额
+	 */
+	@ApiModelProperty(value = "结算金额")
+	@ExcelProperty("结算金额")
+	private Double settlementAmount;
 
 }

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

@@ -0,0 +1,56 @@
+package com.logpm.statistics.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 仓储成本-中转仓作业成本-操作记录
+ *
+ * @author zqb
+ * @create 2024-12-09
+ */
+@Data
+@TableName("logpm_expense_warehouse_transit_change")
+@ApiModel(value = "ExpenseWarehouseTransitChange对象", description = "仓储成本-中转仓作业成本-操作记录")
+@EqualsAndHashCode(callSuper = true)
+public class ExpenseWarehouseTransitChangeEntity extends TenantEntity {
+	private static final long serialVersionUID = 1L;
+	/**
+	 * 类型（异动/结算）
+	 */
+	@ApiModelProperty(value = "类型（异动/结算）")
+	private String type;
+	/**
+	 * 金额
+	 */
+	@ApiModelProperty(value = "金额")
+	private BigDecimal changeAmount;
+	/**
+	 * 时间
+	 */
+	@ApiModelProperty(value = "时间")
+	private Date changeTime;
+	/**
+	 * 备注
+	 */
+	@ApiModelProperty(value = "备注")
+	private String changeNote;
+	/**
+	 * 操作人
+	 */
+	@ApiModelProperty(value = "操作人")
+	private String changeOperator;
+	/**
+	 * 结算表id
+	 */
+	@ApiModelProperty(value = "结算表id")
+	private Long detailId;
+
+}

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

@@ -0,0 +1,33 @@
+package com.logpm.statistics.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+/**
+ * 仓储成本-中转仓作业成本-操作-图片
+ *
+ * @author zqb
+ * @create 2024-12-09
+ */
+@Data
+@TableName("logpm_expense_warehouse_transit_change_image")
+@ApiModel(value = "ExpenseWarehouseTransitChangeImage对象", description = "仓储成本-中转仓作业成本-操作-图片")
+@EqualsAndHashCode(callSuper = true)
+public class ExpenseWarehouseTransitChangeImageEntity extends TenantEntity {
+	private static final long serialVersionUID = 1L;
+	/**
+	 * 操作id
+	 */
+	@ApiModelProperty(value = "操作id")
+	private Long changeId;
+	/**
+	 * 图片url
+	 */
+	@ApiModelProperty(value = "图片url")
+	private String imageUrl;
+
+}

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

@@ -0,0 +1,95 @@
+package com.logpm.statistics.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+import java.util.Date;
+
+/**
+ * 中转仓仓储作业明细
+ *
+ * @author zqb
+ * @create 2024-12-09
+ */
+@Data
+@TableName("logpm_expense_warehouse_transit")
+@ApiModel(value = "ExpenseWarehouseTransit对象", description = "中转仓仓储作业明细")
+@EqualsAndHashCode(callSuper = true)
+public class ExpenseWarehouseTransitEntity extends TenantEntity {
+	private static final long serialVersionUID = 1L;
+	/**
+	 * 操作时间
+	 */
+	@ApiModelProperty(value = "操作时间")
+	private Date taskTime;
+	/**
+	 * 确认分摊时间-年
+	 */
+	@ApiModelProperty(value = "确认分摊时间-年")
+	private Integer confirmAllocationYear;
+	/**
+	 * 确认分摊时间-月
+	 */
+	@ApiModelProperty(value = "确认分摊时间-月")
+	private Integer confirmAllocationMonth;
+	/**
+	 * 确认分摊时间-日
+	 */
+	@ApiModelProperty(value = "确认分摊时间-日")
+	private Integer confirmAllocationDay;
+	/**
+	 * 确认分摊时间
+	 */
+	@ApiModelProperty(value = "确认分摊时间")
+	private Date confirmAllocationTime;
+	/**
+	 * 中转仓
+	 */
+	@ApiModelProperty(value = "中转仓")
+	private String transitWarehouseName;
+	/**
+	 * 目的仓
+	 */
+	@ApiModelProperty(value = "目的仓")
+	private String destinationWarehouseName;
+	/**
+	 * 作业类型
+	 */
+	@ApiModelProperty(value = "作业类型")
+	private String workType;
+	/**
+	 * 包件类型
+	 */
+	@ApiModelProperty(value = "包件类型")
+	private String packageType;
+	/**
+	 * 包条码
+	 */
+	@ApiModelProperty(value = "包条码")
+	private String packageCode;
+	/**
+	 * 订单
+	 */
+	@ApiModelProperty(value = "订单")
+	private String orderCode;
+	/**
+	 * 运单编号
+	 */
+	@ApiModelProperty(value = "运单编号")
+	private String waybillNumber;
+	/**
+	 * 车次号
+	 */
+	@ApiModelProperty(value = "车次号")
+	private String trainNumber;
+	/**
+	 * 件数
+	 */
+	@ApiModelProperty(value = "件数")
+	private Integer num;
+
+}

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

@@ -8,49 +8,50 @@ import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
- * 中转仓月度成本报表
+ * 中转仓月度仓储作业账单
  *
  * @author zqb
- * @create 2024-07-17 11:32:30
+ * @create 2024-12-09
  */
 @Data
 @TableName("logpm_expense_warehouse_transit_month")
-@ApiModel(value = "ExpenseWarehouseTransitMonthEntity对象", description = "中转仓月度成本报表")
+@ApiModel(value = "ExpenseWarehouseTransitMonth对象", description = "中转仓月度仓储作业账单")
 @EqualsAndHashCode(callSuper = true)
 public class ExpenseWarehouseTransitMonthEntity extends TenantEntity {
 	private static final long serialVersionUID = 1L;
 	/**
-	 * 统计年
+	 * 统计时间-年
 	 */
-	@ApiModelProperty(value = "统计年")
+	@ApiModelProperty(value = "统计时间-年")
 	private Integer statisticalYear;
 	/**
-	 * 统计月
+	 * 统计时间-月
 	 */
-	@ApiModelProperty(value = "统计月")
+	@ApiModelProperty(value = "统计时间-月")
 	private Integer statisticalMonth;
 	/**
-	 * 日期
+	 * 统计时间
 	 */
-	@ApiModelProperty(value = "日期")
+	@ApiModelProperty(value = "统计时间")
 	private String statisticalTime;
-	/**
-	 * 事业线
-	 */
-	@ApiModelProperty(value = "事业线")
-	private String businessUnit;
 	/**
 	 * 中转仓
 	 */
 	@ApiModelProperty(value = "中转仓")
 	private String transitWarehouseName;
+	/**
+	 * 结算单号
+	 */
+	@ApiModelProperty(value = "结算单号")
+	private String settlementCode;
 	/**
 	 * 目的仓
 	 */
 	@ApiModelProperty(value = "目的仓")
-	private String warehouseName;
+	private String destinationWarehouseName;
 	/**
 	 * 中转入库件数
 	 */
@@ -76,5 +77,35 @@ public class ExpenseWarehouseTransitMonthEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "中转总收入")
 	private BigDecimal totalCost;
+	/**
+	 * 结算状态
+	 */
+	@ApiModelProperty(value = "结算状态")
+	private String settlementStatus;
+	/**
+	 * 已结算金额
+	 */
+	@ApiModelProperty(value = "已结算金额")
+	private BigDecimal settledAmount;
+	/**
+	 * 待结算金额
+	 */
+	@ApiModelProperty(value = "待结算金额")
+	private BigDecimal pendingSettlementAmount;
+	/**
+	 * 结算人
+	 */
+	@ApiModelProperty(value = "结算人")
+	private String settlementUser;
+	/**
+	 * 结算时间
+	 */
+	@ApiModelProperty(value = "结算时间")
+	private Date settlementTime;
+	/**
+	 * 异常金额
+	 */
+	@ApiModelProperty(value = "异常金额")
+	private BigDecimal changeAmount;
 
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/job/ExpenseJob.java

@@ -21,21 +21,6 @@ public class ExpenseJob {
 	@Resource
 	private IQualityDeliverService qualityDeliverService;
 
-
-	/**
-	 * 配送财务审单
-	 * 每个月1号早上4点执行
-	 *
-	 * @param param
-	 * @return
-	 * @throws Exception
-	 */
-	@XxlJob("expenseDispatchFinancialReviewJob")
-	public ReturnT<String> expenseDispatchFinancialReviewJob(String param) throws Exception {
-
-		return ReturnT.SUCCESS;
-	}
-
 	/**
 	 * 车辆成本明细表 job
 	 * 每天晚上凌晨0点执行
@@ -57,7 +42,7 @@ public class ExpenseJob {
 	 */
 	@XxlJob("calculateStorageCost")
 	public ReturnT<String> calculateStorageCost(String param) throws Exception {
-		qualityDeliverService.calculateStorageCost(param);
+		// qualityDeliverService.calculateStorageCost(param);
 		return ReturnT.SUCCESS;
 	}
 
@@ -69,7 +54,7 @@ public class ExpenseJob {
 	 */
 	@XxlJob("calculateTransshipmentCost")
 	public ReturnT<String> calculateTransshipmentCost(String param) throws Exception {
-		qualityDeliverService.calculateTransshipmentCost(param);
+		// qualityDeliverService.calculateTransshipmentCost(param);
 		return ReturnT.SUCCESS;
 	}
 

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/ExpenseDispatchOrderDetailController.java

@@ -16,39 +16,21 @@
  */
 package com.logpm.statistics.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.logpm.statistics.entity.ExpenseDispatchOrderDetailEntity;
-import com.logpm.statistics.excel.ExpenseDispatchOrderDetailExcel;
+import com.logpm.statistics.query.ExpenseDispatchOrderDetailQuery;
 import com.logpm.statistics.service.IExpenseDispatchOrderDetailService;
 import com.logpm.statistics.vo.ExpenseDispatchOrderDetailVO;
-import com.logpm.statistics.wrapper.ExpenseDispatchOrderDetailWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.excel.util.ExcelUtil;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
-import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.constant.BladeConstant;
-import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 配送成本-订单总成本明细 控制器
@@ -64,93 +46,20 @@ public class ExpenseDispatchOrderDetailController extends BladeController {
 
 	private final IExpenseDispatchOrderDetailService expenseDispatchOrderDetailService;
 
-	/**
-	 * 配送成本-订单总成本明细 详情
-	 */
-	@GetMapping("/detail")
-	@ApiOperationSupport(order = 1)
-	@ApiOperation(value = "详情", notes = "传入expenseDispatchOrderDetail")
-	public R<ExpenseDispatchOrderDetailVO> detail(ExpenseDispatchOrderDetailEntity expenseDispatchOrderDetail) {
-		ExpenseDispatchOrderDetailEntity detail = expenseDispatchOrderDetailService.getOne(Condition.getQueryWrapper(expenseDispatchOrderDetail));
-		return R.data(ExpenseDispatchOrderDetailWrapper.build().entityVO(detail));
-	}
-	/**
-	 * 配送成本-订单总成本明细 分页
-	 */
-	@GetMapping("/list")
-	@ApiOperationSupport(order = 2)
-	@ApiOperation(value = "分页", notes = "传入expenseDispatchOrderDetail")
-	public R<IPage<ExpenseDispatchOrderDetailVO>> list(@ApiIgnore @RequestParam Map<String, Object> expenseDispatchOrderDetail, Query query) {
-		IPage<ExpenseDispatchOrderDetailEntity> pages = expenseDispatchOrderDetailService.page(Condition.getPage(query), Condition.getQueryWrapper(expenseDispatchOrderDetail, ExpenseDispatchOrderDetailEntity.class));
-		return R.data(ExpenseDispatchOrderDetailWrapper.build().pageVO(pages));
-	}
-
 	/**
 	 * 配送成本-订单总成本明细 自定义分页
 	 */
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "分页", notes = "传入expenseDispatchOrderDetail")
-	public R<IPage<ExpenseDispatchOrderDetailVO>> page(ExpenseDispatchOrderDetailVO expenseDispatchOrderDetail, Query query) {
-		IPage<ExpenseDispatchOrderDetailVO> pages = expenseDispatchOrderDetailService.selectExpenseDispatchOrderDetailPage(Condition.getPage(query), expenseDispatchOrderDetail);
+	public R<IPage<ExpenseDispatchOrderDetailVO>> page(ExpenseDispatchOrderDetailQuery query) {
+		IPage<ExpenseDispatchOrderDetailVO> pages = expenseDispatchOrderDetailService.selectExpenseDispatchOrderDetailPage(query);
 		return R.data(pages);
 	}
-
-	/**
-	 * 配送成本-订单总成本明细 新增
-	 */
-	@PostMapping("/save")
-	@ApiOperationSupport(order = 4)
-	@ApiOperation(value = "新增", notes = "传入expenseDispatchOrderDetail")
-	public R save(@Valid @RequestBody ExpenseDispatchOrderDetailEntity expenseDispatchOrderDetail) {
-		return R.status(expenseDispatchOrderDetailService.save(expenseDispatchOrderDetail));
-	}
-
-	/**
-	 * 配送成本-订单总成本明细 修改
-	 */
-	@PostMapping("/update")
-	@ApiOperationSupport(order = 5)
-	@ApiOperation(value = "修改", notes = "传入expenseDispatchOrderDetail")
-	public R update(@Valid @RequestBody ExpenseDispatchOrderDetailEntity expenseDispatchOrderDetail) {
-		return R.status(expenseDispatchOrderDetailService.updateById(expenseDispatchOrderDetail));
-	}
-
-	/**
-	 * 配送成本-订单总成本明细 新增或修改
-	 */
-	@PostMapping("/submit")
-	@ApiOperationSupport(order = 6)
-	@ApiOperation(value = "新增或修改", notes = "传入expenseDispatchOrderDetail")
-	public R submit(@Valid @RequestBody ExpenseDispatchOrderDetailEntity expenseDispatchOrderDetail) {
-		return R.status(expenseDispatchOrderDetailService.saveOrUpdate(expenseDispatchOrderDetail));
-	}
-
-	/**
-	 * 配送成本-订单总成本明细 删除
-	 */
-	@PostMapping("/remove")
-	@ApiOperationSupport(order = 7)
-	@ApiOperation(value = "逻辑删除", notes = "传入ids")
-	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(expenseDispatchOrderDetailService.deleteLogic(Func.toLongList(ids)));
-	}
-
-
-	/**
-	 * 导出数据
-	 */
-	@GetMapping("/export-expenseDispatchOrderDetail")
-	@ApiOperationSupport(order = 9)
-	@ApiOperation(value = "导出数据", notes = "传入expenseDispatchOrderDetail")
-	public void exportExpenseDispatchOrderDetail(@ApiIgnore @RequestParam Map<String, Object> expenseDispatchOrderDetail, BladeUser bladeUser, HttpServletResponse response) {
-		QueryWrapper<ExpenseDispatchOrderDetailEntity> queryWrapper = Condition.getQueryWrapper(expenseDispatchOrderDetail, ExpenseDispatchOrderDetailEntity.class);
-		//if (!AuthUtil.isAdministrator()) {
-		//	queryWrapper.lambda().eq(ExpenseDispatchOrderDetail::getTenantId, bladeUser.getTenantId());
-		//}
-		queryWrapper.lambda().eq(ExpenseDispatchOrderDetailEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
-		List<ExpenseDispatchOrderDetailExcel> list = expenseDispatchOrderDetailService.exportExpenseDispatchOrderDetail(queryWrapper);
-		ExcelUtil.export(response, "配送成本-订单总成本明细数据" + DateUtil.time(), "配送成本-订单总成本明细数据表", list, ExpenseDispatchOrderDetailExcel.class);
+	@GetMapping("/export")
+	@ApiOperation(value = "导出订单总成本明细", notes = "导出订单总成本明细")
+	public void export(HttpServletResponse response, ExpenseDispatchOrderDetailQuery query) {
+		expenseDispatchOrderDetailService.export(response, query);
 	}
 
 }

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/ExpenseDispatchTrainDetailChangeController.java

@@ -0,0 +1,68 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.statistics.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.logpm.statistics.entity.ExpenseDispatchTrainDetailChangeEntity;
+import com.logpm.statistics.service.IExpenseDispatchTrainDetailChangeService;
+import com.logpm.statistics.vo.ExpenseDispatchTrainDetailChangeVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.R;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.Date;
+
+/**
+ * 配送成本-车辆成本结算表-异动记录 控制器
+ *
+ * @author zqb
+ * @since 2024-12-03
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/expenseDispatchTrainDetailChange")
+@Api(value = "配送成本-车辆成本结算表-异动记录", tags = "配送成本-车辆成本结算表-异动记录接口")
+public class ExpenseDispatchTrainDetailChangeController extends BladeController {
+
+	private final IExpenseDispatchTrainDetailChangeService expenseDispatchTrainDetailChangeService;
+
+	/**
+	 * 配送成本-车辆成本结算表-异动记录 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "异动记录", notes = "异动记录")
+	public R<IPage<ExpenseDispatchTrainDetailChangeVO>> page(ExpenseDispatchTrainDetailChangeVO expenseDispatchTrainDetailChange, Query query) {
+		IPage<ExpenseDispatchTrainDetailChangeVO> pages = expenseDispatchTrainDetailChangeService.selectExpenseDispatchTrainDetailChangePage(Condition.getPage(query), expenseDispatchTrainDetailChange);
+		return R.data(pages);
+	}
+
+
+
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/ExpenseDispatchTrainDetailController.java

@@ -16,39 +16,33 @@
  */
 package com.logpm.statistics.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.logpm.statistics.entity.ExpenseDispatchTrainDetailEntity;
-import com.logpm.statistics.excel.ExpenseDispatchTrainDetailExcel;
+import com.logpm.statistics.query.ExpenseDispatchTrainDetailQuery;
 import com.logpm.statistics.service.IExpenseDispatchTrainDetailService;
+import com.logpm.statistics.vo.ExpenseDispatchTrainDetailChangeSaveVO;
 import com.logpm.statistics.vo.ExpenseDispatchTrainDetailVO;
 import com.logpm.statistics.wrapper.ExpenseDispatchTrainDetailWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
-import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.constant.BladeConstant;
-import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.core.tool.utils.Func;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.util.List;
-import java.util.Map;
+import java.util.Date;
 
 /**
  * 配送成本-车次成本明细表 控制器
@@ -59,7 +53,7 @@ import java.util.Map;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/expenseDispatchTrainDetail")
-@Api(value = "配送成本-车次成本明细表", tags = "配送成本-车次成本明细表接口")
+@Api(value = "配送成本-车辆成本结算表", tags = "配送成本-车辆成本结算表")
 public class ExpenseDispatchTrainDetailController extends BladeController {
 
 	private final IExpenseDispatchTrainDetailService expenseDispatchTrainDetailService;
@@ -69,88 +63,64 @@ public class ExpenseDispatchTrainDetailController extends BladeController {
 	 */
 	@GetMapping("/detail")
 	@ApiOperationSupport(order = 1)
-	@ApiOperation(value = "详情", notes = "传入expenseDispatchTrainDetail")
+	@ApiOperation(value = "详情", notes = "详情")
 	public R<ExpenseDispatchTrainDetailVO> detail(ExpenseDispatchTrainDetailEntity expenseDispatchTrainDetail) {
 		ExpenseDispatchTrainDetailEntity detail = expenseDispatchTrainDetailService.getOne(Condition.getQueryWrapper(expenseDispatchTrainDetail));
 		return R.data(ExpenseDispatchTrainDetailWrapper.build().entityVO(detail));
 	}
-	/**
-	 * 配送成本-车次成本明细表 分页
-	 */
-	@GetMapping("/list")
-	@ApiOperationSupport(order = 2)
-	@ApiOperation(value = "分页", notes = "传入expenseDispatchTrainDetail")
-	public R<IPage<ExpenseDispatchTrainDetailVO>> list(@ApiIgnore @RequestParam Map<String, Object> expenseDispatchTrainDetail, Query query) {
-		IPage<ExpenseDispatchTrainDetailEntity> pages = expenseDispatchTrainDetailService.page(Condition.getPage(query), Condition.getQueryWrapper(expenseDispatchTrainDetail, ExpenseDispatchTrainDetailEntity.class));
-		return R.data(ExpenseDispatchTrainDetailWrapper.build().pageVO(pages));
-	}
 
 	/**
 	 * 配送成本-车次成本明细表 自定义分页
 	 */
 	@GetMapping("/page")
-	@ApiOperationSupport(order = 3)
-	@ApiOperation(value = "分页", notes = "传入expenseDispatchTrainDetail")
-	public R<IPage<ExpenseDispatchTrainDetailVO>> page(ExpenseDispatchTrainDetailVO expenseDispatchTrainDetail, Query query) {
-		IPage<ExpenseDispatchTrainDetailVO> pages = expenseDispatchTrainDetailService.selectExpenseDispatchTrainDetailPage(Condition.getPage(query), expenseDispatchTrainDetail);
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "分页")
+	public R<IPage<ExpenseDispatchTrainDetailVO>> page(ExpenseDispatchTrainDetailQuery query) {
+		IPage<ExpenseDispatchTrainDetailVO> pages = expenseDispatchTrainDetailService.selectExpenseDispatchTrainDetailPage(query);
 		return R.data(pages);
 	}
 
-	/**
-	 * 配送成本-车次成本明细表 新增
-	 */
-	@PostMapping("/save")
-	@ApiOperationSupport(order = 4)
-	@ApiOperation(value = "新增", notes = "传入expenseDispatchTrainDetail")
-	public R save(@Valid @RequestBody ExpenseDispatchTrainDetailEntity expenseDispatchTrainDetail) {
-		return R.status(expenseDispatchTrainDetailService.save(expenseDispatchTrainDetail));
+	@GetMapping("/export")
+	@ApiOperation(value = "导出车辆成本结算表", notes = "导出车辆成本结算表")
+	public void export(HttpServletResponse response, ExpenseDispatchTrainDetailQuery query) {
+		expenseDispatchTrainDetailService.export(response, query);
 	}
 
 	/**
-	 * 配送成本-车次成本明细表 修改
+	 * 配送成本-车辆成本结算表-异动记录 新增
 	 */
-	@PostMapping("/update")
-	@ApiOperationSupport(order = 5)
-	@ApiOperation(value = "修改", notes = "传入expenseDispatchTrainDetail")
-	public R update(@Valid @RequestBody ExpenseDispatchTrainDetailEntity expenseDispatchTrainDetail) {
-		return R.status(expenseDispatchTrainDetailService.updateById(expenseDispatchTrainDetail));
+	@PostMapping("/change")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "异动调整", notes = "异动调整")
+	public R change(@Validated @RequestBody ExpenseDispatchTrainDetailChangeSaveVO vo) {
+		return R.status(expenseDispatchTrainDetailService.change(vo));
 	}
 
 	/**
 	 * 配送成本-车次成本明细表 新增或修改
 	 */
 	@PostMapping("/submit")
-	@ApiOperationSupport(order = 6)
-	@ApiOperation(value = "新增或修改", notes = "传入expenseDispatchTrainDetail")
-	public R submit(@Valid @RequestBody ExpenseDispatchTrainDetailEntity expenseDispatchTrainDetail) {
-		return R.status(expenseDispatchTrainDetailService.saveOrUpdate(expenseDispatchTrainDetail));
-	}
-
-	/**
-	 * 配送成本-车次成本明细表 删除
-	 */
-	@PostMapping("/remove")
-	@ApiOperationSupport(order = 7)
-	@ApiOperation(value = "逻辑删除", notes = "传入ids")
-	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(expenseDispatchTrainDetailService.deleteLogic(Func.toLongList(ids)));
-	}
-
-
-	/**
-	 * 导出数据
-	 */
-	@GetMapping("/export-expenseDispatchTrainDetail")
-	@ApiOperationSupport(order = 9)
-	@ApiOperation(value = "导出数据", notes = "传入expenseDispatchTrainDetail")
-	public void exportExpenseDispatchTrainDetail(@ApiIgnore @RequestParam Map<String, Object> expenseDispatchTrainDetail, BladeUser bladeUser, HttpServletResponse response) {
-		QueryWrapper<ExpenseDispatchTrainDetailEntity> queryWrapper = Condition.getQueryWrapper(expenseDispatchTrainDetail, ExpenseDispatchTrainDetailEntity.class);
-		//if (!AuthUtil.isAdministrator()) {
-		//	queryWrapper.lambda().eq(ExpenseDispatchTrainDetail::getTenantId, bladeUser.getTenantId());
-		//}
-		queryWrapper.lambda().eq(ExpenseDispatchTrainDetailEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
-		List<ExpenseDispatchTrainDetailExcel> list = expenseDispatchTrainDetailService.exportExpenseDispatchTrainDetail(queryWrapper);
-		ExcelUtil.export(response, "配送成本-车次成本明细表数据" + DateUtil.time(), "配送成本-车次成本明细表数据表", list, ExpenseDispatchTrainDetailExcel.class);
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "结算", notes = "结算")
+	public R submit(@Validated @RequestBody ExpenseDispatchTrainDetailEntity expenseDispatchTrainDetail) {
+		ExpenseDispatchTrainDetailEntity entity = expenseDispatchTrainDetailService.getById(expenseDispatchTrainDetail.getId());
+		ExpenseDispatchTrainDetailEntity trainDetailEntity = new ExpenseDispatchTrainDetailEntity();
+		trainDetailEntity.setSettlementStatus("已结算");
+		Double totalDistributionCost = entity.getTotalDistributionCost();
+		Double changeAmount = entity.getChangeAmount();
+		trainDetailEntity.setSettlementAmount(totalDistributionCost);
+		if (ObjectUtil.isNotEmpty(changeAmount)) {
+			double add = NumberUtil.add(totalDistributionCost, changeAmount);
+			trainDetailEntity.setSettlementAmount(add);
+		}
+		trainDetailEntity.setSettlementTime(new Date());
+		trainDetailEntity.setSettlementYear(DateUtil.year(new Date()));
+		trainDetailEntity.setSettlementMonth(DateUtil.month(new Date()) + 1);
+		trainDetailEntity.setSettlementDay(DateUtil.dayOfMonth(new Date()));
+		trainDetailEntity.setSettlementNote(expenseDispatchTrainDetail.getSettlementNote());
+		trainDetailEntity.setSettlementUser(AuthUtil.getNickName());
+		trainDetailEntity.setId(entity.getId());
+		return R.status(expenseDispatchTrainDetailService.updateById(trainDetailEntity));
 	}
 
 }

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/ExpenseDispatchWarehouseMonthController.java

@@ -18,19 +18,20 @@ package com.logpm.statistics.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.logpm.statistics.query.ExpenseDispatchTrainDetailMonthQuery;
 import com.logpm.statistics.service.IExpenseDispatchWarehouseMonthService;
 import com.logpm.statistics.vo.ExpenseDispatchWarehouseMonthVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * 配送成本-仓库月度配送成本 控制器
  *
@@ -40,7 +41,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/expenseDispatchWarehouseMonth")
-@Api(value = "配送成本-仓库月度配送成本", tags = "配送成本-仓库月度配送成本接口")
+@Api(value = "配送成本-月度配送成本表", tags = "配送成本-月度配送成本表")
 public class ExpenseDispatchWarehouseMonthController extends BladeController {
 
 	private final IExpenseDispatchWarehouseMonthService expenseDispatchWarehouseMonthService;
@@ -49,11 +50,17 @@ public class ExpenseDispatchWarehouseMonthController extends BladeController {
 	 * 配送成本-仓库月度配送成本 自定义分页
 	 */
 	@GetMapping("/page")
-	@ApiOperationSupport(order = 3)
+	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "分页", notes = "传入expenseDispatchWarehouseMonth")
-	public R<IPage<ExpenseDispatchWarehouseMonthVO>> page(ExpenseDispatchWarehouseMonthVO expenseDispatchWarehouseMonth, Query query) {
-		IPage<ExpenseDispatchWarehouseMonthVO> pages = expenseDispatchWarehouseMonthService.selectExpenseDispatchWarehouseMonthPage(Condition.getPage(query), expenseDispatchWarehouseMonth);
+	public R<IPage<ExpenseDispatchWarehouseMonthVO>> page(ExpenseDispatchTrainDetailMonthQuery query) {
+		IPage<ExpenseDispatchWarehouseMonthVO> pages = expenseDispatchWarehouseMonthService.selectExpenseDispatchWarehouseMonthPage(query);
 		return R.data(pages);
 	}
 
+	@GetMapping("/export")
+	@ApiOperation(value = "导出月度配送成本表", notes = "导出月度配送成本表")
+	public void export(HttpServletResponse response, ExpenseDispatchTrainDetailMonthQuery query) {
+		expenseDispatchWarehouseMonthService.export(response, query);
+	}
+
 }

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/ExpenseWarehouseController.java

@@ -21,7 +21,6 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.logpm.statistics.query.ExpenseWarehouseDayQuery;
 import com.logpm.statistics.query.ExpenseWarehouseMonthQuery;
 import com.logpm.statistics.query.ExpenseWarehouseOrderQuery;
-import com.logpm.statistics.query.ExpenseWarehouseTransitMonthQuery;
 import com.logpm.statistics.service.IExpenseOrderWarehouseTotalService;
 import com.logpm.statistics.service.IExpenseWarehouseDayService;
 import com.logpm.statistics.service.IExpenseWarehouseMonthService;
@@ -29,7 +28,6 @@ import com.logpm.statistics.service.IExpenseWarehousePackageDayService;
 import com.logpm.statistics.vo.ExpenseWarehouseDayVO;
 import com.logpm.statistics.vo.ExpenseWarehouseMonthVO;
 import com.logpm.statistics.vo.ExpenseWarehouseOrderVO;
-import com.logpm.statistics.vo.ExpenseWarehouseTransitMonthVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -109,17 +107,4 @@ public class ExpenseWarehouseController extends BladeController {
 		expenseOrderWarehouseTotalService.exporOrder(response, query);
 	}
 
-	/**
-	 * 中转仓月度收入报表 自定义分页
-	 */
-	@GetMapping("/transit")
-	@ApiOperationSupport(order = 4)
-	@ApiOperation(value = "中转仓月度收入报表", notes = "中转仓月度收入报表")
-	public R<IPage<ExpenseWarehouseTransitMonthVO>> transit(ExpenseWarehouseTransitMonthQuery query) {
-		IPage<ExpenseWarehouseTransitMonthVO> pages = packageDayService.transitPage(query);
-		return R.data(pages);
-	}
-
-
-
 }

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/ExpenseWarehouseTransitChangeController.java

@@ -0,0 +1,58 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.statistics.controller;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.logpm.statistics.service.IExpenseWarehouseTransitChangeService;
+import com.logpm.statistics.vo.ExpenseWarehouseTransitChangeVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.api.R;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 仓储成本-中转仓作业成本-操作记录 控制器
+ *
+ * @author zqb
+ * @since 2024-12-09
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/expenseWarehouseTransitChange")
+@Api(value = "仓储成本-中转仓作业成本-操作记录", tags = "仓储成本-中转仓作业成本-操作记录接口")
+public class ExpenseWarehouseTransitChangeController extends BladeController {
+
+	private final IExpenseWarehouseTransitChangeService expenseWarehouseTransitChangeService;
+
+	/**
+	 * 仓储成本-中转仓作业成本-操作记录 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入expenseWarehouseTransitChange")
+	public R save(@Validated @RequestBody ExpenseWarehouseTransitChangeVO expenseWarehouseTransitChange) {
+		boolean save = expenseWarehouseTransitChangeService.saveDetail(expenseWarehouseTransitChange);
+		return R.status(save);
+	}
+
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/ExpenseWarehouseTransitChangeImageController.java

@@ -0,0 +1,65 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.statistics.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.logpm.statistics.entity.ExpenseWarehouseTransitChangeImageEntity;
+import com.logpm.statistics.service.IExpenseWarehouseTransitChangeImageService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.api.R;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 仓储成本-中转仓作业成本-操作-图片 控制器
+ *
+ * @author zqb
+ * @since 2024-12-09
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/expenseWarehouseTransitChangeImage")
+@Api(value = "仓储成本-中转仓作业成本-操作-图片", tags = "仓储成本-中转仓作业成本-操作-图片接口")
+public class ExpenseWarehouseTransitChangeImageController extends BladeController {
+
+	private final IExpenseWarehouseTransitChangeImageService expenseWarehouseTransitChangeImageService;
+
+	/**
+	 * 仓储成本-中转仓作业成本-操作-图片 详情
+	 */
+	@GetMapping("/imageList")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "图片列表", notes = "图片列表")
+	public R<List<ExpenseWarehouseTransitChangeImageEntity>> imageList(@ApiParam(value = "操作id") @RequestParam("changeId") Long changeId) {
+		LambdaQueryWrapper<ExpenseWarehouseTransitChangeImageEntity> wrapper = Wrappers.<ExpenseWarehouseTransitChangeImageEntity>lambdaQuery()
+			.select(ExpenseWarehouseTransitChangeImageEntity::getImageUrl)
+			.eq(ExpenseWarehouseTransitChangeImageEntity::getChangeId, changeId);
+		List<ExpenseWarehouseTransitChangeImageEntity> list = expenseWarehouseTransitChangeImageService.list(wrapper);
+		return R.data(list);
+	}
+
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/ExpenseWarehouseTransitController.java

@@ -0,0 +1,66 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.statistics.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.logpm.statistics.query.ExpenseWarehouseTransitQuery;
+import com.logpm.statistics.service.IExpenseWarehouseTransitService;
+import com.logpm.statistics.vo.ExpenseWarehouseTransitVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.api.R;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 中转仓仓储作业明细 控制器
+ *
+ * @author zqb
+ * @since 2024-12-09
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/expenseWarehouseTransit")
+@Api(value = "中转仓仓储作业明细", tags = "中转仓仓储作业明细接口")
+public class ExpenseWarehouseTransitController extends BladeController {
+
+	private final IExpenseWarehouseTransitService expenseWarehouseTransitService;
+
+	/**
+	 * 中转仓仓储作业明细 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入expenseWarehouseTransit")
+	public R<IPage<ExpenseWarehouseTransitVO>> page(ExpenseWarehouseTransitQuery query) {
+		IPage<ExpenseWarehouseTransitVO> pages = expenseWarehouseTransitService.selectExpenseWarehouseTransitPage(query);
+		return R.data(pages);
+	}
+
+	@GetMapping("/exportTransit")
+	@ApiOperation(value = "导出中转仓仓储作业明细", notes = "导出中转仓仓储作业明细")
+	public void exportTransit(HttpServletResponse response, ExpenseWarehouseTransitQuery query) {
+		expenseWarehouseTransitService.exportTransit(response, query);
+	}
+
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/controller/ExpenseWarehouseTransitMonthController.java

@@ -0,0 +1,93 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.statistics.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.logpm.statistics.query.ExpenseWarehouseTransitMonthQuery;
+import com.logpm.statistics.service.IExpenseWarehouseTransitMonthService;
+import com.logpm.statistics.vo.ExpenseWarehouseTransitMonthVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.api.R;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 中转仓月度仓储作业账单 控制器
+ *
+ * @author zqb
+ * @since 2024-12-09
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/expenseWarehouseTransitMonth")
+@Api(value = "中转仓月度仓储作业账单", tags = "中转仓月度仓储作业账单接口")
+public class ExpenseWarehouseTransitMonthController extends BladeController {
+
+	private final IExpenseWarehouseTransitMonthService expenseWarehouseTransitMonthService;
+
+	/**
+	 * 中转仓月度仓储作业账单 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入expenseWarehouseTransitMonth")
+	public R<ExpenseWarehouseTransitMonthVO> detail(@RequestParam("id") @ApiParam(value = "账单id", required = true) Long id,@RequestParam("type") @ApiParam(value = "账单类型 异动/结算", required = true) String type)  {
+		ExpenseWarehouseTransitMonthVO detail = expenseWarehouseTransitMonthService.detail(id, type);
+		return R.data(detail);
+	}
+
+	/**
+	 * 中转仓月度仓储作业账单 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入expenseWarehouseTransitMonth")
+	public R<IPage<ExpenseWarehouseTransitMonthVO>> page(ExpenseWarehouseTransitMonthQuery query) {
+		IPage<ExpenseWarehouseTransitMonthVO> pages = expenseWarehouseTransitMonthService.selectExpenseWarehouseTransitMonthPage(query);
+		return R.data(pages);
+	}
+
+	@GetMapping("/exportTransitMonth")
+	@ApiOperation(value = "导出中转仓月度仓储作业账单", notes = "导出中转仓月度仓储作业账单")
+	public void exportTransitMonth(HttpServletResponse response, ExpenseWarehouseTransitMonthQuery query) {
+		expenseWarehouseTransitMonthService.exportTransitMonth(response, query);
+	}
+
+	/**
+	 * 确认结算
+	 */
+	@PostMapping("/confirmSettlement")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "确认结算", notes = "确认结算")
+	public R confirmSettlement(@Validated @RequestBody ExpenseWarehouseTransitMonthVO vo) {
+		boolean save = expenseWarehouseTransitMonthService.confirmSettlement(vo);
+		return R.status(save);
+	}
+
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/excel/ExpenseDispatchTrainDetailChangeExcel.java

@@ -0,0 +1,44 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.statistics.excel;
+
+
+import lombok.Data;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import java.io.Serializable;
+
+
+/**
+ * 配送成本-车辆成本结算表-异动记录 Excel实体类
+ *
+ * @author zqb
+ * @since 2024-12-03
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class ExpenseDispatchTrainDetailChangeExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/excel/ExpenseWarehouseTransitChangeExcel.java

@@ -0,0 +1,44 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.statistics.excel;
+
+
+import lombok.Data;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import java.io.Serializable;
+
+
+/**
+ * 仓储成本-中转仓作业成本-操作记录 Excel实体类
+ *
+ * @author zqb
+ * @since 2024-12-09
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class ExpenseWarehouseTransitChangeExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/excel/ExpenseWarehouseTransitChangeImageExcel.java

@@ -0,0 +1,44 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.statistics.excel;
+
+
+import lombok.Data;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import java.io.Serializable;
+
+
+/**
+ * 仓储成本-中转仓作业成本-操作-图片 Excel实体类
+ *
+ * @author zqb
+ * @since 2024-12-09
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class ExpenseWarehouseTransitChangeImageExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/excel/ExpenseWarehouseTransitExcel.java

@@ -0,0 +1,44 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.statistics.excel;
+
+
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 中转仓仓储作业明细 Excel实体类
+ *
+ * @author zqb
+ * @since 2024-12-09
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class ExpenseWarehouseTransitExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/excel/ExpenseWarehouseTransitMonthExcel.java

@@ -0,0 +1,44 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.statistics.excel;
+
+
+import lombok.Data;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import java.io.Serializable;
+
+
+/**
+ * 中转仓月度仓储作业账单 Excel实体类
+ *
+ * @author zqb
+ * @since 2024-12-09
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class ExpenseWarehouseTransitMonthExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/job/ExpenseJob.java

@@ -15,6 +15,7 @@ import com.logpm.distribution.entity.QualityDeliverEntity;
 import com.logpm.distribution.feign.IQualityDeliverClient;
 import com.logpm.statistics.entity.ExpenseWarehouseDayEntity;
 import com.logpm.statistics.entity.ExpenseWarehouseMonthEntity;
+import com.logpm.statistics.service.IExpenseDispatchWarehouseMonthService;
 import com.logpm.statistics.service.IExpenseWarehouseDayService;
 import com.logpm.statistics.service.IExpenseWarehouseMonthService;
 import com.logpm.trunkline.feign.ITrunklineCarsLoadScanClient;
@@ -55,6 +56,8 @@ public class ExpenseJob {
 	@Resource
 	private IExpenseWarehouseMonthService warehouseMonthService;
 	@Resource
+	private IExpenseDispatchWarehouseMonthService dispatchWarehouseMonthService;
+	@Resource
 	private ITrunklineCarsLoadScanClient carsLoadScanClient;
 
 	/**
@@ -320,6 +323,24 @@ public class ExpenseJob {
 		//
 		return ReturnT.SUCCESS;
 	}
+	/**
+	 * 月度配送成本报表
+	 *
+	 * @param param
+	 * @return
+	 * @throws Exception
+	 */
+	@XxlJob("expenseDispatchDetailMonthJob")
+	public ReturnT<String> expenseDispatchDetailMonthJob(String param) throws Exception {
+		log.info("expenseDispatchDetailMonthJob 参数：{}", param);
+		DateTime statisticsTime = DateUtil.yesterday();
+		if (StrUtil.isNotEmpty(param)) {
+			statisticsTime = DateUtil.parseDate(param);
+		}
+		// 统计配送月度报表
+		dispatchWarehouseMonthService.expenseDispatchDetailMonthJob(statisticsTime);
+		return ReturnT.SUCCESS;
+	}
 
 
 	private Integer getDaysByDate(DateTime statisticsTime) {

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchOrderDetailMapper.java

@@ -17,6 +17,7 @@
 package com.logpm.statistics.mapper;
 
 import com.logpm.statistics.entity.ExpenseDispatchOrderDetailEntity;
+import com.logpm.statistics.query.ExpenseDispatchOrderDetailQuery;
 import com.logpm.statistics.vo.ExpenseDispatchOrderDetailVO;
 import com.logpm.statistics.excel.ExpenseDispatchOrderDetailExcel;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -40,7 +41,7 @@ public interface ExpenseDispatchOrderDetailMapper extends BaseMapper<ExpenseDisp
 	 * @param expenseDispatchOrderDetail
 	 * @return
 	 */
-	List<ExpenseDispatchOrderDetailVO> selectExpenseDispatchOrderDetailPage(IPage page, ExpenseDispatchOrderDetailVO expenseDispatchOrderDetail);
+	List<ExpenseDispatchOrderDetailVO> selectExpenseDispatchOrderDetailPage(@Param("page") IPage page, @Param("expenseDispatchOrderDetail") ExpenseDispatchOrderDetailQuery expenseDispatchOrderDetail);
 
 
 	/**

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchOrderDetailMapper.xml

@@ -8,7 +8,57 @@
 
 
     <select id="selectExpenseDispatchOrderDetailPage" resultMap="expenseDispatchOrderDetailResultMap">
-        select * from logpm_expense_dispatch_order_detail where is_deleted = 0
+        select t.order_code orderCode,
+        t.waybill_number waybillNumber,
+        t.brand_name brand,
+        t.warehouse_name destinationWarehouse,
+        t.shipper_unit shippingOrg,
+        t.consignee_unit consigneeOrg,
+        t.delivery_type waybillType,
+        t.open_order_time documentCreationTime,
+        count(*) totalQuantity,
+        sum(t.review_num) reviewNumber,
+        sum(case when t.settlement_time is not null then t.review_num end) settlementNumber,
+        sum(t.weight) totalWeight,
+        sum(t.volume) totalVolume,
+        sum(t.total_distribution_cost) totalDistributionCost,
+        sum(t.distribution_cost) distributionCost,
+        sum(t.inventory_distribution_cost) inventoryDistributionCost,
+        sum(t.apstairs_cost) stairCarryingFee,
+        sum(t.apart_cost) goodsAllocationCost,
+        sum(t.move_cost) repositioningCost,
+        sum(t.stevedore_cost) handlingCost,
+        sum(t.kilo_allow_cost) mileageCost,
+        sum(t.allow_kilo_allow_cost) subsidizedKilometerCost,
+        sum(t.ultr_allpw_cost) excessZoneMileageCost,
+        sum(t.point_allow_cost) locationSubsidyCost,
+        sum(t.guar_cost) minimumGuaranteeCost,
+        sum(t.fuel_cost) fuelCost,
+        sum(t.other_cost) otherCosts,
+        sum(t.change_amount) changeAmount,
+        t.shipper_person shipper,
+        t.shipper_mobile shippingPhone,
+        t.shipper_address shippingAddress,
+        t.begin_warehouse_name departureWarehouse,
+        t.consignee_person consignee,
+        t.consignee_mobile consigneePhone,
+        t.consignee_address consigneeAddress,
+        t.train_number customerTrip
+        from logpm_quality_deliver t
+        where
+            t.waybill_number is not null
+            and t.order_code is not null
+            and review_user_name is not null
+            <if test="expenseDispatchOrderDetail.orderCode != null and expenseDispatchOrderDetail.orderCode != ''">
+                and t.order_code like concat('%',#{expenseDispatchOrderDetail.orderCode},'%')
+            </if>
+            <if test="expenseDispatchOrderDetail.destinationWarehouse != null and expenseDispatchOrderDetail.destinationWarehouse != ''">
+                and t.destination_warehouse = #{expenseDispatchOrderDetail.destinationWarehouse}
+            </if>
+            <if test="expenseDispatchOrderDetail.waybillNumber != null and expenseDispatchOrderDetail.waybillNumber != ''">
+                and t.waybill_number = #{expenseDispatchOrderDetail.waybillNumber}
+            </if>
+        group by t.order_code, t.waybill_number
     </select>
 
 

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchTrainDetailChangeMapper.java

@@ -0,0 +1,54 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.statistics.mapper;
+
+import com.logpm.statistics.entity.ExpenseDispatchTrainDetailChangeEntity;
+import com.logpm.statistics.vo.ExpenseDispatchTrainDetailChangeVO;
+import com.logpm.statistics.excel.ExpenseDispatchTrainDetailChangeExcel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
+/**
+ * 配送成本-车辆成本结算表-异动记录 Mapper 接口
+ *
+ * @author zqb
+ * @since 2024-12-03
+ */
+public interface ExpenseDispatchTrainDetailChangeMapper extends BaseMapper<ExpenseDispatchTrainDetailChangeEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param expenseDispatchTrainDetailChange
+	 * @return
+	 */
+	List<ExpenseDispatchTrainDetailChangeVO> selectExpenseDispatchTrainDetailChangePage(@Param("page") IPage page, @Param("expenseDispatchTrainDetailChange") ExpenseDispatchTrainDetailChangeVO expenseDispatchTrainDetailChange);
+
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<ExpenseDispatchTrainDetailChangeExcel> exportExpenseDispatchTrainDetailChange(@Param("ew") Wrapper<ExpenseDispatchTrainDetailChangeEntity> queryWrapper);
+
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchTrainDetailChangeMapper.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.statistics.mapper.ExpenseDispatchTrainDetailChangeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="expenseDispatchTrainDetailChangeResultMap" type="com.logpm.statistics.entity.ExpenseDispatchTrainDetailChangeEntity">
+    </resultMap>
+
+
+    <select id="selectExpenseDispatchTrainDetailChangePage" resultMap="expenseDispatchTrainDetailChangeResultMap">
+        select * from logpm_expense_dispatch_train_detail_change where is_deleted = 0
+        <if test="expenseDispatchTrainDetailChange.detailId != null and expenseDispatchTrainDetailChange.detailId != ''">
+            and detail_id = #{expenseDispatchTrainDetailChange.detailId}
+        </if>
+    </select>
+
+
+    <select id="exportExpenseDispatchTrainDetailChange" resultType="com.logpm.statistics.excel.ExpenseDispatchTrainDetailChangeExcel">
+        SELECT * FROM logpm_expense_dispatch_train_detail_change ${ew.customSqlSegment}
+    </select>
+
+</mapper>

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchTrainDetailMapper.java

@@ -17,6 +17,7 @@
 package com.logpm.statistics.mapper;
 
 import com.logpm.statistics.entity.ExpenseDispatchTrainDetailEntity;
+import com.logpm.statistics.query.ExpenseDispatchTrainDetailQuery;
 import com.logpm.statistics.vo.ExpenseDispatchTrainDetailVO;
 import com.logpm.statistics.excel.ExpenseDispatchTrainDetailExcel;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -40,7 +41,7 @@ public interface ExpenseDispatchTrainDetailMapper extends BaseMapper<ExpenseDisp
 	 * @param expenseDispatchTrainDetail
 	 * @return
 	 */
-	List<ExpenseDispatchTrainDetailVO> selectExpenseDispatchTrainDetailPage(IPage page, ExpenseDispatchTrainDetailVO expenseDispatchTrainDetail);
+	List<ExpenseDispatchTrainDetailVO> selectExpenseDispatchTrainDetailPage(@Param("page") IPage page, @Param("expenseDispatchTrainDetail") ExpenseDispatchTrainDetailQuery expenseDispatchTrainDetail);
 
 
 	/**

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchTrainDetailMapper.xml

@@ -8,7 +8,35 @@
 
 
     <select id="selectExpenseDispatchTrainDetailPage" resultMap="expenseDispatchTrainDetailResultMap">
-        select * from logpm_expense_dispatch_train_detail where is_deleted = 0
+        select * from logpm_expense_dispatch_train_detail
+        where is_deleted = 0
+        <if test="expenseDispatchTrainDetail.destinationWarehouse != null and expenseDispatchTrainDetail.destinationWarehouse != ''">
+           and destination_warehouse = #{expenseDispatchTrainDetail.destinationWarehouse}
+        </if>
+        <if test="expenseDispatchTrainDetail.settlementStatus != null and expenseDispatchTrainDetail.settlementStatus != ''">
+           and settlement_status = #{expenseDispatchTrainDetail.settlementStatus}
+        </if>
+        <if test="expenseDispatchTrainDetail.settlementYear != null and expenseDispatchTrainDetail.settlementYear != ''">
+           and settlement_year = #{expenseDispatchTrainDetail.settlementYear}
+        </if>
+        <if test="expenseDispatchTrainDetail.settlementMonth != null and expenseDispatchTrainDetail.settlementMonth != ''">
+           and settlement_month = #{expenseDispatchTrainDetail.settlementMonth}
+        </if>
+        <if test="expenseDispatchTrainDetail.trainNumber != null and expenseDispatchTrainDetail.trainNumber != ''">
+           and train_number like concat('%',#{expenseDispatchTrainDetail.settlementMonth},'%')
+        </if>
+        <if test="expenseDispatchTrainDetail.deliveryDateStart != null and expenseDispatchTrainDetail.deliveryDateStart != ''">
+           and delivery_date >= #{expenseDispatchTrainDetail.deliveryDateStart}
+        </if>
+        <if test="expenseDispatchTrainDetail.deliveryDateEnd != null and expenseDispatchTrainDetail.deliveryDateEnd != ''">
+           and delivery_date &lt;= #{expenseDispatchTrainDetail.deliveryDateStart}
+        </if>
+        <if test="expenseDispatchTrainDetail.distributionType != null and expenseDispatchTrainDetail.distributionType != ''">
+           and distribution_type = #{expenseDispatchTrainDetail.distributionType}
+        </if>
+        <if test="expenseDispatchTrainDetail.deliveryVehicle != null and expenseDispatchTrainDetail.deliveryVehicle != ''">
+           and delivery_vehicle like concat('%', #{expenseDispatchTrainDetail.deliveryVehicle}, '%')
+        </if>
     </select>
 
 

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchWarehouseMonthMapper.java

@@ -17,6 +17,7 @@
 package com.logpm.statistics.mapper;
 
 import com.logpm.statistics.entity.ExpenseDispatchWarehouseMonthEntity;
+import com.logpm.statistics.query.ExpenseDispatchTrainDetailMonthQuery;
 import com.logpm.statistics.vo.ExpenseDispatchWarehouseMonthVO;
 import com.logpm.statistics.excel.ExpenseDispatchWarehouseMonthExcel;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -40,7 +41,7 @@ public interface ExpenseDispatchWarehouseMonthMapper extends BaseMapper<ExpenseD
 	 * @param expenseDispatchWarehouseMonth
 	 * @return
 	 */
-	List<ExpenseDispatchWarehouseMonthVO> selectExpenseDispatchWarehouseMonthPage(IPage page, ExpenseDispatchWarehouseMonthVO expenseDispatchWarehouseMonth);
+	List<ExpenseDispatchWarehouseMonthVO> selectExpenseDispatchWarehouseMonthPage(@Param("page") IPage page, @Param("expenseDispatchWarehouseMonth") ExpenseDispatchTrainDetailMonthQuery expenseDispatchWarehouseMonth);
 
 
 	/**
@@ -51,4 +52,5 @@ public interface ExpenseDispatchWarehouseMonthMapper extends BaseMapper<ExpenseD
 	 */
 	List<ExpenseDispatchWarehouseMonthExcel> exportExpenseDispatchWarehouseMonth(@Param("ew") Wrapper<ExpenseDispatchWarehouseMonthEntity> queryWrapper);
 
+	List<ExpenseDispatchWarehouseMonthEntity> expenseDispatchDetailMonthJob(@Param("year") int year, @Param("month") int month);
 }

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchWarehouseMonthMapper.xml

@@ -8,7 +8,18 @@
 
 
     <select id="selectExpenseDispatchWarehouseMonthPage" resultMap="expenseDispatchWarehouseMonthResultMap">
-        select * from logpm_expense_dispatch_warehouse_month where is_deleted = 0
+        select * from logpm_expense_dispatch_warehouse_month
+        <where>
+            <if test="expenseDispatchWarehouseMonth.destinationWarehouse != null and expenseDispatchWarehouseMonth.destinationWarehouse != ''">
+                and destination_warehouse = #{expenseDispatchWarehouseMonth.destinationWarehouse}
+            </if>
+            <if test="expenseDispatchWarehouseMonth.settlementYear != null and expenseDispatchWarehouseMonth.settlementYear != ''">
+                and settlement_year = #{expenseDispatchWarehouseMonth.settlementYear}
+            </if>
+            <if test="expenseDispatchWarehouseMonth.settlementMonth != null and expenseDispatchWarehouseMonth.settlementMonth != ''">
+                and settlement_month = #{expenseDispatchWarehouseMonth.settlementMonth}
+            </if>
+        </where>
     </select>
 
 
@@ -16,4 +27,37 @@
         SELECT * FROM logpm_expense_dispatch_warehouse_month ${ew.customSqlSegment}
     </select>
 
+    <select id="expenseDispatchDetailMonthJob" resultType="com.logpm.statistics.entity.ExpenseDispatchWarehouseMonthEntity">
+        select t.destination_warehouse destinationWarehouse,
+               t.settlement_month settlementMonth,
+               t.settlement_year settlementYear,
+               concat(t.settlement_year,'年',t.settlement_month,'月') settlementTime,
+               count(*) totalTrainService,
+               sum(t.planned_total_quantity) plannedTotalQuantity,
+               sum(t.inventory_item_count) inventoryItemCount,
+               sum(t.total_loaded_pieces) totalLoadedPieces,
+               sum(t.total_receipt_cost) totalReceiptCost,
+               sum(t.total_distribution_cost) totalDistributionCost,
+               sum(t.distribution_cost) distributionCost,
+               sum(t.inventory_distribution_cost) inventoryDistributionCost,
+               sum(t.stair_carrying_fee) stairCarryingFee,
+               sum(t.goods_allocation_cost) goodsAllocationCost,
+               sum(t.repositioning_cost) repositioningCost,
+               sum(t.handling_cost) handlingCost,
+               sum(t.mileage_cost) mileageCost,
+               sum(t.subsidized_kilometer_cost) subsidizedKilometerCost,
+               sum(t.excess_zone_mileage_cost) excessZoneMileageCost,
+               sum(t.location_subsidy_cost) locationSubsidyCost,
+               sum(t.minimum_guarantee_cost) minimumGuaranteeCost,
+               sum(t.fuel_cost) fuelCost,
+               sum(t.other_costs) otherCosts,
+               sum(t.change_amount) changeAmount,
+               sum(t.settlement_amount) settlementAmount
+        from logpm_expense_dispatch_train_detail t
+        where t.settlement_year = #{year}
+          and t.settlement_month = #{month}
+        group by t.settlement_month,t.settlement_year,t.destination_warehouse
+
+
+    </select>
 </mapper>

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseWarehouseTransitChangeImageMapper.java

@@ -0,0 +1,56 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.statistics.mapper;
+
+import com.logpm.statistics.entity.ExpenseWarehouseTransitChangeImageEntity;
+import com.logpm.statistics.vo.ExpenseWarehouseTransitChangeImageVO;
+import com.logpm.statistics.excel.ExpenseWarehouseTransitChangeImageExcel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
+/**
+ * 仓储成本-中转仓作业成本-操作-图片 Mapper 接口
+ *
+ * @author zqb
+ * @since 2024-12-09
+ */
+@Mapper
+public interface ExpenseWarehouseTransitChangeImageMapper extends BaseMapper<ExpenseWarehouseTransitChangeImageEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param expenseWarehouseTransitChangeImage
+	 * @return
+	 */
+	List<ExpenseWarehouseTransitChangeImageVO> selectExpenseWarehouseTransitChangeImagePage(IPage page, ExpenseWarehouseTransitChangeImageVO expenseWarehouseTransitChangeImage);
+
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<ExpenseWarehouseTransitChangeImageExcel> exportExpenseWarehouseTransitChangeImage(@Param("ew") Wrapper<ExpenseWarehouseTransitChangeImageEntity> queryWrapper);
+
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseWarehouseTransitChangeImageMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.statistics.mapper.ExpenseWarehouseTransitChangeImageMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="expenseWarehouseTransitChangeImageResultMap" type="com.logpm.statistics.entity.ExpenseWarehouseTransitChangeImageEntity">
+    </resultMap>
+
+
+    <select id="selectExpenseWarehouseTransitChangeImagePage" resultMap="expenseWarehouseTransitChangeImageResultMap">
+        select * from logpm_expense_warehouse_transit_change_image where is_deleted = 0
+    </select>
+
+
+    <select id="exportExpenseWarehouseTransitChangeImage" resultType="com.logpm.statistics.excel.ExpenseWarehouseTransitChangeImageExcel">
+        SELECT * FROM logpm_expense_warehouse_transit_change_image ${ew.customSqlSegment}
+    </select>
+
+</mapper>

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseWarehouseTransitChangeMapper.java

@@ -0,0 +1,54 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.statistics.mapper;
+
+import com.logpm.statistics.entity.ExpenseWarehouseTransitChangeEntity;
+import com.logpm.statistics.vo.ExpenseWarehouseTransitChangeVO;
+import com.logpm.statistics.excel.ExpenseWarehouseTransitChangeExcel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
+/**
+ * 仓储成本-中转仓作业成本-操作记录 Mapper 接口
+ *
+ * @author zqb
+ * @since 2024-12-09
+ */
+public interface ExpenseWarehouseTransitChangeMapper extends BaseMapper<ExpenseWarehouseTransitChangeEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param expenseWarehouseTransitChange
+	 * @return
+	 */
+	List<ExpenseWarehouseTransitChangeVO> selectExpenseWarehouseTransitChangePage(IPage page, ExpenseWarehouseTransitChangeVO expenseWarehouseTransitChange);
+
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<ExpenseWarehouseTransitChangeExcel> exportExpenseWarehouseTransitChange(@Param("ew") Wrapper<ExpenseWarehouseTransitChangeEntity> queryWrapper);
+
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseWarehouseTransitChangeMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.statistics.mapper.ExpenseWarehouseTransitChangeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="expenseWarehouseTransitChangeResultMap" type="com.logpm.statistics.entity.ExpenseWarehouseTransitChangeEntity">
+    </resultMap>
+
+
+    <select id="selectExpenseWarehouseTransitChangePage" resultMap="expenseWarehouseTransitChangeResultMap">
+        select * from logpm_expense_warehouse_transit_change where is_deleted = 0
+    </select>
+
+
+    <select id="exportExpenseWarehouseTransitChange" resultType="com.logpm.statistics.excel.ExpenseWarehouseTransitChangeExcel">
+        SELECT * FROM logpm_expense_warehouse_transit_change ${ew.customSqlSegment}
+    </select>
+
+</mapper>

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseWarehouseTransitMapper.java

@@ -0,0 +1,55 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.statistics.mapper;
+
+import com.logpm.statistics.entity.ExpenseWarehouseTransitEntity;
+import com.logpm.statistics.query.ExpenseWarehouseTransitQuery;
+import com.logpm.statistics.vo.ExpenseWarehouseTransitVO;
+import com.logpm.statistics.excel.ExpenseWarehouseTransitExcel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
+/**
+ * 中转仓仓储作业明细 Mapper 接口
+ *
+ * @author zqb
+ * @since 2024-12-09
+ */
+public interface ExpenseWarehouseTransitMapper extends BaseMapper<ExpenseWarehouseTransitEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param expenseWarehouseTransit
+	 * @return
+	 */
+	List<ExpenseWarehouseTransitVO> selectExpenseWarehouseTransitPage(@Param("page") IPage page, @Param("expenseWarehouseTransit") ExpenseWarehouseTransitQuery expenseWarehouseTransit);
+
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<ExpenseWarehouseTransitExcel> exportExpenseWarehouseTransit(@Param("ew") Wrapper<ExpenseWarehouseTransitEntity> queryWrapper);
+
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseWarehouseTransitMapper.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.statistics.mapper.ExpenseWarehouseTransitMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="expenseWarehouseTransitResultMap" type="com.logpm.statistics.entity.ExpenseWarehouseTransitEntity">
+    </resultMap>
+
+
+    <select id="selectExpenseWarehouseTransitPage" resultType="com.logpm.statistics.vo.ExpenseWarehouseTransitVO">
+        select *
+        from logpm_expense_warehouse_transit where is_deleted = 0
+        <if test="expenseWarehouseTransit.transitWarehouseName != null and expenseWarehouseTransit.transitWarehouseName != ''">
+            and transit_warehouse_name in
+            <foreach collection="expenseWarehouseTransit.transitWarehouseName.split(',')" item="item" index="index"
+                     separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="expenseWarehouseTransit.destinationWarehouseName != null and expenseWarehouseTransit.destinationWarehouseName != ''">
+            and destination_warehouse_name in
+            <foreach collection="expenseWarehouseTransit.destinationWarehouseName.split(',')" item="item" index="index"
+                     separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="expenseWarehouseTransit.confirmAllocationYear != null and expenseWarehouseTransit.confirmAllocationYear != ''">
+            and confirm_allocation_year = #{expenseWarehouseTransit.confirmAllocationYear}
+        </if>
+        <if test="expenseWarehouseTransit.confirmAllocationMonth != null and expenseWarehouseTransit.confirmAllocationMonth != ''">
+            and confirm_allocation_month = #{expenseWarehouseTransit.confirmAllocationMonth}
+        </if>
+    </select>
+
+
+    <select id="exportExpenseWarehouseTransit" resultType="com.logpm.statistics.excel.ExpenseWarehouseTransitExcel">
+        SELECT * FROM logpm_expense_warehouse_transit ${ew.customSqlSegment}
+    </select>
+
+</mapper>

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseWarehouseTransitMonthMapper.java

@@ -0,0 +1,46 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.statistics.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.statistics.entity.ExpenseWarehouseTransitMonthEntity;
+import com.logpm.statistics.query.ExpenseWarehouseTransitMonthQuery;
+import com.logpm.statistics.vo.ExpenseWarehouseTransitMonthVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 中转仓月度仓储作业账单 Mapper 接口
+ *
+ * @author zqb
+ * @since 2024-12-09
+ */
+public interface ExpenseWarehouseTransitMonthMapper extends BaseMapper<ExpenseWarehouseTransitMonthEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param expenseWarehouseTransitMonth
+	 * @return
+	 */
+	List<ExpenseWarehouseTransitMonthVO> selectExpenseWarehouseTransitMonthPage(@Param("page") IPage page, @Param("expenseWarehouseTransitMonth") ExpenseWarehouseTransitMonthQuery expenseWarehouseTransitMonth);
+
+
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseWarehouseTransitMonthMapper.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.statistics.mapper.ExpenseWarehouseTransitMonthMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="expenseWarehouseTransitMonthResultMap" type="com.logpm.statistics.entity.ExpenseWarehouseTransitMonthEntity">
+    </resultMap>
+
+    <select id="selectExpenseWarehouseTransitMonthPage" resultType="com.logpm.statistics.vo.ExpenseWarehouseTransitMonthVO">
+        select * from logpm_expense_warehouse_transit_month where is_deleted = 0
+        <if test="expenseWarehouseTransitMonth.transitWarehouseName != null and expenseWarehouseTransitMonth.transitWarehouseName != ''">
+            and transit_warehouse_name in
+            <foreach collection="expenseWarehouseTransitMonth.transitWarehouseName.split(',')" item="item" index="index" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="expenseWarehouseTransitMonth.destinationWarehouseName != null and expenseWarehouseTransitMonth.destinationWarehouseName != ''">
+            and destination_warehouse_name in
+            <foreach collection="expenseWarehouseTransitMonth.destinationWarehouseName.split(',')" item="item" index="index" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="expenseWarehouseTransitMonth.statisticalYear != null and expenseWarehouseTransitMonth.statisticalYear != ''">
+            and statistical_year = #{expenseWarehouseTransitMonth.statisticalYear}
+        </if>
+        <if test="expenseWarehouseTransitMonth.statisticalMonth != null and expenseWarehouseTransitMonth.statisticalMonth != ''">
+            and statistical_month = #{expenseWarehouseTransitMonth.statisticalMonth}
+        </if>
+        <if test="expenseWarehouseTransitMonth.settlementTimeStart != null and expenseWarehouseTransitMonth.settlementTimeEnd != null">
+            and settlement_time between #{expenseWarehouseTransitMonth.settlementTimeStart} and #{expenseWarehouseTransitMonth.settlementTimeEnd}
+        </if>
+        <if test="expenseWarehouseTransitMonth.settlementStatus != null and expenseWarehouseTransitMonth.settlementStatus != ''">
+            and settlement_status = #{expenseWarehouseTransitMonth.settlementStatus}
+        </if>
+    </select>
+
+</mapper>

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/query/ExpenseDispatchOrderDetailQuery.java

@@ -0,0 +1,26 @@
+package com.logpm.statistics.query;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.support.Query;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ExpenseDispatchOrderDetailQuery extends Query {
+	/**
+	 * 订单编号
+	 */
+	@ApiModelProperty(value = "订单编号")
+	private String orderCode;
+	/**
+	 * 运单号
+	 */
+	@ApiModelProperty(value = "运单号")
+	private String waybillNumber;
+	/**
+	 * 目的仓
+	 */
+	@ApiModelProperty(value = "目的仓")
+	private String destinationWarehouse;
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/query/ExpenseDispatchTrainDetailMonthQuery.java

@@ -0,0 +1,29 @@
+package com.logpm.statistics.query;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.support.Query;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ExpenseDispatchTrainDetailMonthQuery extends Query {
+
+	/**
+	 * 目的仓
+	 */
+	@ApiModelProperty(value = "目的仓")
+	private String destinationWarehouse;
+	/**
+	 * 成本结算时间
+	 */
+	@ApiModelProperty(value = "成本结算时间-年")
+	private Integer settlementYear;
+
+	/**
+	 * 成本结算时间
+	 */
+	@ApiModelProperty(value = "成本结算时间-月")
+	private Integer settlementMonth;
+
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/query/ExpenseDispatchTrainDetailQuery.java

@@ -0,0 +1,61 @@
+package com.logpm.statistics.query;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.support.Query;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ExpenseDispatchTrainDetailQuery extends Query {
+	/**
+	 * 配送日期开始
+	 */
+	@ApiModelProperty(value = "配送日期开始")
+	private String deliveryDateStart;
+	/**
+	 * 配送日期结束
+	 */
+	@ApiModelProperty(value = "配送日期结束")
+	private String deliveryDateEnd;
+	/**
+	 * 车次号
+	 */
+	@ApiModelProperty(value = "车次号")
+	private String trainNumber;
+	/**
+	 * 配送日期
+	 */
+	@ApiModelProperty(value = "配送日期")
+	private String deliveryDate;
+	/**
+	 * 目的仓
+	 */
+	@ApiModelProperty(value = "目的仓")
+	private String destinationWarehouse;
+	/**
+	 * 配送类型
+	 */
+	@ApiModelProperty(value = "配送类型")
+	private String distributionType;
+	/**
+	 * 配送车辆
+	 */
+	@ApiModelProperty(value = "配送车辆")
+	private String deliveryVehicle;
+	/**
+	 * 结算状态
+	 */
+	@ApiModelProperty(value = "结算状态")
+	private String settlementStatus;
+	/**
+	 * 结算时间-年
+	 */
+	@ApiModelProperty(value = "结算时间-年")
+	private Integer settlementYear;
+	/**
+	 * 结算时间-月
+	 */
+	@ApiModelProperty(value = "结算时间-月")
+	private Integer settlementMonth;
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/query/ExpenseWarehouseTransitMonthQuery.java

@@ -1,11 +1,48 @@
 package com.logpm.statistics.query;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.support.Query;
 
+import java.util.Date;
+
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class ExpenseWarehouseTransitMonthQuery extends Query {
-
+	/**
+	 * 中转仓
+	 */
+	@ApiModelProperty(value = "中转仓")
+	private String transitWarehouseName;
+	/**
+	 * 目的仓
+	 */
+	@ApiModelProperty(value = "目的仓")
+	private String destinationWarehouseName;
+	/**
+	 * 出账时间-年
+	 */
+	@ApiModelProperty(value = "出账时间-年")
+	private Integer statisticalYear;
+	/**
+	 * 出账时间-月
+	 */
+	@ApiModelProperty(value = "出账时间-月")
+	private Integer statisticalMonth;
+	/**
+	 * 结算状态
+	 */
+	@ApiModelProperty(value = "结算状态")
+	private String settlementStatus;
+	/**
+	 * 结算时间
+	 */
+	@ApiModelProperty(value = "结算时间开始")
+	private Date settlementTimeStart;
+	/**
+	 * 结算时间
+	 */
+	@ApiModelProperty(value = "结算时间结束")
+	private Date settlementTimeEnd;
 }

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/query/ExpenseWarehouseTransitQuery.java

@@ -0,0 +1,34 @@
+package com.logpm.statistics.query;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.support.Query;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ExpenseWarehouseTransitQuery extends Query {
+
+	/**
+	 * 确认分摊时间-年
+	 */
+	@ApiModelProperty(value = "确认分摊时间-年")
+	private Integer confirmAllocationYear;
+	/**
+	 * 确认分摊时间-月
+	 */
+	@ApiModelProperty(value = "确认分摊时间-月")
+	private Integer confirmAllocationMonth;
+	/**
+	 * 中转仓
+	 */
+	@ApiModelProperty(value = "中转仓")
+	private String transitWarehouseName;
+	/**
+	 * 目的仓
+	 */
+	@ApiModelProperty(value = "目的仓")
+	private String destinationWarehouseName;
+
+
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/IExpenseDispatchOrderDetailService.java

@@ -18,10 +18,13 @@ package com.logpm.statistics.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.logpm.statistics.entity.ExpenseDispatchOrderDetailEntity;
+import com.logpm.statistics.query.ExpenseDispatchOrderDetailQuery;
 import com.logpm.statistics.vo.ExpenseDispatchOrderDetailVO;
 import com.logpm.statistics.excel.ExpenseDispatchOrderDetailExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
+
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -34,11 +37,9 @@ public interface IExpenseDispatchOrderDetailService extends BaseService<ExpenseD
 	/**
 	 * 自定义分页
 	 *
-	 * @param page
-	 * @param expenseDispatchOrderDetail
 	 * @return
 	 */
-	IPage<ExpenseDispatchOrderDetailVO> selectExpenseDispatchOrderDetailPage(IPage<ExpenseDispatchOrderDetailVO> page, ExpenseDispatchOrderDetailVO expenseDispatchOrderDetail);
+	IPage<ExpenseDispatchOrderDetailVO> selectExpenseDispatchOrderDetailPage(ExpenseDispatchOrderDetailQuery query);
 
 
 	/**
@@ -49,4 +50,5 @@ public interface IExpenseDispatchOrderDetailService extends BaseService<ExpenseD
 	 */
 	List<ExpenseDispatchOrderDetailExcel> exportExpenseDispatchOrderDetail(Wrapper<ExpenseDispatchOrderDetailEntity> queryWrapper);
 
+	void export(HttpServletResponse response, ExpenseDispatchOrderDetailQuery query);
 }

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/IExpenseDispatchTrainDetailChangeService.java

@@ -0,0 +1,52 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.statistics.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.logpm.statistics.entity.ExpenseDispatchTrainDetailChangeEntity;
+import com.logpm.statistics.vo.ExpenseDispatchTrainDetailChangeVO;
+import com.logpm.statistics.excel.ExpenseDispatchTrainDetailChangeExcel;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import java.util.List;
+
+/**
+ * 配送成本-车辆成本结算表-异动记录 服务类
+ *
+ * @author zqb
+ * @since 2024-12-03
+ */
+public interface IExpenseDispatchTrainDetailChangeService extends BaseService<ExpenseDispatchTrainDetailChangeEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param expenseDispatchTrainDetailChange
+	 * @return
+	 */
+	IPage<ExpenseDispatchTrainDetailChangeVO> selectExpenseDispatchTrainDetailChangePage(IPage<ExpenseDispatchTrainDetailChangeVO> page, ExpenseDispatchTrainDetailChangeVO expenseDispatchTrainDetailChange);
+
+
+	/**
+	 * 导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<ExpenseDispatchTrainDetailChangeExcel> exportExpenseDispatchTrainDetailChange(Wrapper<ExpenseDispatchTrainDetailChangeEntity> queryWrapper);
+
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/IExpenseDispatchTrainDetailService.java

@@ -18,10 +18,14 @@ package com.logpm.statistics.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.logpm.statistics.entity.ExpenseDispatchTrainDetailEntity;
+import com.logpm.statistics.query.ExpenseDispatchTrainDetailQuery;
+import com.logpm.statistics.vo.ExpenseDispatchTrainDetailChangeSaveVO;
 import com.logpm.statistics.vo.ExpenseDispatchTrainDetailVO;
 import com.logpm.statistics.excel.ExpenseDispatchTrainDetailExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
+
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -34,11 +38,9 @@ public interface IExpenseDispatchTrainDetailService extends BaseService<ExpenseD
 	/**
 	 * 自定义分页
 	 *
-	 * @param page
-	 * @param expenseDispatchTrainDetail
 	 * @return
 	 */
-	IPage<ExpenseDispatchTrainDetailVO> selectExpenseDispatchTrainDetailPage(IPage<ExpenseDispatchTrainDetailVO> page, ExpenseDispatchTrainDetailVO expenseDispatchTrainDetail);
+	IPage<ExpenseDispatchTrainDetailVO> selectExpenseDispatchTrainDetailPage(ExpenseDispatchTrainDetailQuery query);
 
 
 	/**
@@ -49,4 +51,7 @@ public interface IExpenseDispatchTrainDetailService extends BaseService<ExpenseD
 	 */
 	List<ExpenseDispatchTrainDetailExcel> exportExpenseDispatchTrainDetail(Wrapper<ExpenseDispatchTrainDetailEntity> queryWrapper);
 
+	boolean change(ExpenseDispatchTrainDetailChangeSaveVO vo);
+
+	void export(HttpServletResponse response, ExpenseDispatchTrainDetailQuery query);
 }

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/IExpenseDispatchWarehouseMonthService.java

@@ -16,12 +16,16 @@
  */
 package com.logpm.statistics.service;
 
+import cn.hutool.core.date.DateTime;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.logpm.statistics.entity.ExpenseDispatchWarehouseMonthEntity;
+import com.logpm.statistics.query.ExpenseDispatchTrainDetailMonthQuery;
 import com.logpm.statistics.vo.ExpenseDispatchWarehouseMonthVO;
 import com.logpm.statistics.excel.ExpenseDispatchWarehouseMonthExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
+
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -34,11 +38,9 @@ public interface IExpenseDispatchWarehouseMonthService extends BaseService<Expen
 	/**
 	 * 自定义分页
 	 *
-	 * @param page
-	 * @param expenseDispatchWarehouseMonth
 	 * @return
 	 */
-	IPage<ExpenseDispatchWarehouseMonthVO> selectExpenseDispatchWarehouseMonthPage(IPage<ExpenseDispatchWarehouseMonthVO> page, ExpenseDispatchWarehouseMonthVO expenseDispatchWarehouseMonth);
+	IPage<ExpenseDispatchWarehouseMonthVO> selectExpenseDispatchWarehouseMonthPage(ExpenseDispatchTrainDetailMonthQuery query);
 
 
 	/**
@@ -49,4 +51,8 @@ public interface IExpenseDispatchWarehouseMonthService extends BaseService<Expen
 	 */
 	List<ExpenseDispatchWarehouseMonthExcel> exportExpenseDispatchWarehouseMonth(Wrapper<ExpenseDispatchWarehouseMonthEntity> queryWrapper);
 
+	void expenseDispatchDetailMonthJob(DateTime statisticsTime);
+
+	void export(HttpServletResponse response, ExpenseDispatchTrainDetailMonthQuery query);
+
 }

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/IExpenseWarehousePackageDayService.java

@@ -19,8 +19,6 @@ package com.logpm.statistics.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.statistics.entity.ExpenseWarehousePackageDayEntity;
 import com.logpm.statistics.query.ExpenseWarehouseTransitMonthQuery;
-import com.logpm.statistics.vo.ExpenseWarehouseDayVO;
-import com.logpm.statistics.vo.ExpenseWarehousePackageDayVO;
 import com.logpm.statistics.vo.ExpenseWarehouseTransitMonthVO;
 import org.springblade.core.mp.base.BaseService;
 

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/IExpenseWarehouseTransitChangeImageService.java

@@ -0,0 +1,52 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.statistics.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.logpm.statistics.entity.ExpenseWarehouseTransitChangeImageEntity;
+import com.logpm.statistics.vo.ExpenseWarehouseTransitChangeImageVO;
+import com.logpm.statistics.excel.ExpenseWarehouseTransitChangeImageExcel;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import java.util.List;
+
+/**
+ * 仓储成本-中转仓作业成本-操作-图片 服务类
+ *
+ * @author zqb
+ * @since 2024-12-09
+ */
+public interface IExpenseWarehouseTransitChangeImageService extends BaseService<ExpenseWarehouseTransitChangeImageEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param expenseWarehouseTransitChangeImage
+	 * @return
+	 */
+	IPage<ExpenseWarehouseTransitChangeImageVO> selectExpenseWarehouseTransitChangeImagePage(IPage<ExpenseWarehouseTransitChangeImageVO> page, ExpenseWarehouseTransitChangeImageVO expenseWarehouseTransitChangeImage);
+
+
+	/**
+	 * 导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<ExpenseWarehouseTransitChangeImageExcel> exportExpenseWarehouseTransitChangeImage(Wrapper<ExpenseWarehouseTransitChangeImageEntity> queryWrapper);
+
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/IExpenseWarehouseTransitChangeService.java

@@ -0,0 +1,56 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.statistics.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.logpm.statistics.entity.ExpenseWarehouseTransitChangeEntity;
+import com.logpm.statistics.vo.ExpenseWarehouseTransitChangeVO;
+import com.logpm.statistics.excel.ExpenseWarehouseTransitChangeExcel;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import java.util.List;
+
+/**
+ * 仓储成本-中转仓作业成本-操作记录 服务类
+ *
+ * @author zqb
+ * @since 2024-12-09
+ */
+public interface IExpenseWarehouseTransitChangeService extends BaseService<ExpenseWarehouseTransitChangeEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param expenseWarehouseTransitChange
+	 * @return
+	 */
+	IPage<ExpenseWarehouseTransitChangeVO> selectExpenseWarehouseTransitChangePage(IPage<ExpenseWarehouseTransitChangeVO> page, ExpenseWarehouseTransitChangeVO expenseWarehouseTransitChange);
+
+
+	/**
+	 * 导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<ExpenseWarehouseTransitChangeExcel> exportExpenseWarehouseTransitChange(Wrapper<ExpenseWarehouseTransitChangeEntity> queryWrapper);
+
+	List<ExpenseWarehouseTransitChangeVO> listByMonthId(Long monthId, String type);
+
+	boolean saveDetail(ExpenseWarehouseTransitChangeVO expenseWarehouseTransitChange);
+
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/IExpenseWarehouseTransitMonthService.java

@@ -0,0 +1,47 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.statistics.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.statistics.entity.ExpenseWarehouseTransitMonthEntity;
+import com.logpm.statistics.query.ExpenseWarehouseTransitMonthQuery;
+import com.logpm.statistics.vo.ExpenseWarehouseTransitMonthVO;
+import org.springblade.core.mp.base.BaseService;
+
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 中转仓月度仓储作业账单 服务类
+ *
+ * @author zqb
+ * @since 2024-12-09
+ */
+public interface IExpenseWarehouseTransitMonthService extends BaseService<ExpenseWarehouseTransitMonthEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @return
+	 */
+	IPage<ExpenseWarehouseTransitMonthVO> selectExpenseWarehouseTransitMonthPage(ExpenseWarehouseTransitMonthQuery query);
+
+
+	ExpenseWarehouseTransitMonthVO detail(Long id, String type);
+
+	void exportTransitMonth(HttpServletResponse response, ExpenseWarehouseTransitMonthQuery query);
+
+	boolean confirmSettlement(ExpenseWarehouseTransitMonthVO vo);
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/IExpenseWarehouseTransitService.java

@@ -0,0 +1,55 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.statistics.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.logpm.statistics.entity.ExpenseWarehouseTransitEntity;
+import com.logpm.statistics.query.ExpenseWarehouseTransitQuery;
+import com.logpm.statistics.vo.ExpenseWarehouseTransitVO;
+import com.logpm.statistics.excel.ExpenseWarehouseTransitExcel;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 中转仓仓储作业明细 服务类
+ *
+ * @author zqb
+ * @since 2024-12-09
+ */
+public interface IExpenseWarehouseTransitService extends BaseService<ExpenseWarehouseTransitEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @return
+	 */
+	IPage<ExpenseWarehouseTransitVO> selectExpenseWarehouseTransitPage(ExpenseWarehouseTransitQuery query);
+
+
+	/**
+	 * 导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<ExpenseWarehouseTransitExcel> exportExpenseWarehouseTransit(Wrapper<ExpenseWarehouseTransitEntity> queryWrapper);
+
+	void exportTransit(HttpServletResponse response, ExpenseWarehouseTransitQuery query);
+
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/ExpenseDispatchOrderDetailServiceImpl.java

@@ -16,15 +16,20 @@
  */
 package com.logpm.statistics.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.statistics.entity.ExpenseDispatchOrderDetailEntity;
-import com.logpm.statistics.vo.ExpenseDispatchOrderDetailVO;
 import com.logpm.statistics.excel.ExpenseDispatchOrderDetailExcel;
 import com.logpm.statistics.mapper.ExpenseDispatchOrderDetailMapper;
+import com.logpm.statistics.query.ExpenseDispatchOrderDetailQuery;
 import com.logpm.statistics.service.IExpenseDispatchOrderDetailService;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.statistics.vo.ExpenseDispatchOrderDetailVO;
+import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.mp.support.Condition;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -37,8 +42,9 @@ import java.util.List;
 public class ExpenseDispatchOrderDetailServiceImpl extends BaseServiceImpl<ExpenseDispatchOrderDetailMapper, ExpenseDispatchOrderDetailEntity> implements IExpenseDispatchOrderDetailService {
 
 	@Override
-	public IPage<ExpenseDispatchOrderDetailVO> selectExpenseDispatchOrderDetailPage(IPage<ExpenseDispatchOrderDetailVO> page, ExpenseDispatchOrderDetailVO expenseDispatchOrderDetail) {
-		return page.setRecords(baseMapper.selectExpenseDispatchOrderDetailPage(page, expenseDispatchOrderDetail));
+	public IPage<ExpenseDispatchOrderDetailVO> selectExpenseDispatchOrderDetailPage(ExpenseDispatchOrderDetailQuery query) {
+		IPage<ExpenseDispatchOrderDetailVO> page = Condition.getPage(query);
+		return page.setRecords(baseMapper.selectExpenseDispatchOrderDetailPage(page, query));
 	}
 
 
@@ -51,4 +57,13 @@ public class ExpenseDispatchOrderDetailServiceImpl extends BaseServiceImpl<Expen
 		return expenseDispatchOrderDetailList;
 	}
 
+	@Override
+	public void export(HttpServletResponse response, ExpenseDispatchOrderDetailQuery query) {
+		IPage<ExpenseDispatchOrderDetailVO> page = Condition.getPage(query);
+		page.setSize(-1);
+		page.setCurrent(1);
+		List<ExpenseDispatchOrderDetailVO> list = baseMapper.selectExpenseDispatchOrderDetailPage(page, query);
+		ExcelUtil.export(response, list, ExpenseDispatchOrderDetailVO.class);
+	}
+
 }

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/ExpenseDispatchTrainDetailChangeServiceImpl.java

@@ -0,0 +1,54 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.statistics.service.impl;
+
+import com.logpm.statistics.entity.ExpenseDispatchTrainDetailChangeEntity;
+import com.logpm.statistics.vo.ExpenseDispatchTrainDetailChangeVO;
+import com.logpm.statistics.excel.ExpenseDispatchTrainDetailChangeExcel;
+import com.logpm.statistics.mapper.ExpenseDispatchTrainDetailChangeMapper;
+import com.logpm.statistics.service.IExpenseDispatchTrainDetailChangeService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import java.util.List;
+
+/**
+ * 配送成本-车辆成本结算表-异动记录 服务实现类
+ *
+ * @author zqb
+ * @since 2024-12-03
+ */
+@Service
+public class ExpenseDispatchTrainDetailChangeServiceImpl extends BaseServiceImpl<ExpenseDispatchTrainDetailChangeMapper, ExpenseDispatchTrainDetailChangeEntity> implements IExpenseDispatchTrainDetailChangeService {
+
+	@Override
+	public IPage<ExpenseDispatchTrainDetailChangeVO> selectExpenseDispatchTrainDetailChangePage(IPage<ExpenseDispatchTrainDetailChangeVO> page, ExpenseDispatchTrainDetailChangeVO expenseDispatchTrainDetailChange) {
+		return page.setRecords(baseMapper.selectExpenseDispatchTrainDetailChangePage(page, expenseDispatchTrainDetailChange));
+	}
+
+
+	@Override
+	public List<ExpenseDispatchTrainDetailChangeExcel> exportExpenseDispatchTrainDetailChange(Wrapper<ExpenseDispatchTrainDetailChangeEntity> queryWrapper) {
+		List<ExpenseDispatchTrainDetailChangeExcel> expenseDispatchTrainDetailChangeList = baseMapper.exportExpenseDispatchTrainDetailChange(queryWrapper);
+		//expenseDispatchTrainDetailChangeList.forEach(expenseDispatchTrainDetailChange -> {
+		//	expenseDispatchTrainDetailChange.setTypeName(DictCache.getValue(DictEnum.YES_NO, ExpenseDispatchTrainDetailChange.getType()));
+		//});
+		return expenseDispatchTrainDetailChangeList;
+	}
+
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/ExpenseDispatchTrainDetailServiceImpl.java

@@ -16,15 +16,29 @@
  */
 package com.logpm.statistics.service.impl;
 
+import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.statistics.entity.ExpenseDispatchTrainDetailChangeEntity;
 import com.logpm.statistics.entity.ExpenseDispatchTrainDetailEntity;
-import com.logpm.statistics.vo.ExpenseDispatchTrainDetailVO;
 import com.logpm.statistics.excel.ExpenseDispatchTrainDetailExcel;
 import com.logpm.statistics.mapper.ExpenseDispatchTrainDetailMapper;
+import com.logpm.statistics.query.ExpenseDispatchTrainDetailQuery;
+import com.logpm.statistics.service.IExpenseDispatchTrainDetailChangeService;
 import com.logpm.statistics.service.IExpenseDispatchTrainDetailService;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.statistics.vo.ExpenseDispatchTrainDetailChangeSaveVO;
+import com.logpm.statistics.vo.ExpenseDispatchTrainDetailVO;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -36,20 +50,67 @@ import java.util.List;
 @Service
 public class ExpenseDispatchTrainDetailServiceImpl extends BaseServiceImpl<ExpenseDispatchTrainDetailMapper, ExpenseDispatchTrainDetailEntity> implements IExpenseDispatchTrainDetailService {
 
+	@Resource
+	private IExpenseDispatchTrainDetailChangeService changeService;
+
 	@Override
-	public IPage<ExpenseDispatchTrainDetailVO> selectExpenseDispatchTrainDetailPage(IPage<ExpenseDispatchTrainDetailVO> page, ExpenseDispatchTrainDetailVO expenseDispatchTrainDetail) {
-		return page.setRecords(baseMapper.selectExpenseDispatchTrainDetailPage(page, expenseDispatchTrainDetail));
+	public IPage<ExpenseDispatchTrainDetailVO> selectExpenseDispatchTrainDetailPage(ExpenseDispatchTrainDetailQuery query) {
+		IPage<ExpenseDispatchTrainDetailVO> page = Condition.getPage(query);
+		return page.setRecords(baseMapper.selectExpenseDispatchTrainDetailPage(page, query));
 	}
 
 
 	@Override
 	public List<ExpenseDispatchTrainDetailExcel> exportExpenseDispatchTrainDetail(Wrapper<ExpenseDispatchTrainDetailEntity> queryWrapper) {
 		List<ExpenseDispatchTrainDetailExcel> expenseDispatchTrainDetailList = baseMapper.exportExpenseDispatchTrainDetail(queryWrapper);
-		//expenseDispatchTrainDetailList.forEach(expenseDispatchTrainDetail -> {
+		// expenseDispatchTrainDetailList.forEach(expenseDispatchTrainDetail -> {
 		//	expenseDispatchTrainDetail.setTypeName(DictCache.getValue(DictEnum.YES_NO, ExpenseDispatchTrainDetail.getType()));
 		//});
 		return expenseDispatchTrainDetailList;
 	}
 
+	@Override
+	public boolean change(ExpenseDispatchTrainDetailChangeSaveVO vo) {
+		Long id = vo.getId();
+		ExpenseDispatchTrainDetailEntity entity = this.getById(id);
+		if (ObjectUtil.isEmpty(entity)) {
+			throw new ServiceException("结算单不存在，请联系管理员。");
+		}
+		ExpenseDispatchTrainDetailEntity entity1 = new ExpenseDispatchTrainDetailEntity();
+		Double changeAmount = vo.getChangeAmount();
+		String changeNote = vo.getChangeNote();
+		Double changeAmount1 = entity.getChangeAmount();
+
+		if (ObjectUtil.isNotEmpty(changeAmount)) {
+			double add = NumberUtil.add(changeAmount, changeAmount1);
+			entity1.setChangeAmount(add);
+		} else {
+			entity1.setChangeAmount(changeAmount);
+		}
+		entity1.setChangeTime(new Date());
+		entity1.setChangeOperator(AuthUtil.getNickName());
+		entity1.setId(id);
+		this.updateById(entity1);
+
+		// 保存记录
+		ExpenseDispatchTrainDetailChangeEntity changeEntity = new ExpenseDispatchTrainDetailChangeEntity();
+		changeEntity.setChangeAmount(changeAmount);
+		changeEntity.setChangeNote(changeNote);
+		changeEntity.setChangeOperator(AuthUtil.getNickName());
+		changeEntity.setChangeTime(new Date());
+		changeService.save(changeEntity);
+		return true;
+	}
+
+	@Override
+	public void export(HttpServletResponse response, ExpenseDispatchTrainDetailQuery query) {
+		IPage<ExpenseDispatchTrainDetailVO> page = Condition.getPage(query);
+		page.setSize(-1);
+		page.setCurrent(1);
+		List<ExpenseDispatchTrainDetailVO> list = baseMapper.selectExpenseDispatchTrainDetailPage(page, query);
+		ExcelUtil.export(response, list, ExpenseDispatchTrainDetailVO.class);
+
+	}
+
 
 }

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/ExpenseDispatchWarehouseMonthServiceImpl.java

@@ -16,15 +16,25 @@
  */
 package com.logpm.statistics.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.statistics.entity.ExpenseDispatchWarehouseMonthEntity;
-import com.logpm.statistics.vo.ExpenseDispatchWarehouseMonthVO;
 import com.logpm.statistics.excel.ExpenseDispatchWarehouseMonthExcel;
 import com.logpm.statistics.mapper.ExpenseDispatchWarehouseMonthMapper;
+import com.logpm.statistics.query.ExpenseDispatchTrainDetailMonthQuery;
 import com.logpm.statistics.service.IExpenseDispatchWarehouseMonthService;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.statistics.vo.ExpenseDispatchWarehouseMonthVO;
+import io.prometheus.client.CollectorRegistry;
+import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.mp.support.Condition;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -36,19 +46,48 @@ import java.util.List;
 @Service
 public class ExpenseDispatchWarehouseMonthServiceImpl extends BaseServiceImpl<ExpenseDispatchWarehouseMonthMapper, ExpenseDispatchWarehouseMonthEntity> implements IExpenseDispatchWarehouseMonthService {
 
+	private final CollectorRegistry collectorRegistry;
+
+	public ExpenseDispatchWarehouseMonthServiceImpl(CollectorRegistry collectorRegistry) {
+		this.collectorRegistry = collectorRegistry;
+	}
+
 	@Override
-	public IPage<ExpenseDispatchWarehouseMonthVO> selectExpenseDispatchWarehouseMonthPage(IPage<ExpenseDispatchWarehouseMonthVO> page, ExpenseDispatchWarehouseMonthVO expenseDispatchWarehouseMonth) {
-		return page.setRecords(baseMapper.selectExpenseDispatchWarehouseMonthPage(page, expenseDispatchWarehouseMonth));
+	public IPage<ExpenseDispatchWarehouseMonthVO> selectExpenseDispatchWarehouseMonthPage(ExpenseDispatchTrainDetailMonthQuery query) {
+		IPage<ExpenseDispatchWarehouseMonthVO> page = Condition.getPage(query);
+		return page.setRecords(baseMapper.selectExpenseDispatchWarehouseMonthPage(page, query));
 	}
 
 
 	@Override
 	public List<ExpenseDispatchWarehouseMonthExcel> exportExpenseDispatchWarehouseMonth(Wrapper<ExpenseDispatchWarehouseMonthEntity> queryWrapper) {
 		List<ExpenseDispatchWarehouseMonthExcel> expenseDispatchWarehouseMonthList = baseMapper.exportExpenseDispatchWarehouseMonth(queryWrapper);
-		//expenseDispatchWarehouseMonthList.forEach(expenseDispatchWarehouseMonth -> {
+		// expenseDispatchWarehouseMonthList.forEach(expenseDispatchWarehouseMonth -> {
 		//	expenseDispatchWarehouseMonth.setTypeName(DictCache.getValue(DictEnum.YES_NO, ExpenseDispatchWarehouseMonth.getType()));
 		//});
 		return expenseDispatchWarehouseMonthList;
 	}
 
+	@Override
+	public void expenseDispatchDetailMonthJob(DateTime statisticsTime) {
+		if (ObjectUtil.isEmpty(statisticsTime)) {
+			return;
+		}
+		int year = DateUtil.year(statisticsTime);
+		int month = DateUtil.month(statisticsTime) + 1;
+		List<ExpenseDispatchWarehouseMonthEntity> ls = baseMapper.expenseDispatchDetailMonthJob(year, month);
+		if (CollUtil.isNotEmpty(ls)) {
+			this.saveBatch(ls);
+		}
+	}
+
+	@Override
+	public void export(HttpServletResponse response, ExpenseDispatchTrainDetailMonthQuery query) {
+		IPage<ExpenseDispatchWarehouseMonthVO> page = Condition.getPage(query);
+		page.setSize(-1);
+		page.setCurrent(1);
+		List<ExpenseDispatchWarehouseMonthVO> list = baseMapper.selectExpenseDispatchWarehouseMonthPage(page, query);
+		ExcelUtil.export(response, list, ExpenseDispatchWarehouseMonthVO.class);
+	}
+
 }

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/ExpenseWarehouseTransitChangeImageServiceImpl.java

@@ -0,0 +1,54 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.statistics.service.impl;
+
+import com.logpm.statistics.entity.ExpenseWarehouseTransitChangeImageEntity;
+import com.logpm.statistics.vo.ExpenseWarehouseTransitChangeImageVO;
+import com.logpm.statistics.excel.ExpenseWarehouseTransitChangeImageExcel;
+import com.logpm.statistics.mapper.ExpenseWarehouseTransitChangeImageMapper;
+import com.logpm.statistics.service.IExpenseWarehouseTransitChangeImageService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import java.util.List;
+
+/**
+ * 仓储成本-中转仓作业成本-操作-图片 服务实现类
+ *
+ * @author zqb
+ * @since 2024-12-09
+ */
+@Service
+public class ExpenseWarehouseTransitChangeImageServiceImpl extends BaseServiceImpl<ExpenseWarehouseTransitChangeImageMapper, ExpenseWarehouseTransitChangeImageEntity> implements IExpenseWarehouseTransitChangeImageService {
+
+	@Override
+	public IPage<ExpenseWarehouseTransitChangeImageVO> selectExpenseWarehouseTransitChangeImagePage(IPage<ExpenseWarehouseTransitChangeImageVO> page, ExpenseWarehouseTransitChangeImageVO expenseWarehouseTransitChangeImage) {
+		return page.setRecords(baseMapper.selectExpenseWarehouseTransitChangeImagePage(page, expenseWarehouseTransitChangeImage));
+	}
+
+
+	@Override
+	public List<ExpenseWarehouseTransitChangeImageExcel> exportExpenseWarehouseTransitChangeImage(Wrapper<ExpenseWarehouseTransitChangeImageEntity> queryWrapper) {
+		List<ExpenseWarehouseTransitChangeImageExcel> expenseWarehouseTransitChangeImageList = baseMapper.exportExpenseWarehouseTransitChangeImage(queryWrapper);
+		//expenseWarehouseTransitChangeImageList.forEach(expenseWarehouseTransitChangeImage -> {
+		//	expenseWarehouseTransitChangeImage.setTypeName(DictCache.getValue(DictEnum.YES_NO, ExpenseWarehouseTransitChangeImage.getType()));
+		//});
+		return expenseWarehouseTransitChangeImageList;
+	}
+
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/ExpenseWarehouseTransitChangeServiceImpl.java

@@ -0,0 +1,162 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.statistics.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.logpm.statistics.entity.ExpenseWarehouseTransitChangeEntity;
+import com.logpm.statistics.entity.ExpenseWarehouseTransitChangeImageEntity;
+import com.logpm.statistics.entity.ExpenseWarehouseTransitMonthEntity;
+import com.logpm.statistics.excel.ExpenseWarehouseTransitChangeExcel;
+import com.logpm.statistics.mapper.ExpenseWarehouseTransitChangeMapper;
+import com.logpm.statistics.mapper.ExpenseWarehouseTransitMonthMapper;
+import com.logpm.statistics.service.IExpenseWarehouseTransitChangeImageService;
+import com.logpm.statistics.service.IExpenseWarehouseTransitChangeService;
+import com.logpm.statistics.vo.ExpenseWarehouseTransitChangeImageVO;
+import com.logpm.statistics.vo.ExpenseWarehouseTransitChangeVO;
+import com.logpm.statistics.wrapper.ExpenseWarehouseTransitChangeImageWrapper;
+import lombok.AllArgsConstructor;
+import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 仓储成本-中转仓作业成本-操作记录 服务实现类
+ *
+ * @author zqb
+ * @since 2024-12-09
+ */
+@Service
+@AllArgsConstructor
+public class ExpenseWarehouseTransitChangeServiceImpl extends BaseServiceImpl<ExpenseWarehouseTransitChangeMapper, ExpenseWarehouseTransitChangeEntity> implements IExpenseWarehouseTransitChangeService {
+
+
+	private final ExpenseWarehouseTransitMonthMapper monthMapper;
+	private final IExpenseWarehouseTransitChangeImageService imageService;
+
+	@Override
+	public IPage<ExpenseWarehouseTransitChangeVO> selectExpenseWarehouseTransitChangePage(IPage<ExpenseWarehouseTransitChangeVO> page, ExpenseWarehouseTransitChangeVO expenseWarehouseTransitChange) {
+		return page.setRecords(baseMapper.selectExpenseWarehouseTransitChangePage(page, expenseWarehouseTransitChange));
+	}
+
+
+	@Override
+	public List<ExpenseWarehouseTransitChangeExcel> exportExpenseWarehouseTransitChange(Wrapper<ExpenseWarehouseTransitChangeEntity> queryWrapper) {
+		List<ExpenseWarehouseTransitChangeExcel> expenseWarehouseTransitChangeList = baseMapper.exportExpenseWarehouseTransitChange(queryWrapper);
+		// expenseWarehouseTransitChangeList.forEach(expenseWarehouseTransitChange -> {
+		//	expenseWarehouseTransitChange.setTypeName(DictCache.getValue(DictEnum.YES_NO, ExpenseWarehouseTransitChange.getType()));
+		//});
+		return expenseWarehouseTransitChangeList;
+	}
+
+	@Override
+	public List<ExpenseWarehouseTransitChangeVO> listByMonthId(Long monthId, String type) {
+		List<ExpenseWarehouseTransitChangeVO> res = new ArrayList<>();
+		List<ExpenseWarehouseTransitChangeEntity> list = this.list(Wrappers.<ExpenseWarehouseTransitChangeEntity>lambdaQuery()
+			.eq(ExpenseWarehouseTransitChangeEntity::getDetailId, monthId)
+			.eq(ExpenseWarehouseTransitChangeEntity::getType, type)
+		);
+		if (CollUtil.isNotEmpty(list)) {
+			List<Long> collect = list.stream().map(ExpenseWarehouseTransitChangeEntity::getId).collect(Collectors.toList());
+			List<ExpenseWarehouseTransitChangeImageEntity> changeImageEntities = imageService.list(Wrappers.<ExpenseWarehouseTransitChangeImageEntity>lambdaQuery().in(ExpenseWarehouseTransitChangeImageEntity::getChangeId, collect));
+			Map<Long, List<ExpenseWarehouseTransitChangeImageEntity>> imageMap = new HashMap<>();
+			if (CollUtil.isNotEmpty(changeImageEntities)) {
+				imageMap = changeImageEntities.stream().collect(Collectors.groupingBy(ExpenseWarehouseTransitChangeImageEntity::getChangeId));
+			}
+			for (ExpenseWarehouseTransitChangeEntity expenseWarehouseTransitChangeEntity : list) {
+				ExpenseWarehouseTransitChangeVO expenseWarehouseTransitChangeVO = new ExpenseWarehouseTransitChangeVO();
+				expenseWarehouseTransitChangeVO.setChangeAmount(expenseWarehouseTransitChangeEntity.getChangeAmount());
+				expenseWarehouseTransitChangeVO.setChangeNote(expenseWarehouseTransitChangeEntity.getChangeNote());
+				expenseWarehouseTransitChangeVO.setChangeOperator(expenseWarehouseTransitChangeEntity.getChangeOperator());
+				expenseWarehouseTransitChangeVO.setChangeTime(expenseWarehouseTransitChangeEntity.getChangeTime());
+				expenseWarehouseTransitChangeVO.setChangeImageList(ExpenseWarehouseTransitChangeImageWrapper.build().listVO(imageMap.get(expenseWarehouseTransitChangeEntity.getId())));
+				res.add(expenseWarehouseTransitChangeVO);
+			}
+		}
+		return res;
+	}
+
+	@Override
+	@Transactional
+	public boolean saveDetail(ExpenseWarehouseTransitChangeVO expenseWarehouseTransitChange) {
+		String type = expenseWarehouseTransitChange.getType();
+		if (StrUtil.isEmpty(type)) {
+			throw new ServiceException("类型不能为空");
+		}
+		Long detailId = expenseWarehouseTransitChange.getDetailId();
+		if (ObjectUtil.isNotEmpty(detailId)) {
+			ExpenseWarehouseTransitMonthEntity expenseWarehouseTransitMonthEntity = monthMapper.selectById(detailId);
+			if (ObjectUtil.isEmpty(expenseWarehouseTransitMonthEntity)) {
+				throw new ServiceException("结算单不存在");
+			}
+			BigDecimal settledAmount = ObjectUtil.isEmpty(expenseWarehouseTransitMonthEntity.getSettledAmount()) ? BigDecimal.ZERO : expenseWarehouseTransitMonthEntity.getSettledAmount();
+			BigDecimal pendingSettlementAmount = expenseWarehouseTransitMonthEntity.getPendingSettlementAmount();
+			BigDecimal monthChangeAmount = ObjectUtil.isNotEmpty(expenseWarehouseTransitMonthEntity.getChangeAmount()) ? expenseWarehouseTransitMonthEntity.getChangeAmount() : BigDecimal.ZERO;
+			BigDecimal changeAmount = expenseWarehouseTransitChange.getChangeAmount();
+			ExpenseWarehouseTransitChangeEntity changeEntity = new ExpenseWarehouseTransitChangeEntity();
+			BeanUtil.copyProperties(expenseWarehouseTransitChange, changeEntity);
+			changeEntity.setChangeTime(new Date());
+			changeEntity.setChangeOperator(AuthUtil.getNickName());
+			this.save(changeEntity);
+			// 保存图片
+			List<ExpenseWarehouseTransitChangeImageVO> changeImageList = expenseWarehouseTransitChange.getChangeImageList();
+			if (CollUtil.isNotEmpty(changeImageList)) {
+				List<ExpenseWarehouseTransitChangeImageEntity> imageEntities = changeImageList.stream().map(changeImage -> {
+					ExpenseWarehouseTransitChangeImageEntity imageEntity = new ExpenseWarehouseTransitChangeImageEntity();
+					imageEntity.setChangeId(changeEntity.getId());
+					imageEntity.setImageUrl(changeImage.getImageUrl());
+					return imageEntity;
+				}).collect(Collectors.toList());
+				if (CollUtil.isNotEmpty(imageEntities)) {
+					imageService.saveBatch(imageEntities);
+				}
+			}
+			// 计算剩余待结算金额
+			ExpenseWarehouseTransitMonthEntity updateEntity = new ExpenseWarehouseTransitMonthEntity();
+			if ("异常".equals(type)) {
+				updateEntity.setPendingSettlementAmount(pendingSettlementAmount.add(changeAmount));
+				updateEntity.setChangeAmount(monthChangeAmount.add(changeAmount));
+			} else {
+				updateEntity.setSettledAmount(settledAmount.add(changeAmount));
+				updateEntity.setPendingSettlementAmount(pendingSettlementAmount.subtract(changeAmount));
+				updateEntity.setSettlementUser(AuthUtil.getNickName());
+				updateEntity.setSettlementTime(new Date());
+			}
+			updateEntity.setId(detailId);
+			updateEntity.setSettlementStatus("部分结算");
+			monthMapper.updateById(updateEntity);
+			return true;
+		}
+		return false;
+	}
+
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/ExpenseWarehouseTransitMonthServiceImpl.java

@@ -0,0 +1,103 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.statistics.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.statistics.entity.ExpenseWarehouseTransitMonthEntity;
+import com.logpm.statistics.mapper.ExpenseWarehouseTransitMonthMapper;
+import com.logpm.statistics.query.ExpenseWarehouseTransitMonthQuery;
+import com.logpm.statistics.service.IExpenseWarehouseTransitChangeService;
+import com.logpm.statistics.service.IExpenseWarehouseTransitMonthService;
+import com.logpm.statistics.vo.ExpenseWarehouseTransitChangeVO;
+import com.logpm.statistics.vo.ExpenseWarehouseTransitMonthVO;
+import com.logpm.statistics.wrapper.ExpenseWarehouseTransitMonthWrapper;
+import lombok.AllArgsConstructor;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.mp.support.Condition;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 中转仓月度仓储作业账单 服务实现类
+ *
+ * @author zqb
+ * @since 2024-12-09
+ */
+@Service
+@AllArgsConstructor
+public class ExpenseWarehouseTransitMonthServiceImpl extends BaseServiceImpl<ExpenseWarehouseTransitMonthMapper, ExpenseWarehouseTransitMonthEntity> implements IExpenseWarehouseTransitMonthService {
+
+	private final IExpenseWarehouseTransitChangeService expenseWarehouseTransitChangeService;
+
+	@Override
+	public IPage<ExpenseWarehouseTransitMonthVO> selectExpenseWarehouseTransitMonthPage(ExpenseWarehouseTransitMonthQuery query) {
+		IPage<ExpenseWarehouseTransitMonthVO> page = Condition.getPage(query);
+		return page.setRecords(baseMapper.selectExpenseWarehouseTransitMonthPage(page, query));
+	}
+
+	@Override
+	public ExpenseWarehouseTransitMonthVO detail(Long id, String type) {
+		if (ObjectUtil.isEmpty(id)) {
+			throw new ServiceException("主键不能为空");
+		}
+		ExpenseWarehouseTransitMonthEntity expenseWarehouseTransitMonthEntity = baseMapper.selectById(id);
+		if (ObjectUtil.isEmpty(expenseWarehouseTransitMonthEntity)) {
+			throw new ServiceException("结算单不存在");
+		}
+		List<ExpenseWarehouseTransitChangeVO> changeVOS = expenseWarehouseTransitChangeService.listByMonthId(id, type);
+		ExpenseWarehouseTransitMonthVO expenseWarehouseTransitMonthVO = ExpenseWarehouseTransitMonthWrapper.build().entityVO(expenseWarehouseTransitMonthEntity);
+		expenseWarehouseTransitMonthVO.setChangeList(changeVOS);
+		return expenseWarehouseTransitMonthVO;
+	}
+
+	@Override
+	public void exportTransitMonth(HttpServletResponse response, ExpenseWarehouseTransitMonthQuery query) {
+		IPage<ExpenseWarehouseTransitMonthVO> page = Condition.getPage(query);
+		page.setSize(-1);
+		page.setCurrent(1);
+		List<ExpenseWarehouseTransitMonthVO> list = baseMapper.selectExpenseWarehouseTransitMonthPage(page, query);
+		ExcelUtil.export(response, list, ExpenseWarehouseTransitMonthVO.class);
+	}
+
+	@Override
+	public boolean confirmSettlement(ExpenseWarehouseTransitMonthVO vo) {
+		if (ObjectUtil.isEmpty(vo.getId())) {
+			throw new ServiceException("唯一标识不能为空");
+		}
+		ExpenseWarehouseTransitMonthEntity expenseWarehouseTransitMonthEntity = baseMapper.selectById(vo.getId());
+		if(ObjectUtil.isEmpty(expenseWarehouseTransitMonthEntity)){
+			throw new ServiceException("结算单不存在");
+		}
+		// 校验待结算金额是否为0
+		if(expenseWarehouseTransitMonthEntity.getPendingSettlementAmount().compareTo(BigDecimal.ZERO) != 0){
+			throw new ServiceException("待结算金额不为0，无法确认结算");
+		}
+		ExpenseWarehouseTransitMonthEntity entity = new ExpenseWarehouseTransitMonthEntity();
+		entity.setSettlementStatus("已结算");
+		entity.setId(vo.getId());
+		baseMapper.updateById(entity);
+		return true;
+	}
+
+
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/ExpenseWarehouseTransitServiceImpl.java

@@ -0,0 +1,69 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.statistics.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.statistics.entity.ExpenseWarehouseTransitEntity;
+import com.logpm.statistics.excel.ExpenseWarehouseTransitExcel;
+import com.logpm.statistics.mapper.ExpenseWarehouseTransitMapper;
+import com.logpm.statistics.query.ExpenseWarehouseTransitQuery;
+import com.logpm.statistics.service.IExpenseWarehouseTransitService;
+import com.logpm.statistics.vo.ExpenseWarehouseTransitVO;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.mp.support.Condition;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 中转仓仓储作业明细 服务实现类
+ *
+ * @author zqb
+ * @since 2024-12-09
+ */
+@Service
+public class ExpenseWarehouseTransitServiceImpl extends BaseServiceImpl<ExpenseWarehouseTransitMapper, ExpenseWarehouseTransitEntity> implements IExpenseWarehouseTransitService {
+
+	@Override
+	public IPage<ExpenseWarehouseTransitVO> selectExpenseWarehouseTransitPage(ExpenseWarehouseTransitQuery query) {
+		IPage<ExpenseWarehouseTransitVO> page = Condition.getPage(query);
+		return page.setRecords(baseMapper.selectExpenseWarehouseTransitPage(page, query));
+	}
+
+
+	@Override
+	public List<ExpenseWarehouseTransitExcel> exportExpenseWarehouseTransit(Wrapper<ExpenseWarehouseTransitEntity> queryWrapper) {
+		List<ExpenseWarehouseTransitExcel> expenseWarehouseTransitList = baseMapper.exportExpenseWarehouseTransit(queryWrapper);
+		//expenseWarehouseTransitList.forEach(expenseWarehouseTransit -> {
+		//	expenseWarehouseTransit.setTypeName(DictCache.getValue(DictEnum.YES_NO, ExpenseWarehouseTransit.getType()));
+		//});
+		return expenseWarehouseTransitList;
+	}
+
+	@Override
+	public void exportTransit(HttpServletResponse response, ExpenseWarehouseTransitQuery query) {
+		IPage<ExpenseWarehouseTransitVO> page = Condition.getPage(query);
+		page.setSize(-1);
+		page.setCurrent(1);
+		List<ExpenseWarehouseTransitVO> list = baseMapper.selectExpenseWarehouseTransitPage(page, query);
+		ExcelUtil.export(response, list, ExpenseWarehouseTransitVO.class);
+	}
+
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/vo/ExpenseDispatchOrderDetailVO.java

@@ -16,10 +16,9 @@
  */
 package com.logpm.statistics.vo;
 
-import com.logpm.statistics.entity.ExpenseDispatchOrderDetailEntity;
-import org.springblade.core.tool.node.INode;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 /**
  * 配送成本-订单总成本明细 视图实体类
@@ -28,8 +27,235 @@ import lombok.EqualsAndHashCode;
  * @since 2024-07-29
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
-public class ExpenseDispatchOrderDetailVO extends ExpenseDispatchOrderDetailEntity {
-	private static final long serialVersionUID = 1L;
+public class ExpenseDispatchOrderDetailVO {
+
+	/**
+	 * 品牌
+	 */
+	@ApiModelProperty(value = "品牌")
+	@ExcelProperty("品牌")
+	private String brand;
+	/**
+	 * 订单编号
+	 */
+	@ApiModelProperty(value = "订单编号")
+	@ExcelProperty("订单编号")
+	private String orderCode;
+	/**
+	 * 运单号
+	 */
+	@ApiModelProperty(value = "运单号")
+	@ExcelProperty("运单号")
+	private String waybillNumber;
+	/**
+	 * 目的仓
+	 */
+	@ApiModelProperty(value = "目的仓")
+	@ExcelProperty("目的仓")
+	private String destinationWarehouse;
+	/**
+	 * 发货单位
+	 */
+	@ApiModelProperty(value = "发货单位")
+	@ExcelProperty("发货单位")
+	private String shippingOrg;
+	/**
+	 * 收货单位
+	 */
+	@ApiModelProperty(value = "收货单位")
+	@ExcelProperty("收货单位")
+	private String consigneeOrg;
+	/**
+	 * 配送类型
+	 */
+	@ApiModelProperty(value = "配送类型")
+	@ExcelProperty("配送类型")
+	private String waybillType;
+	/**
+	 * 开单时间
+	 */
+	@ApiModelProperty(value = "开单时间")
+	@ExcelProperty("开单时间")
+	private String documentCreationTime;
+	/**
+	 * 总件数
+	 */
+	@ApiModelProperty(value = "总件数")
+	@ExcelProperty("总件数")
+	private Integer totalQuantity;
+	/**
+	 * 复核件数
+	 */
+	@ApiModelProperty(value = "复核件数")
+	@ExcelProperty("复核件数")
+	private Integer reviewNumber;
+	/**
+	 * 结算件数
+	 */
+	@ApiModelProperty(value = "结算件数")
+	@ExcelProperty("结算件数")
+	private Integer settlementNumber;
+	/**
+	 * 总重量
+	 */
+	@ApiModelProperty(value = "总重量")
+	@ExcelProperty("总重量")
+	private Double totalWeight;
+	/**
+	 * 总体积
+	 */
+	@ApiModelProperty(value = "总体积")
+	@ExcelProperty("总体积")
+	private Double totalVolume;
+	/**
+	 * 配送总成本
+	 */
+	@ApiModelProperty(value = "配送总成本")
+	@ExcelProperty("配送总成本")
+	private Double totalDistributionCost;
+	/**
+	 * 配送成本
+	 */
+	@ApiModelProperty(value = "配送成本")
+	@ExcelProperty("配送成本")
+	private Double distributionCost;
+	/**
+	 * 撕标签成本
+	 */
+	@ApiModelProperty(value = "撕标签成本")
+	@ExcelProperty("撕标签成本")
+	private Double inventoryDistributionCost;
+	/**
+	 * 上楼费成本
+	 */
+	@ApiModelProperty(value = "上楼费成本")
+	@ExcelProperty("上楼费成本")
+	private Double stairCarryingFee;
+	/**
+	 * 分货费成本
+	 */
+	@ApiModelProperty(value = "分货费成本")
+	@ExcelProperty("分货费成本")
+	private Double goodsAllocationCost;
+	/**
+	 * 平移费成本
+	 */
+	@ApiModelProperty(value = "平移费成本")
+	@ExcelProperty("平移费成本")
+	private Double repositioningCost;
+	/**
+	 * 装卸费成本
+	 */
+	@ApiModelProperty(value = "装卸费成本")
+	@ExcelProperty("装卸费成本")
+	private Double handlingCost;
+	/**
+	 * 公里数成本
+	 */
+	@ApiModelProperty(value = "公里数成本")
+	@ExcelProperty("公里数成本")
+	private Double mileageCost;
+	/**
+	 * 补贴公里数成本
+	 */
+	@ApiModelProperty(value = "补贴公里数成本")
+	@ExcelProperty("补贴公里数成本")
+	private Double subsidizedKilometerCost;
+	/**
+	 * 超区公里数成本
+	 */
+	@ApiModelProperty(value = "超区公里数成本")
+	@ExcelProperty("超区公里数成本")
+	private Double excessZoneMileageCost;
+	/**
+	 * 点位补贴费成本
+	 */
+	@ApiModelProperty(value = "点位补贴费成本")
+	@ExcelProperty("点位补贴费成本")
+	private Double locationSubsidyCost;
+	/**
+	 * 保底费成本
+	 */
+	@ApiModelProperty(value = "保底费成本")
+	@ExcelProperty("保底费成本")
+	private Double minimumGuaranteeCost;
+	/**
+	 * 油费成本
+	 */
+	@ApiModelProperty(value = "油费成本")
+	@ExcelProperty("油费成本")
+	private Double fuelCost;
+	/**
+	 * 其他成本
+	 */
+	@ApiModelProperty(value = "其他成本")
+	@ExcelProperty("其他成本")
+	private Double otherCosts;
+	/**
+	 * 异动金额
+	 */
+	@ApiModelProperty(value = "异动金额")
+	@ExcelProperty("异动金额")
+	private Double changeAmount;
+	/**
+	 * 配送公里数
+	 */
+	@ApiModelProperty(value = "配送公里数")
+	@ExcelProperty("配送公里数")
+	private Double deliveryKilometers;
+	/**
+	 * 发货人
+	 */
+	@ApiModelProperty(value = "发货人")
+	@ExcelProperty("发货人")
+	private String shipper;
+	/**
+	 * 发货人手机
+	 */
+	@ApiModelProperty(value = "发货人手机")
+	@ExcelProperty("发货人手机")
+	private String shippingPhone;
+	/**
+	 * 发货地址
+	 */
+	@ApiModelProperty(value = "发货地址")
+	@ExcelProperty("发货地址")
+	private String shippingAddress;
+	/**
+	 * 到站
+	 */
+	@ApiModelProperty(value = "到站")
+	@ExcelProperty("到站")
+	private String arrivalStation;
+	/**
+	 * 发站仓
+	 */
+	@ApiModelProperty(value = "发站仓")
+	@ExcelProperty("发站仓")
+	private String departureWarehouse;
+	/**
+	 * 收货人
+	 */
+	@ApiModelProperty(value = "收货人")
+	@ExcelProperty("收货人")
+	private String consignee;
+	/**
+	 * 收货人手机号
+	 */
+	@ApiModelProperty(value = "收货人手机号")
+	@ExcelProperty("收货人手机号")
+	private String consigneePhone;
+	/**
+	 * 收货地址
+	 */
+	@ApiModelProperty(value = "收货地址")
+	@ExcelProperty("收货地址")
+	private String consigneeAddress;
+	/**
+	 * 客户车次
+	 */
+	@ApiModelProperty(value = "客户车次")
+	@ExcelProperty("客户车次")
+	private String customerTrip;
 
 }

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/vo/ExpenseDispatchTrainDetailChangeSaveVO.java

@@ -0,0 +1,53 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.statistics.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 配送成本-车辆成本结算表-异动记录 视图实体类
+ *
+ * @author zqb
+ * @since 2024-12-03
+ */
+@Data
+public class ExpenseDispatchTrainDetailChangeSaveVO {
+
+	/**
+	 * 异动金额
+	 */
+	@NotNull(message = "异动费用不能为空")
+	@ApiModelProperty(value = "异动费用")
+	private Double changeAmount;
+	/**
+	 * 异动备注
+	 */
+	@NotEmpty(message = "异动费用备注不能为空")
+	@ApiModelProperty(value = "异动费用备注")
+	private String changeNote;
+	/**
+	 * 结算id
+	 */
+	@NotNull(message = "结算id不能为空")
+	@ApiModelProperty(value = "结算id")
+	private Long id;
+
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/vo/ExpenseDispatchTrainDetailChangeVO.java

@@ -0,0 +1,35 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.statistics.vo;
+
+import com.logpm.statistics.entity.ExpenseDispatchTrainDetailChangeEntity;
+import org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 配送成本-车辆成本结算表-异动记录 视图实体类
+ *
+ * @author zqb
+ * @since 2024-12-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ExpenseDispatchTrainDetailChangeVO extends ExpenseDispatchTrainDetailChangeEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/vo/ExpenseDispatchTrainDetailVO.java

@@ -16,10 +16,12 @@
  */
 package com.logpm.statistics.vo;
 
-import com.logpm.statistics.entity.ExpenseDispatchTrainDetailEntity;
-import org.springblade.core.tool.node.INode;
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
+
+import java.util.Date;
 
 /**
  * 配送成本-车次成本明细表 视图实体类
@@ -28,8 +30,269 @@ import lombok.EqualsAndHashCode;
  * @since 2024-07-29
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
-public class ExpenseDispatchTrainDetailVO extends ExpenseDispatchTrainDetailEntity {
-	private static final long serialVersionUID = 1L;
+public class ExpenseDispatchTrainDetailVO {
+
+	@ApiModelProperty(value = "主键")
+	@ExcelIgnore
+	private Long id;
+
+	/**
+	 * 配送车辆
+	 */
+	@ApiModelProperty(value = "配送车辆")
+	@ExcelProperty("配送车辆")
+	private String deliveryVehicle;
+	/**
+	 * 配送车型
+	 */
+	@ApiModelProperty(value = "配送车型")
+	@ExcelProperty("配送车型")
+	private String distributionModel;
+	/**
+	 * 车次号
+	 */
+	@ApiModelProperty(value = "车次号")
+	@ExcelProperty("车次号")
+	private String trainNumber;
+	/**
+	 * 结算状态
+	 */
+	@ApiModelProperty(value = "结算状态")
+	@ExcelProperty("结算状态 ")
+	private String settlementStatus;
+	/**
+	 * 配送日期
+	 */
+	@ApiModelProperty(value = "配送日期")
+	@ExcelProperty("车次号")
+	private String deliveryDate;
+	/**
+	 * 目的仓
+	 */
+	@ApiModelProperty(value = "目的仓")
+	@ExcelProperty("目的仓")
+	private String destinationWarehouse;
+	/**
+	 * 配送类型
+	 */
+	@ApiModelProperty(value = "配送类型")
+	@ExcelProperty("配送类型")
+	private String distributionType;
+	/**
+	 * 客户名称
+	 */
+	@ApiModelProperty(value = "客户名称")
+	@ExcelIgnore
+	private String customerName;
+	/**
+	 * 订单自编号
+	 */
+	@ApiModelProperty(value = "订单自编号")
+	@ExcelIgnore
+	private String orderCode;
+	/**
+	 * 承运方名称
+	 */
+	@ApiModelProperty(value = "承运方名称")
+	@ExcelProperty("承运方名称")
+	private String carrierName;
+	/**
+	 * 承运方类型
+	 */
+	@ApiModelProperty(value = "承运方类型")
+	@ExcelIgnore
+	private String carrierType;
+	/**
+	 * 配送司机
+	 */
+	@ApiModelProperty(value = "配送司机")
+	@ExcelProperty("配送司机")
+	private String deliveryDriver;
+	/**
+	 * 计划总件数
+	 */
+	@ApiModelProperty(value = "计划总件数")
+	@ExcelProperty("计划总件数")
+	private Integer plannedTotalQuantity;
+	/**
+	 * 订单总数
+	 */
+	@ApiModelProperty(value = "订单总数")
+	@ExcelProperty("订单总数")
+	private Integer totalOrderQuantity;
+	/**
+	 * 库存品件数
+	 */
+	@ApiModelProperty(value = "库存品件数")
+	@ExcelProperty("库存品件数")
+	private Integer inventoryItemCount;
+	/**
+	 * 装车总件数
+	 */
+	@ApiModelProperty(value = "装车总件数")
+	@ExcelProperty("装车总件数")
+	private Integer totalLoadedPieces;
+	/**
+	 * 签收总件数
+	 */
+	@ApiModelProperty(value = "签收总件数")
+	@ExcelProperty("签收总件数")
+	private Integer totalReceiptCost;
+	/**
+	 * 配送总成本
+	 */
+	@ApiModelProperty(value = "配送总成本")
+	@ExcelProperty("配送总成本")
+	private Double totalDistributionCost;
+	/**
+	 * 配送成本
+	 */
+	@ApiModelProperty(value = "配送成本")
+	@ExcelProperty("配送成本")
+	private Double distributionCost;
+	/**
+	 * 整车成本
+	 */
+	@ApiModelProperty(value = "整车成本")
+	@ExcelProperty("整车成本")
+	private Double wholeVehicleCost;
+	/**
+	 * 库存品配送成本
+	 */
+	@ApiModelProperty(value = "库存品配送成本")
+	@ExcelProperty("库存品配送成本")
+	private Double inventoryDistributionCost;
+	/**
+	 * 撕标签成本
+	 */
+	@ApiModelProperty(value = "撕标签成本")
+	@ExcelIgnore
+	private Double tagRemovalCost;
+	/**
+	 * 上楼费成本
+	 */
+	@ApiModelProperty(value = "上楼费成本")
+	@ExcelProperty("上楼费成本")
+	private Double stairCarryingFee;
+	/**
+	 * 分货费成本
+	 */
+	@ApiModelProperty(value = "分货费成本")
+	@ExcelProperty("分货费成本")
+	private Double goodsAllocationCost;
+	/**
+	 * 平移费成本
+	 */
+	@ApiModelProperty(value = "平移费成本")
+	@ExcelProperty("平移费成本")
+	private Double repositioningCost;
+	/**
+	 * 装卸费成本
+	 */
+	@ApiModelProperty(value = "装卸费成本")
+	@ExcelProperty("装卸费成本")
+	private Double handlingCost;
+	/**
+	 * 公里数成本
+	 */
+	@ApiModelProperty(value = "公里数成本")
+	@ExcelProperty("公里数成本")
+	private Double mileageCost;
+	/**
+	 * 补贴公里数成本
+	 */
+	@ApiModelProperty(value = "补贴公里数成本")
+	@ExcelProperty("补贴公里数成本")
+	private Double subsidizedKilometerCost;
+	/**
+	 * 超区公里数成本
+	 */
+	@ApiModelProperty(value = "超区公里数成本")
+	@ExcelProperty("超区公里数成本")
+	private Double excessZoneMileageCost;
+	/**
+	 * 点位补贴费成本
+	 */
+	@ApiModelProperty(value = "点位补贴费成本")
+	@ExcelProperty("点位补贴费成本")
+	private Double locationSubsidyCost;
+	/**
+	 * 保底费成本
+	 */
+	@ApiModelProperty(value = "保底费成本")
+	@ExcelProperty("保底费成本")
+	private Double minimumGuaranteeCost;
+	/**
+	 * 油费成本
+	 */
+	@ApiModelProperty(value = "油费成本")
+	@ExcelProperty("油费成本")
+	private Double fuelCost;
+	/**
+	 * 其他成本
+	 */
+	@ApiModelProperty(value = "其他成本")
+	@ExcelProperty("其他成本")
+	private Double otherCosts;
+	/**
+	 * 异动金额
+	 */
+	@ApiModelProperty(value = "异动金额")
+	@ExcelProperty("异动金额")
+	private Double changeAmount;
+	/**
+	 * 异动时间
+	 */
+	@ApiModelProperty(value = "异动时间")
+	@ExcelProperty("异动时间")
+	private Date changeTime;
+	/**
+	 * 异动操作人
+	 */
+	@ApiModelProperty(value = "异动操作人")
+	@ExcelProperty("异动操作人")
+	private String changeOperator;
+	/**
+	 * 结算金额
+	 */
+	@ApiModelProperty(value = "结算金额")
+	@ExcelProperty("结算金额")
+	private Double settlementAmount;
+	/**
+	 * 结算时间-年
+	 */
+	@ApiModelProperty(value = "结算时间-年")
+	@ExcelIgnore
+	private Integer settlementYear;
+	/**
+	 * 结算时间-月
+	 */
+	@ApiModelProperty(value = "结算时间-月")
+	@ExcelIgnore
+	private Integer settlementMonth;
+	/**
+	 * 结算时间-日
+	 */
+	@ApiModelProperty(value = "结算时间-日")
+	@ExcelIgnore
+	private Integer settlementDay;
+	/**
+	 * 结算时间
+	 */
+	@ApiModelProperty(value = "结算时间")
+	@ExcelProperty("结算时间")
+	private Date settlementTime;
+	/**
+	 * 结算备注
+	 */
+	@ApiModelProperty(value = "结算备注")
+	@ExcelProperty("结算备注")
+	private String settlementNote;
+	/**
+	 * 结算人
+	 */
+	@ApiModelProperty(value = "结算人")
+	@ExcelProperty("结算人")
+	private String settlementUser;
 
 }

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/vo/ExpenseDispatchWarehouseMonthVO.java

@@ -16,10 +16,10 @@
  */
 package com.logpm.statistics.vo;
 
-import com.logpm.statistics.entity.ExpenseDispatchWarehouseMonthEntity;
-import org.springblade.core.tool.node.INode;
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 /**
  * 配送成本-仓库月度配送成本 视图实体类
@@ -28,8 +28,166 @@ import lombok.EqualsAndHashCode;
  * @since 2024-07-29
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
-public class ExpenseDispatchWarehouseMonthVO extends ExpenseDispatchWarehouseMonthEntity {
+public class ExpenseDispatchWarehouseMonthVO {
 	private static final long serialVersionUID = 1L;
 
+	/**
+	 * 主键
+	 */
+	@ApiModelProperty(value = "主键")
+	private Long id;
+	/**
+	 * 目的仓
+	 */
+	@ApiModelProperty(value = "目的仓")
+	@ExcelProperty("目的仓")
+	private String destinationWarehouse;
+
+	/**
+	 * 成本结算时间
+	 */
+	@ApiModelProperty(value = "成本结算时间-年")
+	@ExcelIgnore
+	private Integer settlementYear;
+
+	/**
+	 * 成本结算时间
+	 */
+	@ApiModelProperty(value = "成本结算时间-月")
+	@ExcelIgnore
+	private Integer settlementMonth;
+	/**
+	 * 成本结算时间
+	 */
+	@ApiModelProperty(value = "成本结算时间")
+	@ExcelProperty("成本结算时间")
+	private String settlementTime;
+	/**
+	 * 车辆车次总数
+	 */
+	@ApiModelProperty(value = "车辆车次总数")
+	@ExcelProperty("车辆车次总数")
+	private Integer totalTrainService;
+	/**
+	 * 计划总件数
+	 */
+	@ApiModelProperty(value = "计划总件数")
+	@ExcelProperty("计划总件数")
+	private Integer plannedTotalQuantity;
+	/**
+	 * 库存品件数
+	 */
+	@ApiModelProperty(value = "库存品件数")
+	@ExcelProperty("库存品件数")
+	private Integer inventoryItemCount;
+	/**
+	 * 装车总件数
+	 */
+	@ApiModelProperty(value = "装车总件数")
+	@ExcelProperty("装车总件数")
+	private Integer totalLoadedPieces;
+	/**
+	 * 签收总件数
+	 */
+	@ApiModelProperty(value = "签收总件数")
+	@ExcelProperty("签收总件数")
+	private Integer totalReceiptCost;
+	/**
+	 * 配送总成本
+	 */
+	@ApiModelProperty(value = "配送总成本")
+	@ExcelProperty("配送总成本")
+	private Double totalDistributionCost;
+	/**
+	 * 配送成本
+	 */
+	@ApiModelProperty(value = "配送成本")
+	@ExcelProperty("配送成本")
+	private Double distributionCost;
+	/**
+	 * 库存品配送成本
+	 */
+	@ApiModelProperty(value = "库存品配送成本")
+	@ExcelProperty("库存品配送成本")
+	private Double inventoryDistributionCost;
+	/**
+	 * 上楼费成本
+	 */
+	@ApiModelProperty(value = "上楼费成本")
+	@ExcelProperty("上楼费成本")
+	private Double stairCarryingFee;
+	/**
+	 * 分货费成本
+	 */
+	@ApiModelProperty(value = "分货费成本")
+	@ExcelProperty("分货费成本")
+	private Double goodsAllocationCost;
+	/**
+	 * 平移费成本
+	 */
+	@ApiModelProperty(value = "平移费成本")
+	@ExcelProperty("平移费成本")
+	private Double repositioningCost;
+	/**
+	 * 装卸费成本
+	 */
+	@ApiModelProperty(value = "装卸费成本")
+	@ExcelProperty("装卸费成本")
+	private Double handlingCost;
+	/**
+	 * 公里数成本
+	 */
+	@ApiModelProperty(value = "公里数成本")
+	@ExcelProperty("公里数成本")
+	private Double mileageCost;
+	/**
+	 * 补贴公里数成本
+	 */
+	@ApiModelProperty(value = "补贴公里数成本")
+	@ExcelProperty("补贴公里数成本")
+	private Double subsidizedKilometerCost;
+	/**
+	 * 超区公里数成本
+	 */
+	@ApiModelProperty(value = "超区公里数成本")
+	@ExcelProperty("超区公里数成本")
+	private Double excessZoneMileageCost;
+	/**
+	 * 点位补贴费成本
+	 */
+	@ApiModelProperty(value = "点位补贴费成本")
+	@ExcelProperty("点位补贴费成本")
+	private Double locationSubsidyCost;
+	/**
+	 * 保底费成本
+	 */
+	@ApiModelProperty(value = "保底费成本")
+	@ExcelProperty("保底费成本")
+	private Double minimumGuaranteeCost;
+	/**
+	 * 油费成本
+	 */
+	@ApiModelProperty(value = "油费成本")
+	@ExcelProperty("油费成本")
+	private Double fuelCost;
+	/**
+	 * 其他成本
+	 */
+	@ApiModelProperty(value = "其他成本")
+	@ExcelProperty("其他成本")
+	private Double otherCosts;
+
+	/**
+	 * 异动金额
+	 */
+	@ApiModelProperty(value = "异动金额")
+	@ExcelProperty("异动金额")
+	private Double changeAmount;
+	/**
+	 * 结算金额
+	 */
+	@ApiModelProperty(value = "结算金额")
+	@ExcelProperty("结算金额")
+	private Double settlementAmount;
+
 }

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/vo/ExpenseWarehouseTransitChangeImageVO.java

@@ -0,0 +1,43 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.statistics.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 仓储成本-中转仓作业成本-操作-图片 视图实体类
+ *
+ * @author zqb
+ * @since 2024-12-09
+ */
+@Data
+public class ExpenseWarehouseTransitChangeImageVO {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键
+	 */
+	@ApiModelProperty(value = "主键")
+	private Long id;
+	/**
+	 * 图片url
+	 */
+	@ApiModelProperty(value = "图片url")
+	private String imageUrl;
+
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/vo/ExpenseWarehouseTransitChangeVO.java

@@ -0,0 +1,80 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.statistics.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 仓储成本-中转仓作业成本-操作记录 视图实体类
+ *
+ * @author zqb
+ * @since 2024-12-09
+ */
+@Data
+public class ExpenseWarehouseTransitChangeVO {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键
+	 */
+	@ApiModelProperty(value = "主键")
+	private Long id;
+	/**
+	 * 类型（异动/结算）
+	 */
+	@ApiModelProperty(value = "类型（异动/结算）")
+	private String type;
+	/**
+	 * 金额
+	 */
+	@ApiModelProperty(value = "金额")
+	@NotNull(message = "金额不能为空")
+	private BigDecimal changeAmount;
+	/**
+	 * 时间
+	 */
+	@ApiModelProperty(value = "时间")
+	private Date changeTime;
+	/**
+	 * 备注
+	 */
+	@ApiModelProperty(value = "备注")
+	private String changeNote;
+	/**
+	 * 操作人
+	 */
+	@ApiModelProperty(value = "操作人")
+	private String changeOperator;
+	/**
+	 * 结算表id
+	 */
+	@ApiModelProperty(value = "结算表id")
+	private Long detailId;
+
+	/**
+	 * 图片
+	 */
+	@ApiModelProperty(value = "图片")
+	private List<ExpenseWarehouseTransitChangeImageVO> changeImageList;
+
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/vo/ExpenseWarehouseTransitMonthVO.java

@@ -16,19 +16,127 @@
  */
 package com.logpm.statistics.vo;
 
-import com.logpm.statistics.entity.ExpenseWarehouseTransitMonthEntity;
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
 
 /**
- * 月度仓储+ 视图实体类
+ * 中转仓月度仓储作业账单 视图实体类
  *
  * @author zqb
- * @since 2024-09-23
+ * @since 2024-12-09
  */
 @Data
-@EqualsAndHashCode(callSuper = true)
-public class ExpenseWarehouseTransitMonthVO extends ExpenseWarehouseTransitMonthEntity {
+public class ExpenseWarehouseTransitMonthVO {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键
+	 */
+	@ApiModelProperty(value = "主键")
+	@ExcelIgnore
+	private Long id;
+	/**
+	 * 结算单号
+	 */
+	@ApiModelProperty(value = "结算单号")
+	@ExcelProperty("结算单号")
+	private String settlementCode;
+	/**
+	 * 中转仓
+	 */
+	@ApiModelProperty(value = "中转仓")
+	@ExcelProperty("中转仓")
+	private String transitWarehouseName;
+	/**
+	 * 目的仓
+	 */
+	@ApiModelProperty(value = "目的仓")
+	@ExcelProperty("目的仓")
+	private String destinationWarehouseName;
+	/**
+	 * 中转作业出账时间
+	 */
+	@ApiModelProperty(value = "中转作业出账时间")
+	@ExcelProperty("中转作业出账时间")
+	private String statisticalTime;
+	/**
+	 * 中转入库件数
+	 */
+	@ApiModelProperty(value = "中转入库件数")
+	@ExcelProperty("中转入库件数")
+	private Integer inNumber;
+	/**
+	 * 中转入库收入
+	 */
+	@ApiModelProperty(value = "中转入库收入")
+	@ExcelProperty("中转入库收入")
+	private BigDecimal inCost;
+	/**
+	 * 中转出库件数
+	 */
+	@ApiModelProperty(value = "中转出库件数")
+	@ExcelProperty("中转出库件数")
+	private Integer outNumber;
+	/**
+	 * 中转出库收入
+	 */
+	@ApiModelProperty(value = "中转出库收入")
+	@ExcelProperty("中转出库收入")
+	private BigDecimal outCost;
+	/**
+	 * 中转总收入
+	 */
+	@ApiModelProperty(value = "中转总收入")
+	@ExcelProperty("中转总收入")
+	private BigDecimal totalCost;
+	/**
+	 * 结算状态
+	 */
+	@ApiModelProperty(value = "结算状态")
+	@ExcelProperty("结算状态")
+	private String settlementStatus;
+	/**
+	 * 已结算金额
+	 */
+	@ApiModelProperty(value = "已结算金额")
+	@ExcelProperty("已结算金额")
+	private BigDecimal settledAmount;
+	/**
+	 * 待结算金额
+	 */
+	@ApiModelProperty(value = "待结算金额")
+	@ExcelProperty("待结算金额")
+	private BigDecimal pendingSettlementAmount;
+	/**
+	 * 结算人
+	 */
+	@ApiModelProperty(value = "结算人")
+	@ExcelProperty("结算人")
+	private String settlementUser;
+	/**
+	 * 结算时间
+	 */
+	@ApiModelProperty(value = "结算时间")
+	@ExcelProperty("结算时间")
+	private Date settlementTime;
+	/**
+	 * 异常金额
+	 */
+	@ApiModelProperty(value = "异常金额")
+	@ExcelProperty("异常金额")
+	private BigDecimal changeAmount;
 
+	/**
+	 * 操作列表
+	 */
+	@ApiModelProperty(value = "操作列表")
+	@ExcelIgnore
+	private List<ExpenseWarehouseTransitChangeVO> changeList;
 
 }

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/vo/ExpenseWarehouseTransitVO.java

@@ -0,0 +1,109 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.statistics.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 中转仓仓储作业明细 视图实体类
+ *
+ * @author zqb
+ * @since 2024-12-09
+ */
+@Data
+public class ExpenseWarehouseTransitVO  {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键
+	 */
+	@ApiModelProperty(value = "主键")
+	@ExcelIgnore
+	private Long id;
+	/**
+	 * 中转仓
+	 */
+	@ApiModelProperty(value = "中转仓")
+	@ExcelProperty("中转仓")
+	private String transitWarehouseName;
+	/**
+	 * 目的仓
+	 */
+	@ApiModelProperty(value = "目的仓")
+	@ExcelProperty("目的仓")
+	private String destinationWarehouseName;
+	/**
+	 * 作业类型
+	 */
+	@ApiModelProperty(value = "作业类型")
+	@ExcelProperty("作业类型")
+	private String workType;
+	/**
+	 * 包件类型
+	 */
+	@ApiModelProperty(value = "包件类型")
+	@ExcelProperty("包件类型")
+	private String packageType;
+	/**
+	 * 包条码
+	 */
+	@ApiModelProperty(value = "包条码")
+	@ExcelProperty("包条码")
+	private String packageCode;
+	/**
+	 * 订单
+	 */
+	@ApiModelProperty(value = "订单")
+	@ExcelProperty("订单")
+	private String orderCode;
+	/**
+	 * 运单编号
+	 */
+	@ApiModelProperty(value = "运单编号")
+	@ExcelProperty("运单编号")
+	private String waybillNumber;
+	/**
+	 * 车次号
+	 */
+	@ApiModelProperty(value = "车次号")
+	@ExcelProperty("车次号")
+	private String trainNumber;
+	/**
+	 * 件数
+	 */
+	@ApiModelProperty(value = "件数")
+	@ExcelProperty("件数")
+	private Integer num;
+	/**
+	 * 操作时间
+	 */
+	@ApiModelProperty(value = "操作时间")
+	@ExcelProperty("操作时间")
+	private Date taskTime;
+	/**
+	 * 确认分摊时间
+	 */
+	@ApiModelProperty(value = "确认分摊时间")
+	@ExcelProperty("确认分摊时间")
+	private Date confirmAllocationTime;
+
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/wrapper/ExpenseDispatchTrainDetailChangeWrapper.java

@@ -0,0 +1,50 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.statistics.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import com.logpm.statistics.entity.ExpenseDispatchTrainDetailChangeEntity;
+import com.logpm.statistics.vo.ExpenseDispatchTrainDetailChangeVO;
+import java.util.Objects;
+
+/**
+ * 配送成本-车辆成本结算表-异动记录 包装类,返回视图层所需的字段
+ *
+ * @author zqb
+ * @since 2024-12-03
+ */
+public class ExpenseDispatchTrainDetailChangeWrapper extends BaseEntityWrapper<ExpenseDispatchTrainDetailChangeEntity, ExpenseDispatchTrainDetailChangeVO>  {
+
+	public static ExpenseDispatchTrainDetailChangeWrapper build() {
+		return new ExpenseDispatchTrainDetailChangeWrapper();
+ 	}
+
+	@Override
+	public ExpenseDispatchTrainDetailChangeVO entityVO(ExpenseDispatchTrainDetailChangeEntity expenseDispatchTrainDetailChange) {
+		ExpenseDispatchTrainDetailChangeVO expenseDispatchTrainDetailChangeVO = Objects.requireNonNull(BeanUtil.copy(expenseDispatchTrainDetailChange, ExpenseDispatchTrainDetailChangeVO.class));
+
+		//User createUser = UserCache.getUser(expenseDispatchTrainDetailChange.getCreateUser());
+		//User updateUser = UserCache.getUser(expenseDispatchTrainDetailChange.getUpdateUser());
+		//expenseDispatchTrainDetailChangeVO.setCreateUserName(createUser.getName());
+		//expenseDispatchTrainDetailChangeVO.setUpdateUserName(updateUser.getName());
+
+		return expenseDispatchTrainDetailChangeVO;
+	}
+
+
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/wrapper/ExpenseWarehouseTransitChangeImageWrapper.java

@@ -0,0 +1,49 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.statistics.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import com.logpm.statistics.entity.ExpenseWarehouseTransitChangeImageEntity;
+import com.logpm.statistics.vo.ExpenseWarehouseTransitChangeImageVO;
+import java.util.Objects;
+
+/**
+ * 仓储成本-中转仓作业成本-操作-图片 包装类,返回视图层所需的字段
+ *
+ * @author zqb
+ * @since 2024-12-09
+ */
+public class ExpenseWarehouseTransitChangeImageWrapper extends BaseEntityWrapper<ExpenseWarehouseTransitChangeImageEntity, ExpenseWarehouseTransitChangeImageVO>  {
+
+	public static ExpenseWarehouseTransitChangeImageWrapper build() {
+		return new ExpenseWarehouseTransitChangeImageWrapper();
+ 	}
+
+	@Override
+	public ExpenseWarehouseTransitChangeImageVO entityVO(ExpenseWarehouseTransitChangeImageEntity expenseWarehouseTransitChangeImage) {
+		ExpenseWarehouseTransitChangeImageVO expenseWarehouseTransitChangeImageVO = Objects.requireNonNull(BeanUtil.copy(expenseWarehouseTransitChangeImage, ExpenseWarehouseTransitChangeImageVO.class));
+
+		//User createUser = UserCache.getUser(expenseWarehouseTransitChangeImage.getCreateUser());
+		//User updateUser = UserCache.getUser(expenseWarehouseTransitChangeImage.getUpdateUser());
+		//expenseWarehouseTransitChangeImageVO.setCreateUserName(createUser.getName());
+		//expenseWarehouseTransitChangeImageVO.setUpdateUserName(updateUser.getName());
+
+		return expenseWarehouseTransitChangeImageVO;
+	}
+
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/wrapper/ExpenseWarehouseTransitChangeWrapper.java

@@ -0,0 +1,50 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.statistics.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import com.logpm.statistics.entity.ExpenseWarehouseTransitChangeEntity;
+import com.logpm.statistics.vo.ExpenseWarehouseTransitChangeVO;
+import java.util.Objects;
+
+/**
+ * 仓储成本-中转仓作业成本-操作记录 包装类,返回视图层所需的字段
+ *
+ * @author zqb
+ * @since 2024-12-09
+ */
+public class ExpenseWarehouseTransitChangeWrapper extends BaseEntityWrapper<ExpenseWarehouseTransitChangeEntity, ExpenseWarehouseTransitChangeVO>  {
+
+	public static ExpenseWarehouseTransitChangeWrapper build() {
+		return new ExpenseWarehouseTransitChangeWrapper();
+ 	}
+
+	@Override
+	public ExpenseWarehouseTransitChangeVO entityVO(ExpenseWarehouseTransitChangeEntity expenseWarehouseTransitChange) {
+		ExpenseWarehouseTransitChangeVO expenseWarehouseTransitChangeVO = Objects.requireNonNull(BeanUtil.copy(expenseWarehouseTransitChange, ExpenseWarehouseTransitChangeVO.class));
+
+		//User createUser = UserCache.getUser(expenseWarehouseTransitChange.getCreateUser());
+		//User updateUser = UserCache.getUser(expenseWarehouseTransitChange.getUpdateUser());
+		//expenseWarehouseTransitChangeVO.setCreateUserName(createUser.getName());
+		//expenseWarehouseTransitChangeVO.setUpdateUserName(updateUser.getName());
+
+		return expenseWarehouseTransitChangeVO;
+	}
+
+
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/wrapper/ExpenseWarehouseTransitMonthWrapper.java

@@ -0,0 +1,50 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.statistics.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import com.logpm.statistics.entity.ExpenseWarehouseTransitMonthEntity;
+import com.logpm.statistics.vo.ExpenseWarehouseTransitMonthVO;
+import java.util.Objects;
+
+/**
+ * 中转仓月度仓储作业账单 包装类,返回视图层所需的字段
+ *
+ * @author zqb
+ * @since 2024-12-09
+ */
+public class ExpenseWarehouseTransitMonthWrapper extends BaseEntityWrapper<ExpenseWarehouseTransitMonthEntity, ExpenseWarehouseTransitMonthVO>  {
+
+	public static ExpenseWarehouseTransitMonthWrapper build() {
+		return new ExpenseWarehouseTransitMonthWrapper();
+ 	}
+
+	@Override
+	public ExpenseWarehouseTransitMonthVO entityVO(ExpenseWarehouseTransitMonthEntity expenseWarehouseTransitMonth) {
+		ExpenseWarehouseTransitMonthVO expenseWarehouseTransitMonthVO = Objects.requireNonNull(BeanUtil.copy(expenseWarehouseTransitMonth, ExpenseWarehouseTransitMonthVO.class));
+
+		//User createUser = UserCache.getUser(expenseWarehouseTransitMonth.getCreateUser());
+		//User updateUser = UserCache.getUser(expenseWarehouseTransitMonth.getUpdateUser());
+		//expenseWarehouseTransitMonthVO.setCreateUserName(createUser.getName());
+		//expenseWarehouseTransitMonthVO.setUpdateUserName(updateUser.getName());
+
+		return expenseWarehouseTransitMonthVO;
+	}
+
+
+}

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/wrapper/ExpenseWarehouseTransitWrapper.java

@@ -0,0 +1,50 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.statistics.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import com.logpm.statistics.entity.ExpenseWarehouseTransitEntity;
+import com.logpm.statistics.vo.ExpenseWarehouseTransitVO;
+import java.util.Objects;
+
+/**
+ * 中转仓仓储作业明细 包装类,返回视图层所需的字段
+ *
+ * @author zqb
+ * @since 2024-12-09
+ */
+public class ExpenseWarehouseTransitWrapper extends BaseEntityWrapper<ExpenseWarehouseTransitEntity, ExpenseWarehouseTransitVO>  {
+
+	public static ExpenseWarehouseTransitWrapper build() {
+		return new ExpenseWarehouseTransitWrapper();
+ 	}
+
+	@Override
+	public ExpenseWarehouseTransitVO entityVO(ExpenseWarehouseTransitEntity expenseWarehouseTransit) {
+		ExpenseWarehouseTransitVO expenseWarehouseTransitVO = Objects.requireNonNull(BeanUtil.copy(expenseWarehouseTransit, ExpenseWarehouseTransitVO.class));
+
+		//User createUser = UserCache.getUser(expenseWarehouseTransit.getCreateUser());
+		//User updateUser = UserCache.getUser(expenseWarehouseTransit.getUpdateUser());
+		//expenseWarehouseTransitVO.setCreateUserName(createUser.getName());
+		//expenseWarehouseTransitVO.setUpdateUserName(updateUser.getName());
+
+		return expenseWarehouseTransitVO;
+	}
+
+
+}