1.干线时效，质量报表提交

blade-service-api/logpm-report-api/src/main/java/com/logpm/report/entity/ReportConfigAdvanceDetailOpenEntity.java

@@ -0,0 +1,24 @@
+package com.logpm.report.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import lombok.*;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+@Data
+@TableName("logpm_reportconfig_advance_detail_open")
+@ApiModel(value = "ReportConfigAdvanceDetailOpen对象", description = "暂存单开单报表配置")
+@EqualsAndHashCode(callSuper = true)
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class ReportConfigAdvanceDetailOpenEntity extends TenantEntity {
+
+	private Long warehouseId;
+	private String warehouseName;
+
+	private String brand;
+
+	private Integer hoursTime;
+
+}

blade-service-api/logpm-report-api/src/main/java/com/logpm/report/entity/ReportConfigAllTrunklineEntity.java

@@ -0,0 +1,26 @@
+package com.logpm.report.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import lombok.*;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+@Data
+@TableName("logpm_reportconfig_all_trunkline")
+@ApiModel(value = " ReportConfigAllTrunkline对象", description = "整体时效报表配置")
+@EqualsAndHashCode(callSuper = true)
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class ReportConfigAllTrunklineEntity extends TenantEntity {
+
+	private Long departureWarehouseId;
+	private String departureWarehouseName;
+	private Long destinationWarehouseId;
+	private String destinationWarehouseName;
+
+	private String brand;
+
+	private Integer hoursTime;
+
+}

blade-service-api/logpm-report-api/src/main/java/com/logpm/report/entity/ReportConfigCheckWaybillEntity.java

@@ -0,0 +1,26 @@
+package com.logpm.report.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import lombok.*;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+@Data
+@TableName("logpm_reportconfig_check_waybill")
+@ApiModel(value = "ReportConfigCheckWaybill对象", description = "审单报表配置")
+@EqualsAndHashCode(callSuper = true)
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class ReportConfigCheckWaybillEntity extends TenantEntity {
+
+	private Long departureWarehouseId;
+	private String departureWarehouseName;
+	private Long destinationWarehouseId;
+	private String destinationWarehouseName;
+
+	private String brand;
+
+	private Integer hoursTime;
+
+}

blade-service-api/logpm-report-api/src/main/java/com/logpm/report/entity/ReportConfigDespatchEntity.java

@@ -0,0 +1,26 @@
+package com.logpm.report.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import lombok.*;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+@Data
+@TableName("logpm_reportconfig_despatch")
+@ApiModel(value = " ReportConfigDespatch对象", description = "发运报表配置")
+@EqualsAndHashCode(callSuper = true)
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class ReportConfigDespatchEntity extends TenantEntity {
+
+	private Long departureWarehouseId;
+	private String departureWarehouseName;
+	private Long destinationWarehouseId;
+	private String destinationWarehouseName;
+
+	private String brand;
+
+	private Integer hoursTime;
+
+}

blade-service-api/logpm-report-api/src/main/java/com/logpm/report/entity/ReportConfigTransferEntity.java

@@ -0,0 +1,24 @@
+package com.logpm.report.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import lombok.*;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+@Data
+@TableName("logpm_reportconfig_transfer")
+@ApiModel(value = " ReportConfigTransfer对象", description = "中转报表配置")
+@EqualsAndHashCode(callSuper = true)
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class ReportConfigTransferEntity extends TenantEntity {
+
+	private Long warehouseId;
+	private String warehouseName;
+
+	private String brand;
+
+	private Integer hoursTime;
+
+}

blade-service/logpm-report/src/main/java/com/logpm/report/controller/ReportConfigController.java

@@ -0,0 +1,142 @@
+package com.logpm.report.controller;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.logpm.report.dto.ReportConfigDTO;
+import com.logpm.report.service.*;
+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.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@AllArgsConstructor
+@RequestMapping("/reportConfig")
+@Api(value = "报表配置", tags = "报表配置")
+public class ReportConfigController extends BladeController {
+
+	private final IReportConfigAdvanceDetailOpenService reportConfigAdvanceDetailOpenService;
+	private final IReportConfigCheckWaybillService reportConfigCheckWaybillService;
+	private final IReportConfigDespatchService reportConfigDespatchService;
+	private final IReportConfigTransferService reportConfigTransferService;
+	private final IReportConfigAllTrunklineService reportConfigAllTrunklineService;
+
+	//-------------------------开单及时率
+
+
+	@PostMapping("/openTimeConfigPage")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "开单时效配置报表", notes = "开单时效配置报表")
+	public R openTimeConfigPage(@RequestBody ReportConfigDTO reportConfigDTO) {
+		return reportConfigAdvanceDetailOpenService.openTimeConfigPage(reportConfigDTO);
+	}
+
+	@PostMapping("/addOpenTimeConfig")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "新增开单时效配置", notes = "新增开单时效配置")
+	public R addOpenTimeConfig(@RequestBody ReportConfigDTO reportConfigDTO) {
+		return reportConfigAdvanceDetailOpenService.addOpenTimeConfig(reportConfigDTO);
+	}
+
+	@PostMapping("/deleteOpenTimeConfig")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "删除开单时效配置", notes = "删除开单时效配置")
+	public R deleteOpenTimeConfig(@RequestBody ReportConfigDTO reportConfigDTO) {
+		return reportConfigAdvanceDetailOpenService.deleteOpenTimeConfig(reportConfigDTO);
+	}
+
+	//--------------------审单及时率
+	@PostMapping("/checkWaybillConfigPage")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "审单时效配置报表", notes = "审单时效配置报表")
+	public R checkWaybillConfigPage(@RequestBody ReportConfigDTO reportConfigDTO) {
+		return reportConfigCheckWaybillService.checkWaybillConfigPage(reportConfigDTO);
+	}
+
+
+	@PostMapping("/addCheckWaybillConfig")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "新增审单时效配置", notes = "新增审单时效配置")
+	public R addCheckWaybillConfig(@RequestBody ReportConfigDTO reportConfigDTO) {
+		return reportConfigCheckWaybillService.addCheckWaybillConfig(reportConfigDTO);
+	}
+
+	@PostMapping("/deleteCheckWaybillConfig")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "删除审单时效配置", notes = "删除审单时效配置")
+	public R deleteCheckWaybillConfig(@RequestBody ReportConfigDTO reportConfigDTO) {
+		return reportConfigCheckWaybillService.deleteCheckWaybillConfig(reportConfigDTO);
+	}
+
+	//--------------------发运时效
+	@PostMapping("/despatchConfigPage")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "发运时效配置报表", notes = "发运时效配置报表")
+	public R despatchConfigPage(@RequestBody ReportConfigDTO reportConfigDTO) {
+		return reportConfigDespatchService.despatchConfigPage(reportConfigDTO);
+	}
+
+	@PostMapping("/addDespatchConfig")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "新增发运时效配置", notes = "新增发运时效配置")
+	public R addDespatchConfig(@RequestBody ReportConfigDTO reportConfigDTO) {
+		return reportConfigDespatchService.addDespatchConfig(reportConfigDTO);
+	}
+
+	@PostMapping("/deleteDespatchConfig")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "删除发运时效配置", notes = "删除发运时效配置")
+	public R deleteDespatchConfig(@RequestBody ReportConfigDTO reportConfigDTO) {
+		return reportConfigDespatchService.deleteDespatchConfig(reportConfigDTO);
+	}
+
+	//--------------------中转时效
+	@PostMapping("/transferConfigPage")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "中转时效配置报表", notes = "中转时效配置报表")
+	public R transferConfigPage(@RequestBody ReportConfigDTO reportConfigDTO) {
+		return reportConfigTransferService.transferConfigPage(reportConfigDTO);
+	}
+
+	@PostMapping("/addTransferConfig")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "新增中转时效配置", notes = "新增中转时效配置")
+	public R addTransferConfig(@RequestBody ReportConfigDTO reportConfigDTO) {
+		return reportConfigTransferService.addTransferConfig(reportConfigDTO);
+	}
+
+	@PostMapping("/deleteTransferConfig")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "删除中转时效配置", notes = "删除中转时效配置")
+	public R deleteTransferConfig(@RequestBody ReportConfigDTO reportConfigDTO) {
+		return reportConfigTransferService.deleteTransferConfig(reportConfigDTO);
+	}
+
+	//--------------------干线整体准时
+
+	@PostMapping("/allTrunklineConfigPage")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "干线整体准时配置报表", notes = "干线整体准时配置报表")
+	public R allTrunklineConfigPage(@RequestBody ReportConfigDTO reportConfigDTO) {
+		return reportConfigAllTrunklineService.allTrunklineConfigPage(reportConfigDTO);
+	}
+
+	@PostMapping("/addAllTrunklineConfig")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "新增干线整体准时配置", notes = "新增干线整体准时配置")
+	public R addAllTrunklineConfig(@RequestBody ReportConfigDTO reportConfigDTO) {
+		return reportConfigAllTrunklineService.addAllTrunklineConfig(reportConfigDTO);
+	}
+
+	@PostMapping("/deleteAllTrunklineConfig")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "删除干线整体准时配置", notes = "删除干线整体准时配置")
+	public R deleteAllTrunklineConfig(@RequestBody ReportConfigDTO reportConfigDTO) {
+		return reportConfigAllTrunklineService.deleteAllTrunklineConfig(reportConfigDTO);
+	}
+
+}

blade-service/logpm-report/src/main/java/com/logpm/report/controller/ReportQualityController.java

@@ -0,0 +1,43 @@
+package com.logpm.report.controller;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.logpm.report.dto.ReportQualityDTO;
+import com.logpm.report.dto.ReportTimeDTO;
+import com.logpm.report.service.IReportQualityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springblade.core.tool.api.R;
+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.servlet.http.HttpServletResponse;
+
+@RestController
+@AllArgsConstructor
+@RequestMapping("/reportQuality")
+@Api(value = "质量报表", tags = "质量报表")
+public class ReportQualityController {
+
+	private final IReportQualityService reportQualityService;
+
+	//------------------改单质量报表
+	@PostMapping("/updateWaybillQualityPage")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "改单质量报表", notes = "改单质量报表")
+	public R updateWaybillQualityPage(@RequestBody ReportQualityDTO reportQualityDTO) {
+		return reportQualityService.updateWaybillQualityPage(reportQualityDTO);
+	}
+
+	@PostMapping("/updateWaybillQualityExport")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "改单质量报表导出", notes = "改单质量报表导出")
+	public void updateWaybillQualityExport(@RequestBody ReportQualityDTO reportQualityDTO, HttpServletResponse response) {
+		reportQualityService.updateWaybillQualityExport(reportQualityDTO,response);
+	}
+
+
+
+}

blade-service/logpm-report/src/main/java/com/logpm/report/controller/ReportTimeController.java

@@ -20,6 +20,8 @@ public class ReportTimeController extends BladeController {
 
 	private final IReportTimeService reportTimeService;
 
+	//-----------------------开单时效------------------------
+
 	@PostMapping("/openTimePage")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "开单时效报表", notes = "开单时效报表")
@@ -34,6 +36,9 @@ public class ReportTimeController extends BladeController {
 		reportTimeService.openTimeExport(reportTimeDTO,response);
 	}
 
+
+	//-----------------------审单时效------------------------
+
 	@PostMapping("/checkWaybillTimePage")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "审单时效报表", notes = "审单时效报表")
@@ -49,4 +54,101 @@ public class ReportTimeController extends BladeController {
 	}
 
 
+	//-----------------------订制品发运时效------------------------
+
+	@PostMapping("/packageStartTimePage")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "订制品发运时效报表", notes = "订制品发运时效报表")
+	public R packageStartTimePage(@RequestBody ReportTimeDTO reportTimeDTO) {
+		return reportTimeService.packageStartTimePage(reportTimeDTO);
+	}
+
+	@PostMapping("/packageStartTimeExport")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "订制品发运时效报表导出", notes = "订制品发运时效报表导出")
+	public void packageStartTimeExport(@RequestBody ReportTimeDTO reportTimeDTO, HttpServletResponse response) {
+		reportTimeService.packageStartTimeExport(reportTimeDTO,response);
+	}
+
+	//-----------------------零担发运时效------------------------
+
+	@PostMapping("/zeroStartTimePage")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "零担发运时效报表", notes = "零担发运时效报表")
+	public R zeroStartTimePage(@RequestBody ReportTimeDTO reportTimeDTO) {
+		return reportTimeService.zeroStartTimePage(reportTimeDTO);
+	}
+
+	@PostMapping("/zeroStartTimeExport")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "零担发运时效报表导出", notes = "零担发运时效报表导出")
+	public void zeroStartTimeExport(@RequestBody ReportTimeDTO reportTimeDTO, HttpServletResponse response) {
+		reportTimeService.zeroStartTimeExport(reportTimeDTO,response);
+	}
+
+	//-----------------------订制品中转时效------------------------
+
+	@PostMapping("/packageTransferTimePage")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "订制品中转时效报表", notes = "订制品中转时效报表")
+	public R packageTransferTimePage(@RequestBody ReportTimeDTO reportTimeDTO) {
+		return reportTimeService.packageTransferTimePage(reportTimeDTO);
+	}
+
+	@PostMapping("/packageTransferTimeExport")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "订制品中转时效报表导出", notes = "订制品中转时效报表导出")
+	public void packageTransferTimeExport(@RequestBody ReportTimeDTO reportTimeDTO, HttpServletResponse response) {
+		reportTimeService.packageTransferTimeExport(reportTimeDTO,response);
+	}
+
+	//-----------------------零担中转时效------------------------
+
+	@PostMapping("/zeroTransferTimePage")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "零担中转时效报表", notes = "零担中转时效报表")
+	public R zeroTransferTimePage(@RequestBody ReportTimeDTO reportTimeDTO) {
+		return reportTimeService.zeroTransferTimePage(reportTimeDTO);
+	}
+
+	@PostMapping("/zeroTransferTimeExport")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "零担中转时效报表导出", notes = "零担中转时效报表导出")
+	public void zeroTransferTimeExport(@RequestBody ReportTimeDTO reportTimeDTO, HttpServletResponse response) {
+		reportTimeService.zeroTransferTimeExport(reportTimeDTO,response);
+	}
+
+	//-----------------------订制品干线整体时效------------------------
+
+	@PostMapping("/packageAllTrunklineTimePage")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "订制品干线时效报表", notes = "订制品干线时效报表")
+	public R packageAllTrunklineTimePage(@RequestBody ReportTimeDTO reportTimeDTO) {
+		return reportTimeService.packageAllTrunklineTimePage(reportTimeDTO);
+	}
+
+	@PostMapping("/packageAllTrunklineTimeExport")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "订制品干线时效报表导出", notes = "订制品干线时效报表导出")
+	public void packageAllTrunklineTimeExport(@RequestBody ReportTimeDTO reportTimeDTO, HttpServletResponse response) {
+		reportTimeService.packageAllTrunklineTimeExport(reportTimeDTO,response);
+	}
+
+	//-----------------------零担干线整体时效------------------------
+
+	@PostMapping("/zeroAllTrunklineTimePage")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "零担干线时效报表", notes = "零担干线时效报表")
+	public R zeroAllTrunklineTimePage(@RequestBody ReportTimeDTO reportTimeDTO) {
+		return reportTimeService.zeroAllTrunklineTimePage(reportTimeDTO);
+	}
+
+	@PostMapping("/zeroAllTrunklineTimeExport")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "零担干线时效报表导出", notes = "零担干线时效报表导出")
+	public void zeroAllTrunklineTimeExport(@RequestBody ReportTimeDTO reportTimeDTO, HttpServletResponse response) {
+		reportTimeService.zeroAllTrunklineTimeExport(reportTimeDTO,response);
+	}
+
+
 }

blade-service/logpm-report/src/main/java/com/logpm/report/dto/ReportConfigDTO.java

@@ -0,0 +1,37 @@
+package com.logpm.report.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class ReportConfigDTO implements Serializable {
+
+	private Integer pageNum;
+	private Integer pageSize;
+
+	private List<Long> warehouseIds;
+
+	private List<String> brands;
+
+	private Long warehouseId;
+	private String warehouseName;
+
+	private String brand;
+
+	private Integer hoursTime;
+
+	private Long id;
+
+	private List<Long> departureWarehouseIds;
+	private List<Long> destinationWarehouseIds;
+
+	private Long departureWarehouseId;
+	private String departureWarehouseName;
+
+	private Long destinationWarehouseId;
+	private String destinationWarehouseName;
+
+
+}

blade-service/logpm-report/src/main/java/com/logpm/report/dto/ReportQualityDTO.java

@@ -0,0 +1,28 @@
+package com.logpm.report.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class ReportQualityDTO implements Serializable {
+
+	private Integer pageNum;
+	private Integer pageSize;
+
+	private List<String> businessLineList;
+	private List<String> brandList;
+	private List<Long> warehouseIds;
+	private List<Long> departureWarehouseIds;
+	private List<Long> destinationWarehouseIds;
+
+	private String startTimeStr;
+	private String endTimeStr;
+
+	private Date startTime;
+	private Date endTime;
+
+
+}

blade-service/logpm-report/src/main/java/com/logpm/report/dto/ReportTimeDTO.java

@@ -24,4 +24,6 @@ public class ReportTimeDTO implements Serializable {
 	private Date startTime;
 	private Date endTime;
 
+	private Integer hoursTime;
+
 }

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

@@ -0,0 +1,15 @@
+package com.logpm.report.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.report.dto.ReportConfigDTO;
+import com.logpm.report.entity.ReportConfigAdvanceDetailOpenEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface ReportConfigAdvanceDetailOpenMapper extends BaseMapper<ReportConfigAdvanceDetailOpenEntity> {
+
+
+	IPage<ReportConfigAdvanceDetailOpenEntity> openTimeConfigPage(IPage<Object> page, @Param("param") ReportConfigDTO reportConfigDTO);
+}

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

@@ -0,0 +1,25 @@
+<?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.report.mapper.ReportConfigAdvanceDetailOpenMapper">
+
+    <select id="openTimeConfigPage" resultType="com.logpm.report.entity.ReportConfigAdvanceDetailOpenEntity">
+        select *
+        from logpm_reportconfig_advance_detail_open ado
+        <where>
+            and ado.is_deleted = 0
+            <if test="param.warehouseIds != null and param.warehouseIds.size() > 0">
+                and ado.warehouse_id in
+                <foreach collection="param.warehouseIds" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param.brands != null and param.brands.size() > 0">
+                and ado.brand in
+                <foreach collection="param.brands" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+</mapper>

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

@@ -0,0 +1,14 @@
+package com.logpm.report.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.report.dto.ReportConfigDTO;
+import com.logpm.report.entity.ReportConfigAdvanceDetailOpenEntity;
+import com.logpm.report.entity.ReportConfigAllTrunklineEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface ReportConfigAllTrunklineMapper extends BaseMapper<ReportConfigAllTrunklineEntity> {
+	IPage<ReportConfigAdvanceDetailOpenEntity> allTrunklineConfigPage(IPage<Object> page, @Param("param") ReportConfigDTO reportConfigDTO);
+}

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

@@ -0,0 +1,31 @@
+<?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.report.mapper.ReportConfigAllTrunklineMapper">
+
+    <select id="allTrunklineConfigPage" resultType="com.logpm.report.entity.ReportConfigAllTrunklineEntity">
+        select *
+        from logpm_reportconfig_all_trunkline rat
+        <where>
+            and rat.is_deleted = 0
+            <if test="param.departureWarehouseIds != null and param.departureWarehouseIds.size() > 0">
+                and rat.departure_warehouse_id in
+                <foreach collection="param.departureWarehouseIds" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param.destinationWarehouseIds != null and param.destinationWarehouseIds.size() > 0">
+                and rat.destination_warehouse_id in
+                <foreach collection="param.destinationWarehouseIds" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param.brands != null and param.brands.size() > 0">
+                and rat.brand in
+                <foreach collection="param.brands" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+</mapper>

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

@@ -0,0 +1,15 @@
+package com.logpm.report.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.report.dto.ReportConfigDTO;
+import com.logpm.report.entity.ReportConfigCheckWaybillEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface ReportConfigCheckWaybillMapper extends BaseMapper<ReportConfigCheckWaybillEntity> {
+
+
+	IPage<ReportConfigCheckWaybillEntity> checkWaybillConfigPage(IPage<Object> page, @Param("param") ReportConfigDTO reportConfigDTO);
+}

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

@@ -0,0 +1,31 @@
+<?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.report.mapper.ReportConfigCheckWaybillMapper">
+
+    <select id="checkWaybillConfigPage" resultType="com.logpm.report.entity.ReportConfigCheckWaybillEntity">
+        select *
+        from logpm_reportconfig_check_waybill cw
+        <where>
+            and cw.is_deleted = 0
+            <if test="param.departureWarehouseIds != null and param.departureWarehouseIds.size() > 0">
+                and cw.departure_warehouse_id in
+                <foreach collection="param.departureWarehouseIds" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param.destinationWarehouseIds != null and param.destinationWarehouseIds.size() > 0">
+                and cw.destination_warehouse_id in
+                <foreach collection="param.destinationWarehouseIds" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param.brands != null and param.brands.size() > 0">
+                and cw.brand in
+                <foreach collection="param.brands" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+</mapper>

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

@@ -0,0 +1,14 @@
+package com.logpm.report.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.report.dto.ReportConfigDTO;
+import com.logpm.report.entity.ReportConfigDespatchEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface ReportConfigDespatchMapper extends BaseMapper<ReportConfigDespatchEntity> {
+
+	IPage<ReportConfigDespatchEntity> despatchConfigPage(IPage<Object> page, @Param("param") ReportConfigDTO reportConfigDTO);
+}

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

@@ -0,0 +1,31 @@
+<?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.report.mapper.ReportConfigDespatchMapper">
+
+    <select id="despatchConfigPage" resultType="com.logpm.report.entity.ReportConfigDespatchEntity">
+        select *
+        from logpm_reportconfig_despatch lrd
+        <where>
+            and lrd.is_deleted = 0
+            <if test="param.departureWarehouseIds != null and param.departureWarehouseIds.size() > 0">
+                and lrd.departure_warehouse_id in
+                <foreach collection="param.departureWarehouseIds" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param.destinationWarehouseIds != null and param.destinationWarehouseIds.size() > 0">
+                and lrd.destination_warehouse_id in
+                <foreach collection="param.destinationWarehouseIds" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param.brands != null and param.brands.size() > 0">
+                and lrd.brand in
+                <foreach collection="param.brands" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+</mapper>

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

@@ -0,0 +1,13 @@
+package com.logpm.report.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.report.dto.ReportConfigDTO;
+import com.logpm.report.entity.ReportConfigTransferEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface ReportConfigTransferMapper extends BaseMapper<ReportConfigTransferEntity> {
+	IPage<ReportConfigTransferEntity> transferConfigPage(IPage<Object> page, @Param("param") ReportConfigDTO reportConfigDTO);
+}

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

@@ -0,0 +1,25 @@
+<?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.report.mapper.ReportConfigTransferMapper">
+
+    <select id="transferConfigPage" resultType="com.logpm.report.entity.ReportConfigTransferEntity">
+        select *
+        from logpm_reportconfig_transfer lrt
+        <where>
+            and lrt.is_deleted = 0
+            <if test="param.warehouseIds != null and param.warehouseIds.size() > 0">
+                and lrt.warehouse_id in
+                <foreach collection="param.warehouseIds" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="param.brands != null and param.brands.size() > 0">
+                and lrt.brand in
+                <foreach collection="param.brands" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+</mapper>

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

@@ -0,0 +1,17 @@
+package com.logpm.report.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.report.dto.ReportQualityDTO;
+import com.logpm.report.vo.ReportUpdateWaybillVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface ReportQualityMapper {
+
+	IPage<ReportUpdateWaybillVO> updateWaybillQualityPage(IPage<Object> page, @Param("param") ReportQualityDTO reportQualityDTO);
+
+	List<ReportUpdateWaybillVO> updateWaybillQualityExport(@Param("param") ReportQualityDTO reportQualityDTO);
+}

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

@@ -0,0 +1,128 @@
+<?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.report.mapper.ReportQualityMapper">
+
+    <select id="updateWaybillQualityPage" resultType="com.logpm.report.vo.ReportUpdateWaybillVO">
+        select waw.business_line businessLine,
+               lww.departure_warehouse_name departureWarehouseName,
+               lww.destination_warehouse_name destinationWarehouseName,
+               lww.brand brand,
+               count(DISTINCT lww.id) totalNum,
+               count(DISTINCT ltwt.waybill_id) editNum,
+               count(ltwt.id) updateNum,
+               sum(if(ltwt.refer='发车前修改',1,0)) startBeforeNum,
+               IFNULL(round(sum(if(ltwt.refer='发车前修改',1,0))/count(ltwt.id)*100,2),'0.00') startBeforeRate,
+               sum(if(ltwt.refer='人为操作错误',1,0)) personProbleNum,
+               IFNULL(round(sum(if(ltwt.refer='人为操作错误',1,0))/count(ltwt.id)*100,2),'0.00') personProbleRate,
+               sum(if(ltwt.refer='财务修改',1,0)) financeUpdateNum,
+               IFNULL(round(sum(if(ltwt.refer='财务修改',1,0))/count(ltwt.id)*100,2),'0.00') financeUpdateRate,
+               sum(if(ltwt.refer='商家要求',1,0)) merchantUpdateNum,
+               IFNULL(round(sum(if(ltwt.refer='商家要求',1,0))/count(ltwt.id)*100,2),'0.00') merchantUpdateRate,
+               sum(if(ltwt.refer='业务调整',1,0)) businessUpdateNum,
+               IFNULL(round(sum(if(ltwt.refer='业务调整',1,0))/count(ltwt.id)*100,2),'0.00') businessUpdateRate,
+               IFNULL(round(count(DISTINCT ltwt.waybill_id)/count(DISTINCT lww.id)*100,2),'0.00') updateRate
+        from logpm_warehouse_waybill lww
+         left join logpm_warehouse_warehouse waw on waw.id = lww.destination_warehouse_id
+         left join logpm_trunkline_waybill_track ltwt on ltwt.waybill_id = lww.id and ltwt.track_type = '888'
+        where 1=1
+          and lww.create_time > '2024-10-22 00:00:00'
+          and waw.business_line is not null
+        <if test="param.businessLineList != null and param.businessLineList.size() > 0">
+            and waw.business_line in
+            <foreach collection="param.businessLineList" item="businessLine" open="(" separator="," close=")">
+                #{businessLine}
+            </foreach>
+        </if>
+        <if test="param.brandList != null and param.brandList.size() > 0">
+            and lww.brand in
+            <foreach collection="param.brandList" item="brand" open="(" separator="," close=")">
+                #{brand}
+            </foreach>
+        </if>
+        <if test="param.departureWarehouseIds != null and param.departureWarehouseIds.size() > 0">
+            and lww.departure_warehouse_id in
+            <foreach collection="param.departureWarehouseIds" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="param.destinationWarehouseIds != null and param.destinationWarehouseIds.size() > 0">
+            and lww.destination_warehouse_id in
+            <foreach collection="param.destinationWarehouseIds" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="param.startTime != null ">
+            and lww.create_time &gt;= #{param.startTime}
+        </if>
+        <if test="param.endTime != null ">
+            and lww.create_time &lt;= #{param.endTime}
+        </if>
+        group by waw.business_line,
+                 lww.departure_warehouse_name,
+                 lww.destination_warehouse_name,
+                 lww.brand
+    </select>
+
+
+    <select id="updateWaybillQualityExport" resultType="com.logpm.report.vo.ReportUpdateWaybillVO">
+        select waw.business_line businessLine,
+        lww.departure_warehouse_name departureWarehouseName,
+        lww.destination_warehouse_name destinationWarehouseName,
+        lww.brand brand,
+        count(DISTINCT lww.id) totalNum,
+        count(DISTINCT ltwt.waybill_id) editNum,
+        count(ltwt.id) updateNum,
+        sum(if(ltwt.refer='发车前修改',1,0)) startBeforeNum,
+        IFNULL(concat(round(sum(if(ltwt.refer='发车前修改',1,0))/count(ltwt.id)*100,2),'%'),'0.00%') startBeforeRate,
+        sum(if(ltwt.refer='人为操作错误',1,0)) personProbleNum,
+        IFNULL(concat(round(sum(if(ltwt.refer='人为操作错误',1,0))/count(ltwt.id)*100,2),'%'),'0.00%') personProbleRate,
+        sum(if(ltwt.refer='财务修改',1,0)) financeUpdateNum,
+        IFNULL(concat(round(sum(if(ltwt.refer='财务修改',1,0))/count(ltwt.id)*100,2),'%'),'0.00%') financeUpdateRate,
+        sum(if(ltwt.refer='商家要求',1,0)) merchantUpdateNum,
+        IFNULL(concat(round(sum(if(ltwt.refer='商家要求',1,0))/count(ltwt.id)*100,2),'%'),'0.00%') merchantUpdateRate,
+        sum(if(ltwt.refer='业务调整',1,0)) businessUpdateNum,
+        IFNULL(concat(round(sum(if(ltwt.refer='业务调整',1,0))/count(ltwt.id)*100,2),'%'),'0.00%') businessUpdateRate,
+        IFNULL(concat(round(count(DISTINCT ltwt.waybill_id)/count(DISTINCT lww.id)*100,2),'%'),'0.00%') updateRate
+        from logpm_warehouse_waybill lww
+        left join logpm_warehouse_warehouse waw on waw.id = lww.destination_warehouse_id
+        left join logpm_trunkline_waybill_track ltwt on ltwt.waybill_id = lww.id and ltwt.track_type = '888'
+        where 1=1
+        and lww.create_time > '2024-10-22 00:00:00'
+        and waw.business_line is not null
+        <if test="param.businessLineList != null and param.businessLineList.size() > 0">
+            and waw.business_line in
+            <foreach collection="param.businessLineList" item="businessLine" open="(" separator="," close=")">
+                #{businessLine}
+            </foreach>
+        </if>
+        <if test="param.brandList != null and param.brandList.size() > 0">
+            and lww.brand in
+            <foreach collection="param.brandList" item="brand" open="(" separator="," close=")">
+                #{brand}
+            </foreach>
+        </if>
+        <if test="param.departureWarehouseIds != null and param.departureWarehouseIds.size() > 0">
+            and lww.departure_warehouse_id in
+            <foreach collection="param.departureWarehouseIds" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="param.destinationWarehouseIds != null and param.destinationWarehouseIds.size() > 0">
+            and lww.destination_warehouse_id in
+            <foreach collection="param.destinationWarehouseIds" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="param.startTime != null ">
+            and lww.create_time &gt;= #{param.startTime}
+        </if>
+        <if test="param.endTime != null ">
+            and lww.create_time &lt;= #{param.endTime}
+        </if>
+        group by waw.business_line,
+        lww.departure_warehouse_name,
+        lww.destination_warehouse_name,
+        lww.brand
+    </select>
+
+</mapper>

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

@@ -2,8 +2,7 @@ package com.logpm.report.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.report.dto.ReportTimeDTO;
-import com.logpm.report.vo.ReportCheckWaybillTimeVO;
-import com.logpm.report.vo.ReportOpenTimeVO;
+import com.logpm.report.vo.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -20,4 +19,28 @@ public interface ReportTimeMapper {
 	IPage<ReportCheckWaybillTimeVO> checkWaybillTimePage(IPage<Object> page, @Param("param") ReportTimeDTO reportTimeDTO);
 
 	List<ReportCheckWaybillTimeVO> checkWaybillTimeExport(@Param("param") ReportTimeDTO reportTimeDTO);
+
+    IPage<ReportPackgeStartTimeVO> packageStartTimePage(IPage<Object> page, @Param("param") ReportTimeDTO reportTimeDTO);
+
+	List<ReportPackgeStartTimeVO> packageStartTimeExport(@Param("param") ReportTimeDTO reportTimeDTO);
+
+	IPage<ReportPackgeStartTimeVO> zeroStartTimePage(IPage<Object> page, @Param("param") ReportTimeDTO reportTimeDTO);
+
+	List<ReportPackgeStartTimeVO> zeroStartTimeExport(@Param("param") ReportTimeDTO reportTimeDTO);
+
+	IPage<ReportPackgeTransferTimeVO> packageTransferTimePage(IPage<Object> page, @Param("param") ReportTimeDTO reportTimeDTO);
+
+	List<ReportPackgeTransferTimeVO> packageTransferTimeExport(@Param("param") ReportTimeDTO reportTimeDTO);
+
+	IPage<ReportPackgeTransferTimeVO> zeroTransferTimePage(IPage<Object> page, @Param("param") ReportTimeDTO reportTimeDTO);
+
+	List<ReportPackgeTransferTimeVO> zeroTransferTimeExport(@Param("param") ReportTimeDTO reportTimeDTO);
+
+	IPage<ReportPackgeAllTrunklineTimeVO> packageAllTrunklineTimePage(IPage<Object> page, @Param("param") ReportTimeDTO reportTimeDTO);
+
+	List<ReportPackgeAllTrunklineTimeVO> packageAllTrunklineTimeExport(@Param("param") ReportTimeDTO reportTimeDTO);
+
+	IPage<ReportPackgeAllTrunklineTimeVO> zeroAllTrunklineTimePage(IPage<Object> page, @Param("param") ReportTimeDTO reportTimeDTO);
+
+	List<ReportPackgeAllTrunklineTimeVO> zeroAllTrunklineTimeExport(@Param("param") ReportTimeDTO reportTimeDTO);
 }

blade-service/logpm-report/src/main/java/com/logpm/report/service/IReportConfigAdvanceDetailOpenService.java

@@ -0,0 +1,14 @@
+package com.logpm.report.service;
+
+import com.logpm.report.dto.ReportConfigDTO;
+import com.logpm.report.entity.ReportConfigAdvanceDetailOpenEntity;
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.core.tool.api.R;
+
+public interface IReportConfigAdvanceDetailOpenService extends BaseService<ReportConfigAdvanceDetailOpenEntity> {
+	R openTimeConfigPage(ReportConfigDTO reportConfigDTO);
+
+	R addOpenTimeConfig(ReportConfigDTO reportConfigDTO);
+
+	R deleteOpenTimeConfig(ReportConfigDTO reportConfigDTO);
+}

blade-service/logpm-report/src/main/java/com/logpm/report/service/IReportConfigAllTrunklineService.java

@@ -0,0 +1,14 @@
+package com.logpm.report.service;
+
+import com.logpm.report.dto.ReportConfigDTO;
+import com.logpm.report.entity.ReportConfigAllTrunklineEntity;
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.core.tool.api.R;
+
+public interface IReportConfigAllTrunklineService extends BaseService<ReportConfigAllTrunklineEntity> {
+	R allTrunklineConfigPage(ReportConfigDTO reportConfigDTO);
+
+	R addAllTrunklineConfig(ReportConfigDTO reportConfigDTO);
+
+	R deleteAllTrunklineConfig(ReportConfigDTO reportConfigDTO);
+}

blade-service/logpm-report/src/main/java/com/logpm/report/service/IReportConfigCheckWaybillService.java

@@ -0,0 +1,14 @@
+package com.logpm.report.service;
+
+import com.logpm.report.dto.ReportConfigDTO;
+import com.logpm.report.entity.ReportConfigCheckWaybillEntity;
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.core.tool.api.R;
+
+public interface IReportConfigCheckWaybillService extends BaseService<ReportConfigCheckWaybillEntity> {
+	R checkWaybillConfigPage(ReportConfigDTO reportConfigDTO);
+
+	R addCheckWaybillConfig(ReportConfigDTO reportConfigDTO);
+
+	R deleteCheckWaybillConfig(ReportConfigDTO reportConfigDTO);
+}

blade-service/logpm-report/src/main/java/com/logpm/report/service/IReportConfigDespatchService.java

@@ -0,0 +1,14 @@
+package com.logpm.report.service;
+
+import com.logpm.report.dto.ReportConfigDTO;
+import com.logpm.report.entity.ReportConfigDespatchEntity;
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.core.tool.api.R;
+
+public interface IReportConfigDespatchService extends BaseService<ReportConfigDespatchEntity> {
+	R despatchConfigPage(ReportConfigDTO reportConfigDTO);
+
+	R addDespatchConfig(ReportConfigDTO reportConfigDTO);
+
+	R deleteDespatchConfig(ReportConfigDTO reportConfigDTO);
+}

blade-service/logpm-report/src/main/java/com/logpm/report/service/IReportConfigTransferService.java

@@ -0,0 +1,14 @@
+package com.logpm.report.service;
+
+import com.logpm.report.dto.ReportConfigDTO;
+import com.logpm.report.entity.ReportConfigTransferEntity;
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.core.tool.api.R;
+
+public interface IReportConfigTransferService extends BaseService<ReportConfigTransferEntity> {
+	R transferConfigPage(ReportConfigDTO reportConfigDTO);
+
+	R addTransferConfig(ReportConfigDTO reportConfigDTO);
+
+	R deleteTransferConfig(ReportConfigDTO reportConfigDTO);
+}

blade-service/logpm-report/src/main/java/com/logpm/report/service/IReportQualityService.java

@@ -0,0 +1,13 @@
+package com.logpm.report.service;
+
+import com.logpm.report.dto.ReportQualityDTO;
+import org.springblade.core.tool.api.R;
+
+import javax.servlet.http.HttpServletResponse;
+
+public interface IReportQualityService {
+	R updateWaybillQualityPage(ReportQualityDTO reportQualityDTO);
+
+	void updateWaybillQualityExport(ReportQualityDTO reportQualityDTO, HttpServletResponse response);
+
+}

blade-service/logpm-report/src/main/java/com/logpm/report/service/IReportTimeService.java

@@ -15,4 +15,28 @@ public interface IReportTimeService {
 	R checkWaybillTimePage(ReportTimeDTO reportTimeDTO);
 
 	void checkWaybillTimeExport(ReportTimeDTO reportTimeDTO, HttpServletResponse response);
+
+    R packageStartTimePage(ReportTimeDTO reportTimeDTO);
+
+	void packageStartTimeExport(ReportTimeDTO reportTimeDTO, HttpServletResponse response);
+
+	R zeroStartTimePage(ReportTimeDTO reportTimeDTO);
+
+	void zeroStartTimeExport(ReportTimeDTO reportTimeDTO, HttpServletResponse response);
+
+	R packageTransferTimePage(ReportTimeDTO reportTimeDTO);
+
+	void packageTransferTimeExport(ReportTimeDTO reportTimeDTO, HttpServletResponse response);
+
+	R zeroTransferTimePage(ReportTimeDTO reportTimeDTO);
+
+	void zeroTransferTimeExport(ReportTimeDTO reportTimeDTO, HttpServletResponse response);
+
+	R packageAllTrunklineTimePage(ReportTimeDTO reportTimeDTO);
+
+	void packageAllTrunklineTimeExport(ReportTimeDTO reportTimeDTO, HttpServletResponse response);
+
+	R zeroAllTrunklineTimePage(ReportTimeDTO reportTimeDTO);
+
+	void zeroAllTrunklineTimeExport(ReportTimeDTO reportTimeDTO, HttpServletResponse response);
 }

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

@@ -0,0 +1,67 @@
+package com.logpm.report.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.logpm.report.dto.ReportConfigDTO;
+import com.logpm.report.entity.ReportConfigAdvanceDetailOpenEntity;
+import com.logpm.report.mapper.ReportConfigAdvanceDetailOpenMapper;
+import com.logpm.report.service.IReportConfigAdvanceDetailOpenService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.tool.api.R;
+import org.springframework.stereotype.Service;
+
+import java.util.Objects;
+
+@Service
+@AllArgsConstructor
+@Slf4j
+public class ReportConfigAdvanceDetailOpenServiceImpl extends BaseServiceImpl<ReportConfigAdvanceDetailOpenMapper, ReportConfigAdvanceDetailOpenEntity> implements IReportConfigAdvanceDetailOpenService {
+	@Override
+	public R openTimeConfigPage(ReportConfigDTO reportConfigDTO) {
+
+		IPage<Object> page = new Page<>();
+		page.setCurrent(reportConfigDTO.getPageNum());
+		page.setSize(reportConfigDTO.getPageSize());
+
+		IPage<ReportConfigAdvanceDetailOpenEntity> ipage = baseMapper.openTimeConfigPage(page, reportConfigDTO);
+
+		return R.data(ipage);
+	}
+
+	@Override
+	public R addOpenTimeConfig(ReportConfigDTO reportConfigDTO) {
+
+		Long warehouseId = reportConfigDTO.getWarehouseId();
+		String warehouseName = reportConfigDTO.getWarehouseName();
+		String brand = reportConfigDTO.getBrand();
+
+		QueryWrapper<ReportConfigAdvanceDetailOpenEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("warehouse_name",warehouseName)
+			.eq("brand",brand)
+			.eq("is_deleted",0);
+		ReportConfigAdvanceDetailOpenEntity reportConfigAdvanceDetailOpenEntity = baseMapper.selectOne(queryWrapper);
+		if(!Objects.isNull(reportConfigAdvanceDetailOpenEntity)){
+			reportConfigAdvanceDetailOpenEntity.setHoursTime(reportConfigDTO.getHoursTime());
+		}else{
+			reportConfigAdvanceDetailOpenEntity = ReportConfigAdvanceDetailOpenEntity.builder()
+					.warehouseId(warehouseId)
+					.warehouseName(warehouseName)
+					.brand(brand)
+					.hoursTime(reportConfigDTO.getHoursTime())
+					.build();
+		}
+		saveOrUpdate(reportConfigAdvanceDetailOpenEntity);
+
+		return R.success("保存成功");
+	}
+
+	@Override
+	public R deleteOpenTimeConfig(ReportConfigDTO reportConfigDTO) {
+		Long id = reportConfigDTO.getId();
+		removeById(id);
+		return R.success("删除成功");
+	}
+}

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

@@ -0,0 +1,69 @@
+package com.logpm.report.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.logpm.report.dto.ReportConfigDTO;
+import com.logpm.report.entity.ReportConfigAdvanceDetailOpenEntity;
+import com.logpm.report.entity.ReportConfigAllTrunklineEntity;
+import com.logpm.report.mapper.ReportConfigAllTrunklineMapper;
+import com.logpm.report.service.IReportConfigAllTrunklineService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.tool.api.R;
+import org.springframework.stereotype.Service;
+
+import java.util.Objects;
+
+@Service
+@AllArgsConstructor
+@Slf4j
+public class ReportConfigAllTrunklineServiceImpl extends BaseServiceImpl<ReportConfigAllTrunklineMapper, ReportConfigAllTrunklineEntity> implements IReportConfigAllTrunklineService {
+	@Override
+	public R allTrunklineConfigPage(ReportConfigDTO reportConfigDTO) {
+		IPage<Object> page = new Page<>();
+		page.setCurrent(reportConfigDTO.getPageNum());
+		page.setSize(reportConfigDTO.getPageSize());
+
+		IPage<ReportConfigAdvanceDetailOpenEntity> ipage = baseMapper.allTrunklineConfigPage(page, reportConfigDTO);
+
+		return R.data(ipage);
+	}
+
+	@Override
+	public R addAllTrunklineConfig(ReportConfigDTO reportConfigDTO) {
+		Long departureWarehouseId = reportConfigDTO.getDepartureWarehouseId();
+		String departureWarehouseName = reportConfigDTO.getDepartureWarehouseName();
+		Long destinationWarehouseId = reportConfigDTO.getDestinationWarehouseId();
+		String destinationWarehouseName = reportConfigDTO.getDestinationWarehouseName();
+		String brand = reportConfigDTO.getBrand();
+
+		QueryWrapper<ReportConfigAllTrunklineEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("departure_warehouse_name",departureWarehouseName)
+			.eq("destination_warehouse_name",destinationWarehouseName)
+			.eq("is_deleted",0);
+		ReportConfigAllTrunklineEntity reportConfigAllTrunklineEntity = baseMapper.selectOne(queryWrapper);
+		if(!Objects.isNull(reportConfigAllTrunklineEntity)){
+			reportConfigAllTrunklineEntity.setHoursTime(reportConfigDTO.getHoursTime());
+		}else{
+			reportConfigAllTrunklineEntity = ReportConfigAllTrunklineEntity.builder()
+				.departureWarehouseId(departureWarehouseId)
+				.departureWarehouseName(departureWarehouseName)
+				.destinationWarehouseId(destinationWarehouseId)
+				.destinationWarehouseName(destinationWarehouseName)
+				.hoursTime(reportConfigDTO.getHoursTime())
+				.build();
+		}
+		saveOrUpdate(reportConfigAllTrunklineEntity);
+
+		return R.success("保存成功");
+	}
+
+	@Override
+	public R deleteAllTrunklineConfig(ReportConfigDTO reportConfigDTO) {
+		Long id = reportConfigDTO.getId();
+		removeById(id);
+		return R.success("删除成功");
+	}
+}

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

@@ -0,0 +1,70 @@
+package com.logpm.report.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.logpm.report.dto.ReportConfigDTO;
+import com.logpm.report.entity.ReportConfigCheckWaybillEntity;
+import com.logpm.report.mapper.ReportConfigCheckWaybillMapper;
+import com.logpm.report.service.IReportConfigCheckWaybillService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.tool.api.R;
+import org.springframework.stereotype.Service;
+
+import java.util.Objects;
+
+@Service
+@AllArgsConstructor
+@Slf4j
+public class ReportConfigCheckWaybillServiceImpl extends BaseServiceImpl<ReportConfigCheckWaybillMapper, ReportConfigCheckWaybillEntity> implements IReportConfigCheckWaybillService {
+	@Override
+	public R checkWaybillConfigPage(ReportConfigDTO reportConfigDTO) {
+		IPage<Object> page = new Page<>();
+		page.setCurrent(reportConfigDTO.getPageNum());
+		page.setSize(reportConfigDTO.getPageSize());
+
+		IPage<ReportConfigCheckWaybillEntity> ipage = baseMapper.checkWaybillConfigPage(page, reportConfigDTO);
+
+		return R.data(ipage);
+	}
+
+	@Override
+	public R addCheckWaybillConfig(ReportConfigDTO reportConfigDTO) {
+		Long departureWarehouseId = reportConfigDTO.getDepartureWarehouseId();
+		String departureWarehouseName = reportConfigDTO.getDepartureWarehouseName();
+		Long destinationWarehouseId = reportConfigDTO.getDestinationWarehouseId();
+		String destinationWarehouseName = reportConfigDTO.getDestinationWarehouseName();
+		String brand = reportConfigDTO.getBrand();
+
+		QueryWrapper<ReportConfigCheckWaybillEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("departure_warehouse_name",departureWarehouseName)
+			.eq("destination_warehouse_name",destinationWarehouseName)
+			.eq("brand",brand)
+			.eq("is_deleted",0);
+		ReportConfigCheckWaybillEntity reportConfigCheckWaybillEntity = baseMapper.selectOne(queryWrapper);
+		if(!Objects.isNull(reportConfigCheckWaybillEntity)){
+			reportConfigCheckWaybillEntity.setHoursTime(reportConfigDTO.getHoursTime());
+		}else{
+			reportConfigCheckWaybillEntity = ReportConfigCheckWaybillEntity.builder()
+					.departureWarehouseId(departureWarehouseId)
+					.departureWarehouseName(departureWarehouseName)
+					.destinationWarehouseId(destinationWarehouseId)
+					.destinationWarehouseName(destinationWarehouseName)
+					.brand(brand)
+					.hoursTime(reportConfigDTO.getHoursTime())
+					.build();
+		}
+		saveOrUpdate(reportConfigCheckWaybillEntity);
+
+		return R.success("保存成功");
+	}
+
+	@Override
+	public R deleteCheckWaybillConfig(ReportConfigDTO reportConfigDTO) {
+		Long id = reportConfigDTO.getId();
+		removeById(id);
+		return R.success("删除成功");
+	}
+}

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

@@ -0,0 +1,70 @@
+package com.logpm.report.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.logpm.report.dto.ReportConfigDTO;
+import com.logpm.report.entity.ReportConfigDespatchEntity;
+import com.logpm.report.mapper.ReportConfigDespatchMapper;
+import com.logpm.report.service.IReportConfigDespatchService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.tool.api.R;
+import org.springframework.stereotype.Service;
+
+import java.util.Objects;
+
+@Service
+@AllArgsConstructor
+@Slf4j
+public class ReportConfigDespatchServiceImpl extends BaseServiceImpl<ReportConfigDespatchMapper, ReportConfigDespatchEntity> implements IReportConfigDespatchService {
+	@Override
+	public R despatchConfigPage(ReportConfigDTO reportConfigDTO) {
+		IPage<Object> page = new Page<>();
+		page.setCurrent(reportConfigDTO.getPageNum());
+		page.setSize(reportConfigDTO.getPageSize());
+
+		IPage<ReportConfigDespatchEntity> ipage = baseMapper.despatchConfigPage(page, reportConfigDTO);
+
+		return R.data(ipage);
+	}
+
+	@Override
+	public R addDespatchConfig(ReportConfigDTO reportConfigDTO) {
+		Long departureWarehouseId = reportConfigDTO.getDepartureWarehouseId();
+		String departureWarehouseName = reportConfigDTO.getDepartureWarehouseName();
+		Long destinationWarehouseId = reportConfigDTO.getDestinationWarehouseId();
+		String destinationWarehouseName = reportConfigDTO.getDestinationWarehouseName();
+		String brand = reportConfigDTO.getBrand();
+
+		QueryWrapper<ReportConfigDespatchEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("departure_warehouse_name",departureWarehouseName)
+			.eq("destination_warehouse_name",destinationWarehouseName)
+			.eq("brand",brand)
+			.eq("is_deleted",0);
+		ReportConfigDespatchEntity reportConfigDespatchEntity = baseMapper.selectOne(queryWrapper);
+		if(!Objects.isNull(reportConfigDespatchEntity)){
+			reportConfigDespatchEntity.setHoursTime(reportConfigDTO.getHoursTime());
+		}else{
+			reportConfigDespatchEntity = ReportConfigDespatchEntity.builder()
+				.departureWarehouseId(departureWarehouseId)
+				.destinationWarehouseId(destinationWarehouseId)
+				.departureWarehouseName(departureWarehouseName)
+				.destinationWarehouseName(destinationWarehouseName)
+				.brand(brand)
+				.hoursTime(reportConfigDTO.getHoursTime())
+				.build();
+		}
+		saveOrUpdate(reportConfigDespatchEntity);
+
+		return R.success("保存成功");
+	}
+
+	@Override
+	public R deleteDespatchConfig(ReportConfigDTO reportConfigDTO) {
+		Long id = reportConfigDTO.getId();
+		removeById(id);
+		return R.success("删除成功");
+	}
+}

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

@@ -0,0 +1,65 @@
+package com.logpm.report.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.logpm.report.dto.ReportConfigDTO;
+import com.logpm.report.entity.ReportConfigTransferEntity;
+import com.logpm.report.mapper.ReportConfigTransferMapper;
+import com.logpm.report.service.IReportConfigTransferService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.tool.api.R;
+import org.springframework.stereotype.Service;
+
+import java.util.Objects;
+
+@Service
+@AllArgsConstructor
+@Slf4j
+public class ReportConfigTransferServiceImpl extends BaseServiceImpl<ReportConfigTransferMapper, ReportConfigTransferEntity> implements IReportConfigTransferService {
+	@Override
+	public R transferConfigPage(ReportConfigDTO reportConfigDTO) {
+		IPage<Object> page = new Page<>();
+		page.setCurrent(reportConfigDTO.getPageNum());
+		page.setSize(reportConfigDTO.getPageSize());
+
+		IPage<ReportConfigTransferEntity> ipage = baseMapper.transferConfigPage(page, reportConfigDTO);
+
+		return R.data(ipage);
+	}
+
+	@Override
+	public R addTransferConfig(ReportConfigDTO reportConfigDTO) {
+		Long warehouseId = reportConfigDTO.getWarehouseId();
+		String warehouseName = reportConfigDTO.getWarehouseName();
+		String brand = reportConfigDTO.getBrand();
+
+		QueryWrapper<ReportConfigTransferEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("warehouse_name",warehouseName)
+			.eq("brand",brand)
+			.eq("is_deleted",0);
+		ReportConfigTransferEntity reportConfigTransferEntity = baseMapper.selectOne(queryWrapper);
+		if(!Objects.isNull(reportConfigTransferEntity)){
+			reportConfigTransferEntity.setHoursTime(reportConfigDTO.getHoursTime());
+		}else{
+			reportConfigTransferEntity = ReportConfigTransferEntity.builder()
+				.warehouseId(warehouseId)
+				.warehouseName(warehouseName)
+				.brand(brand)
+				.hoursTime(reportConfigDTO.getHoursTime())
+				.build();
+		}
+		saveOrUpdate(reportConfigTransferEntity);
+
+		return R.success("保存成功");
+	}
+
+	@Override
+	public R deleteTransferConfig(ReportConfigDTO reportConfigDTO) {
+		Long id = reportConfigDTO.getId();
+		removeById(id);
+		return R.success("删除成功");
+	}
+}

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

@@ -0,0 +1,53 @@
+package com.logpm.report.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.logpm.report.dto.ReportQualityDTO;
+import com.logpm.report.mapper.ReportQualityMapper;
+import com.logpm.report.service.IReportQualityService;
+import com.logpm.report.vo.ReportCheckWaybillTimeVO;
+import com.logpm.report.vo.ReportUpdateWaybillVO;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.common.utils.CommonUtil;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.tool.api.R;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+@Service
+@AllArgsConstructor
+@Slf4j
+public class ReportQualityServiceImpl implements IReportQualityService {
+
+	private final ReportQualityMapper reportQualityMapper;
+
+	@Override
+	public R updateWaybillQualityPage(ReportQualityDTO reportQualityDTO) {
+		IPage<Object> page = new Page<>();
+		page.setCurrent(reportQualityDTO.getPageNum());
+		page.setSize(reportQualityDTO.getPageSize());
+
+		reportQualityDTO.setStartTime(CommonUtil.getStartByDateStr(reportQualityDTO.getStartTimeStr()));
+		reportQualityDTO.setEndTime(CommonUtil.getEndByDateStr(reportQualityDTO.getEndTimeStr()));
+
+		IPage<ReportUpdateWaybillVO> iPage = reportQualityMapper.updateWaybillQualityPage(page,reportQualityDTO);
+
+		return R.data(iPage);
+	}
+
+	@Override
+	public void updateWaybillQualityExport(ReportQualityDTO reportQualityDTO, HttpServletResponse response) {
+
+		reportQualityDTO.setStartTime(CommonUtil.getStartByDateStr(reportQualityDTO.getStartTimeStr()));
+		reportQualityDTO.setEndTime(CommonUtil.getEndByDateStr(reportQualityDTO.getEndTimeStr()));
+
+		List<ReportUpdateWaybillVO> list = reportQualityMapper.updateWaybillQualityExport(reportQualityDTO);
+
+		//导出ls
+		ExcelUtil.export(response, "改单质量报表导出", "改单质量报表导出", list, ReportUpdateWaybillVO.class);
+
+	}
+}

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

@@ -1,12 +1,16 @@
 package com.logpm.report.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.logpm.report.dto.ReportTimeDTO;
+import com.logpm.report.entity.ReportConfigAdvanceDetailOpenEntity;
+import com.logpm.report.entity.ReportConfigCheckWaybillEntity;
+import com.logpm.report.entity.ReportConfigDespatchEntity;
+import com.logpm.report.entity.ReportConfigTransferEntity;
 import com.logpm.report.mapper.ReportTimeMapper;
-import com.logpm.report.service.IReportTimeService;
-import com.logpm.report.vo.ReportCheckWaybillTimeVO;
-import com.logpm.report.vo.ReportOpenTimeVO;
+import com.logpm.report.service.*;
+import com.logpm.report.vo.*;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.utils.CommonUtil;
@@ -16,6 +20,7 @@ import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.Objects;
 
 @Service
 @Slf4j
@@ -23,6 +28,10 @@ import java.util.List;
 public class ReportTimeServiceImpl implements IReportTimeService {
 
 	private final ReportTimeMapper reportTimeMapper;
+	private final IReportConfigAdvanceDetailOpenService advanceDetailOpenService;
+	private final IReportConfigCheckWaybillService checkWaybillService;
+	private final IReportConfigDespatchService despatchService;
+	private final IReportConfigTransferService transferService;
 
 
 	@Override
@@ -35,6 +44,17 @@ public class ReportTimeServiceImpl implements IReportTimeService {
 		reportTimeDTO.setStartTime(CommonUtil.getStartByDateStr(reportTimeDTO.getStartTimeStr()));
 		reportTimeDTO.setEndTime(CommonUtil.getEndByDateStr(reportTimeDTO.getEndTimeStr()));
 
+		reportTimeDTO.setHoursTime(72);
+
+		QueryWrapper<ReportConfigAdvanceDetailOpenEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("warehouse_name","全部")
+			.eq("brand","全部")
+			.eq("is_deleted",0);
+		ReportConfigAdvanceDetailOpenEntity advanceDetailOpenEntity = advanceDetailOpenService.getOne(queryWrapper);
+		if(!Objects.isNull(advanceDetailOpenEntity)){
+			reportTimeDTO.setHoursTime(advanceDetailOpenEntity.getHoursTime());
+		}
+
 		IPage<ReportOpenTimeVO> iPage = reportTimeMapper.openTimePage(page,reportTimeDTO);
 
 
@@ -44,13 +64,21 @@ public class ReportTimeServiceImpl implements IReportTimeService {
 	@Override
 	public void openTimeExport(ReportTimeDTO reportTimeDTO, HttpServletResponse response) {
 
-		IPage<Object> page = new Page<>();
-		page.setCurrent(reportTimeDTO.getPageNum());
-		page.setSize(reportTimeDTO.getPageSize());
 
 		reportTimeDTO.setStartTime(CommonUtil.getStartByDateStr(reportTimeDTO.getStartTimeStr()));
 		reportTimeDTO.setEndTime(CommonUtil.getEndByDateStr(reportTimeDTO.getEndTimeStr()));
 
+		reportTimeDTO.setHoursTime(72);
+
+		QueryWrapper<ReportConfigAdvanceDetailOpenEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("warehouse_name","全部")
+			.eq("brand","全部")
+			.eq("is_deleted",0);
+		ReportConfigAdvanceDetailOpenEntity advanceDetailOpenEntity = advanceDetailOpenService.getOne(queryWrapper);
+		if(!Objects.isNull(advanceDetailOpenEntity)){
+			reportTimeDTO.setHoursTime(advanceDetailOpenEntity.getHoursTime());
+		}
+
 		List<ReportOpenTimeVO> list = reportTimeMapper.openTimeExport(reportTimeDTO);
 
 		//导出ls
@@ -67,6 +95,18 @@ public class ReportTimeServiceImpl implements IReportTimeService {
 		reportTimeDTO.setStartTime(CommonUtil.getStartByDateStr(reportTimeDTO.getStartTimeStr()));
 		reportTimeDTO.setEndTime(CommonUtil.getEndByDateStr(reportTimeDTO.getEndTimeStr()));
 
+		reportTimeDTO.setHoursTime(72);
+
+		QueryWrapper<ReportConfigCheckWaybillEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("departure_warehouse_name","全部")
+			.eq("destination_warehouse_name","全部")
+			.eq("brand","全部")
+			.eq("is_deleted",0);
+		ReportConfigCheckWaybillEntity checkWaybillEntity = checkWaybillService.getOne(queryWrapper);
+		if(!Objects.isNull(checkWaybillEntity)){
+			reportTimeDTO.setHoursTime(checkWaybillEntity.getHoursTime());
+		}
+
 		IPage<ReportCheckWaybillTimeVO> iPage = reportTimeMapper.checkWaybillTimePage(page,reportTimeDTO);
 
 
@@ -75,6 +115,30 @@ public class ReportTimeServiceImpl implements IReportTimeService {
 
 	@Override
 	public void checkWaybillTimeExport(ReportTimeDTO reportTimeDTO, HttpServletResponse response) {
+
+		reportTimeDTO.setStartTime(CommonUtil.getStartByDateStr(reportTimeDTO.getStartTimeStr()));
+		reportTimeDTO.setEndTime(CommonUtil.getEndByDateStr(reportTimeDTO.getEndTimeStr()));
+
+		reportTimeDTO.setHoursTime(72);
+
+		QueryWrapper<ReportConfigCheckWaybillEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("departure_warehouse_name","全部")
+			.eq("destination_warehouse_name","全部")
+			.eq("brand","全部")
+			.eq("is_deleted",0);
+		ReportConfigCheckWaybillEntity checkWaybillEntity = checkWaybillService.getOne(queryWrapper);
+		if(!Objects.isNull(checkWaybillEntity)){
+			reportTimeDTO.setHoursTime(checkWaybillEntity.getHoursTime());
+		}
+
+		List<ReportCheckWaybillTimeVO> list = reportTimeMapper.checkWaybillTimeExport(reportTimeDTO);
+
+		//导出ls
+		ExcelUtil.export(response, "审单及时率报表导出", "审单及时率报表导出", list, ReportCheckWaybillTimeVO.class);
+	}
+
+	@Override
+	public R packageStartTimePage(ReportTimeDTO reportTimeDTO) {
 		IPage<Object> page = new Page<>();
 		page.setCurrent(reportTimeDTO.getPageNum());
 		page.setSize(reportTimeDTO.getPageSize());
@@ -82,9 +146,220 @@ public class ReportTimeServiceImpl implements IReportTimeService {
 		reportTimeDTO.setStartTime(CommonUtil.getStartByDateStr(reportTimeDTO.getStartTimeStr()));
 		reportTimeDTO.setEndTime(CommonUtil.getEndByDateStr(reportTimeDTO.getEndTimeStr()));
 
-		List<ReportCheckWaybillTimeVO> list = reportTimeMapper.checkWaybillTimeExport(reportTimeDTO);
+		reportTimeDTO.setHoursTime(72);
+
+		QueryWrapper<ReportConfigDespatchEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("departure_warehouse_name","全部")
+			.eq("destination_warehouse_name","全部")
+			.eq("brand","全部")
+			.eq("is_deleted",0);
+		ReportConfigDespatchEntity despatchEntity = despatchService.getOne(queryWrapper);
+		if(!Objects.isNull(despatchEntity)){
+			reportTimeDTO.setHoursTime(despatchEntity.getHoursTime());
+		}
+
+		IPage<ReportPackgeStartTimeVO> iPage = reportTimeMapper.packageStartTimePage(page,reportTimeDTO);
+
+
+		return R.data(iPage);
+	}
+
+	@Override
+	public void packageStartTimeExport(ReportTimeDTO reportTimeDTO, HttpServletResponse response) {
+		reportTimeDTO.setStartTime(CommonUtil.getStartByDateStr(reportTimeDTO.getStartTimeStr()));
+		reportTimeDTO.setEndTime(CommonUtil.getEndByDateStr(reportTimeDTO.getEndTimeStr()));
+
+		reportTimeDTO.setHoursTime(72);
+
+		QueryWrapper<ReportConfigDespatchEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("departure_warehouse_name","全部")
+			.eq("destination_warehouse_name","全部")
+			.eq("brand","全部")
+			.eq("is_deleted",0);
+		ReportConfigDespatchEntity despatchEntity = despatchService.getOne(queryWrapper);
+		if(!Objects.isNull(despatchEntity)){
+			reportTimeDTO.setHoursTime(despatchEntity.getHoursTime());
+		}
+
+		List<ReportPackgeStartTimeVO> list = reportTimeMapper.packageStartTimeExport(reportTimeDTO);
 
 		//导出ls
-		ExcelUtil.export(response, "审单及时率报表导出", "审单及时率报表导出", list, ReportCheckWaybillTimeVO.class);
+		ExcelUtil.export(response, "订制品发运时效报表导出", "订制品发运时效报表导出", list, ReportPackgeStartTimeVO.class);
+	}
+
+	@Override
+	public R zeroStartTimePage(ReportTimeDTO reportTimeDTO) {
+		IPage<Object> page = new Page<>();
+		page.setCurrent(reportTimeDTO.getPageNum());
+		page.setSize(reportTimeDTO.getPageSize());
+
+		reportTimeDTO.setStartTime(CommonUtil.getStartByDateStr(reportTimeDTO.getStartTimeStr()));
+		reportTimeDTO.setEndTime(CommonUtil.getEndByDateStr(reportTimeDTO.getEndTimeStr()));
+
+		reportTimeDTO.setHoursTime(72);
+
+		QueryWrapper<ReportConfigDespatchEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("departure_warehouse_name","全部")
+			.eq("destination_warehouse_name","全部")
+			.eq("brand","全部")
+			.eq("is_deleted",0);
+		ReportConfigDespatchEntity despatchEntity = despatchService.getOne(queryWrapper);
+		if(!Objects.isNull(despatchEntity)){
+			reportTimeDTO.setHoursTime(despatchEntity.getHoursTime());
+		}
+
+		IPage<ReportPackgeStartTimeVO> iPage = reportTimeMapper.zeroStartTimePage(page,reportTimeDTO);
+
+
+		return R.data(iPage);
+	}
+
+	@Override
+	public void zeroStartTimeExport(ReportTimeDTO reportTimeDTO, HttpServletResponse response) {
+		reportTimeDTO.setStartTime(CommonUtil.getStartByDateStr(reportTimeDTO.getStartTimeStr()));
+		reportTimeDTO.setEndTime(CommonUtil.getEndByDateStr(reportTimeDTO.getEndTimeStr()));
+
+		reportTimeDTO.setHoursTime(72);
+
+		QueryWrapper<ReportConfigDespatchEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("departure_warehouse_name","全部")
+			.eq("destination_warehouse_name","全部")
+			.eq("brand","全部")
+			.eq("is_deleted",0);
+		ReportConfigDespatchEntity despatchEntity = despatchService.getOne(queryWrapper);
+		if(!Objects.isNull(despatchEntity)){
+			reportTimeDTO.setHoursTime(despatchEntity.getHoursTime());
+		}
+
+		List<ReportPackgeStartTimeVO> list = reportTimeMapper.zeroStartTimeExport(reportTimeDTO);
+
+		//导出ls
+		ExcelUtil.export(response, "零担发运时效报表导出", "零担发运时效报表导出", list, ReportPackgeStartTimeVO.class);
+	}
+
+	@Override
+	public R packageTransferTimePage(ReportTimeDTO reportTimeDTO) {
+		IPage<Object> page = new Page<>();
+		page.setCurrent(reportTimeDTO.getPageNum());
+		page.setSize(reportTimeDTO.getPageSize());
+
+		reportTimeDTO.setStartTime(CommonUtil.getStartByDateStr(reportTimeDTO.getStartTimeStr()));
+		reportTimeDTO.setEndTime(CommonUtil.getEndByDateStr(reportTimeDTO.getEndTimeStr()));
+
+		reportTimeDTO.setHoursTime(48);
+
+		QueryWrapper<ReportConfigTransferEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("warehouse_name","全部")
+			.eq("brand","全部")
+			.eq("is_deleted",0);
+		ReportConfigTransferEntity transferEntity = transferService.getOne(queryWrapper);
+		if(!Objects.isNull(transferEntity)){
+			reportTimeDTO.setHoursTime(transferEntity.getHoursTime());
+		}
+
+		IPage<ReportPackgeTransferTimeVO> iPage = reportTimeMapper.packageTransferTimePage(page,reportTimeDTO);
+
+
+		return R.data(iPage);
+	}
+
+	@Override
+	public void packageTransferTimeExport(ReportTimeDTO reportTimeDTO, HttpServletResponse response) {
+		reportTimeDTO.setStartTime(CommonUtil.getStartByDateStr(reportTimeDTO.getStartTimeStr()));
+		reportTimeDTO.setEndTime(CommonUtil.getEndByDateStr(reportTimeDTO.getEndTimeStr()));
+
+		reportTimeDTO.setHoursTime(48);
+
+		QueryWrapper<ReportConfigTransferEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("warehouse_name","全部")
+			.eq("brand","全部")
+			.eq("is_deleted",0);
+		ReportConfigTransferEntity transferEntity = transferService.getOne(queryWrapper);
+		if(!Objects.isNull(transferEntity)){
+			reportTimeDTO.setHoursTime(transferEntity.getHoursTime());
+		}
+
+		List<ReportPackgeTransferTimeVO> list = reportTimeMapper.packageTransferTimeExport(reportTimeDTO);
+
+		//导出ls
+		ExcelUtil.export(response, "订制品中转时效报表导出", "订制品中转时效报表导出", list, ReportPackgeTransferTimeVO.class);
+	}
+
+	@Override
+	public R zeroTransferTimePage(ReportTimeDTO reportTimeDTO) {
+		IPage<Object> page = new Page<>();
+		page.setCurrent(reportTimeDTO.getPageNum());
+		page.setSize(reportTimeDTO.getPageSize());
+
+		reportTimeDTO.setStartTime(CommonUtil.getStartByDateStr(reportTimeDTO.getStartTimeStr()));
+		reportTimeDTO.setEndTime(CommonUtil.getEndByDateStr(reportTimeDTO.getEndTimeStr()));
+
+		IPage<ReportPackgeTransferTimeVO> iPage = reportTimeMapper.zeroTransferTimePage(page,reportTimeDTO);
+
+
+		return R.data(iPage);
+	}
+
+	@Override
+	public void zeroTransferTimeExport(ReportTimeDTO reportTimeDTO, HttpServletResponse response) {
+		reportTimeDTO.setStartTime(CommonUtil.getStartByDateStr(reportTimeDTO.getStartTimeStr()));
+		reportTimeDTO.setEndTime(CommonUtil.getEndByDateStr(reportTimeDTO.getEndTimeStr()));
+
+		List<ReportPackgeTransferTimeVO> list = reportTimeMapper.zeroTransferTimeExport(reportTimeDTO);
+
+		//导出ls
+		ExcelUtil.export(response, "零担中转时效报表导出", "零担中转时效报表导出", list, ReportPackgeTransferTimeVO.class);
+	}
+
+	@Override
+	public R packageAllTrunklineTimePage(ReportTimeDTO reportTimeDTO) {
+		IPage<Object> page = new Page<>();
+		page.setCurrent(reportTimeDTO.getPageNum());
+		page.setSize(reportTimeDTO.getPageSize());
+
+		reportTimeDTO.setStartTime(CommonUtil.getStartByDateStr(reportTimeDTO.getStartTimeStr()));
+		reportTimeDTO.setEndTime(CommonUtil.getEndByDateStr(reportTimeDTO.getEndTimeStr()));
+
+		IPage<ReportPackgeAllTrunklineTimeVO> iPage = reportTimeMapper.packageAllTrunklineTimePage(page,reportTimeDTO);
+
+
+		return R.data(iPage);
+	}
+
+	@Override
+	public void packageAllTrunklineTimeExport(ReportTimeDTO reportTimeDTO, HttpServletResponse response) {
+		reportTimeDTO.setStartTime(CommonUtil.getStartByDateStr(reportTimeDTO.getStartTimeStr()));
+		reportTimeDTO.setEndTime(CommonUtil.getEndByDateStr(reportTimeDTO.getEndTimeStr()));
+
+		List<ReportPackgeAllTrunklineTimeVO> list = reportTimeMapper.packageAllTrunklineTimeExport(reportTimeDTO);
+
+		//导出ls
+		ExcelUtil.export(response, "订制品干线整体时效报表导出", "订制品干线整体时效报表导出", list, ReportPackgeAllTrunklineTimeVO.class);
+	}
+
+	@Override
+	public R zeroAllTrunklineTimePage(ReportTimeDTO reportTimeDTO) {
+		IPage<Object> page = new Page<>();
+		page.setCurrent(reportTimeDTO.getPageNum());
+		page.setSize(reportTimeDTO.getPageSize());
+
+		reportTimeDTO.setStartTime(CommonUtil.getStartByDateStr(reportTimeDTO.getStartTimeStr()));
+		reportTimeDTO.setEndTime(CommonUtil.getEndByDateStr(reportTimeDTO.getEndTimeStr()));
+
+		IPage<ReportPackgeAllTrunklineTimeVO> iPage = reportTimeMapper.zeroAllTrunklineTimePage(page,reportTimeDTO);
+
+
+		return R.data(iPage);
+	}
+
+	@Override
+	public void zeroAllTrunklineTimeExport(ReportTimeDTO reportTimeDTO, HttpServletResponse response) {
+		reportTimeDTO.setStartTime(CommonUtil.getStartByDateStr(reportTimeDTO.getStartTimeStr()));
+		reportTimeDTO.setEndTime(CommonUtil.getEndByDateStr(reportTimeDTO.getEndTimeStr()));
+
+		List<ReportPackgeAllTrunklineTimeVO> list = reportTimeMapper.zeroAllTrunklineTimeExport(reportTimeDTO);
+
+		//导出ls
+		ExcelUtil.export(response, "零担干线整体时效报表导出", "零担干线整体时效报表导出", list, ReportPackgeAllTrunklineTimeVO.class);
 	}
 }

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

@@ -0,0 +1,90 @@
+package com.logpm.report.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class ReportPackgeAllTrunklineTimeVO implements Serializable {
+
+	@ExcelProperty(value = "事业线")
+	private String businessLine;
+	@ExcelProperty(value = "始发仓")
+	private String departureWarehouseName;
+	@ExcelProperty(value = "目的仓")
+	private String destinationWarehouseName;
+	@ExcelProperty(value = "品牌")
+	private String brand;
+
+	@ExcelProperty(value = "开单数")
+	private Integer waybillNum;
+	@ExcelProperty(value = "开单件数")
+	private Integer openNum;
+
+	@ExcelProperty(value = "目的仓到仓件数")
+	private Integer arriveNum;
+	@ExcelProperty(value = "目的仓未到仓件数")
+	private Integer noArriveNum;
+
+	@ExcelProperty(value = "目的仓到仓率")
+	private String arriveRate;
+	@ExcelProperty(value = "到仓平均干线时效(天)")
+	private String avgTime;
+
+	@ExcelProperty(value = "准时到仓件数")
+	private Integer onTimeArriveNum;
+	@ExcelProperty(value = "准时到仓率")
+	private String onTimeArriveRate;
+
+	@ExcelProperty(value = "1天到仓数")
+	private Integer oneArriveNum;
+	@ExcelProperty(value = "1天到仓占比")
+	private String oneArriveRate;
+
+	@ExcelProperty(value = "2天到仓数")
+	private Integer twoArriveNum;
+	@ExcelProperty(value = "2天到仓占比")
+	private String twoArriveRate;
+
+
+	@ExcelProperty(value = "3天到仓数")
+	private Integer threeArriveNum;
+	@ExcelProperty(value = "3天到仓占比")
+	private String threeArriveRate;
+
+
+	@ExcelProperty(value = "4天到仓数")
+	private Integer fourArriveNum;
+	@ExcelProperty(value = "4天到仓占比")
+	private String fourArriveRate;
+
+	@ExcelProperty(value = "5天到仓数")
+	private Integer fiveArriveNum;
+	@ExcelProperty(value = "5天到仓占比")
+	private String fiveArriveRate;
+
+	@ExcelProperty(value = "6天到仓数")
+	private Integer sixArriveNum;
+	@ExcelProperty(value = "6天到仓占比")
+	private String sixArriveRate;
+
+	@ExcelProperty(value = "7天到仓数")
+	private Integer sevenArriveNum;
+	@ExcelProperty(value = "7天到仓占比")
+	private String sevenArriveRate;
+
+	@ExcelProperty(value = "7天至10天到仓数")
+	private Integer sevenToTenArriveNum;
+	@ExcelProperty(value = "7天至10天到仓占比")
+	private String sevenToTenArriveRate;
+
+	@ExcelProperty(value = "10天以上到仓数")
+	private Integer moreTenArriveNum;
+	@ExcelProperty(value = "10天以上到仓占比")
+	private String moreTenArriveRate;
+
+
+
+
+}

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

@@ -0,0 +1,38 @@
+package com.logpm.report.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class ReportPackgeStartTimeVO implements Serializable {
+
+	@ExcelProperty(value = "事业线")
+	private String businessLine;
+	@ExcelProperty(value = "始发仓")
+	private String departureWarehouseName;
+	@ExcelProperty(value = "目的仓")
+	private String destinationWarehouseName;
+	@ExcelProperty(value = "品牌")
+	private String brand;
+
+	@ExcelProperty(value = "总件数")
+	private Integer totalNum;
+	@ExcelProperty(value = "开单件数")
+	private Integer openNum;
+	@ExcelProperty(value = "开单数")
+	private Integer waybillNum;
+	@ExcelProperty(value = "发运件数")
+	private Integer startNum;
+
+	@ExcelProperty(value = "准时发运件数")
+	private Integer onTimeNum;
+	@ExcelProperty(value = "准时发运率")
+	private String onTimeRate;
+
+	@ExcelProperty(value = "平均发运时效")
+	private String avgTime;
+
+
+}

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

@@ -0,0 +1,37 @@
+package com.logpm.report.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class ReportPackgeTransferTimeVO implements Serializable {
+
+	@ExcelProperty(value = "事业线")
+	private String businessLine;
+	@ExcelProperty(value = "始发仓")
+	private String departureWarehouseName;
+	@ExcelProperty(value = "目的仓")
+	private String destinationWarehouseName;
+	@ExcelProperty(value = "中转仓")
+	private String warehouseName;
+	@ExcelProperty(value = "品牌")
+	private String brand;
+
+	@ExcelProperty(value = "中转入库件数")
+	private Integer incomingNum;
+
+	@ExcelProperty(value = "中转出库件数")
+	private Integer outNum;
+
+	@ExcelProperty(value = "中转准时出库件数")
+	private Integer outOnTimeNum;
+
+	@ExcelProperty(value = "中转准时出库率")
+	private String outOnTimeRate;
+
+	@ExcelProperty(value = "平均中转时效")
+	private String avgTime;
+
+}

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

@@ -0,0 +1,56 @@
+package com.logpm.report.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class ReportUpdateWaybillVO implements Serializable {
+
+	@ExcelProperty(value = "事业线")
+	private String businessLine;
+	@ExcelProperty(value = "始发仓")
+	private String departureWarehouseName;
+	@ExcelProperty(value = "目的仓")
+	private String destinationWarehouseName;
+	@ExcelProperty(value = "品牌")
+	private String brand;
+	@ExcelProperty(value = "总运单数")
+	private Integer totalNum;//总运单数
+	@ExcelProperty(value = "改单单数")
+	private Integer editNum;//改单单数
+	@ExcelProperty(value = "改单次数")
+	private Integer updateNum;//改单次数
+	@ExcelProperty(value = "发车前修改数")
+	private Integer startBeforeNum;
+	@ExcelProperty(value = "发车前修改率")
+	private String startBeforeRate;
+
+	@ExcelProperty(value = "人为操作错误数")
+	private Integer personProbleNum;
+	@ExcelProperty(value = "人为操作错误率")
+	private String personProbleRate;
+
+	@ExcelProperty(value = "财务修改数")
+	private Integer financeUpdateNum;
+	@ExcelProperty(value = "财务修改率")
+	private String financeUpdateRate;
+
+	@ExcelProperty(value = "商家要求数")
+	private Integer merchantUpdateNum;
+	@ExcelProperty(value = "商家要求率")
+	private String merchantUpdateRate;
+
+	@ExcelProperty(value = "业务调整数")
+	private Integer businessUpdateNum;
+	@ExcelProperty(value = "业务调整率")
+	private String businessUpdateRate;
+
+	@ExcelProperty(value = "改单率")
+	private String updateRate;
+
+
+
+
+}