Ver Fonte

[insert] 项目初始化

miajio há 1 mês atrás
pai
commit
00b8040194
100 ficheiros alterados com 2555 adições e 66 exclusões
  1. 35 2
      warehouse-admin-component/pom.xml
  2. 16 0
      warehouse-admin-component/src/main/java/com/yr/warehouse/admin/component/device/DeviceCargoWayComponent.java
  3. 40 0
      warehouse-admin-component/src/main/java/com/yr/warehouse/admin/component/goods/ProductComponent.java
  4. 36 0
      warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/bo/DriverDailyCargoDamageExportBo.java
  5. 36 0
      warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/bo/DriverDailyCargoDamagePageBo.java
  6. 30 0
      warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/bo/DriverIntervalCargoDamageDetailExportBo.java
  7. 30 0
      warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/bo/DriverIntervalCargoDamageDetailPageBo.java
  8. 42 0
      warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/bo/DriverIntervalCargoDamageGeneratorBo.java
  9. 40 0
      warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/bo/DriverIntervalCargoDamagePageBo.java
  10. 99 0
      warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/data/DriverEquipmentLossRecord.java
  11. 110 0
      warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/data/DriverGoodsLossIntervalDetail.java
  12. 170 0
      warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/data/DriverGoodsLossIntervalMain.java
  13. 111 0
      warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/data/DriverGoodsLossRecord.java
  14. 86 0
      warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/data/DriverOnRouteAccountRecordDetail.java
  15. 123 0
      warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/data/DriverOnRouteAccountRecordMain.java
  16. 123 0
      warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/data/DriverOnRouteDetailLog.java
  17. 86 0
      warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/data/EquipmentLossIntervalDetail.java
  18. 16 0
      warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/mapper/DriverEquipmentLossRecordMapper.java
  19. 16 0
      warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/mapper/DriverGoodsLossIntervalDetailMapper.java
  20. 16 0
      warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/mapper/DriverGoodsLossIntervalMainMapper.java
  21. 16 0
      warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/mapper/DriverGoodsLossRecordMapper.java
  22. 16 0
      warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/mapper/DriverOnRouteAccountRecordDetailMapper.java
  23. 16 0
      warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/mapper/DriverOnRouteAccountRecordMainMapper.java
  24. 16 0
      warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/mapper/DriverOnRouteDetailLogMapper.java
  25. 16 0
      warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/mapper/EquipmentLossIntervalDetailMapper.java
  26. 1 1
      warehouse-admin-data/src/main/java/com/yr/warehouse/admin/replenish/data/AggregationPickDetail.java
  27. 1 1
      warehouse-admin-data/src/main/java/com/yr/warehouse/admin/replenish/data/AggregationPickInfo.java
  28. 1 1
      warehouse-admin-data/src/main/java/com/yr/warehouse/admin/replenish/data/AggregationPickLink.java
  29. 1 1
      warehouse-admin-data/src/main/java/com/yr/warehouse/admin/replenish/data/PickingOrderDetail.java
  30. 1 1
      warehouse-admin-data/src/main/java/com/yr/warehouse/admin/replenish/data/PickingOrderInfo.java
  31. 1 1
      warehouse-admin-data/src/main/java/com/yr/warehouse/admin/replenish/data/ReplenishOrderDetail.java
  32. 1 1
      warehouse-admin-data/src/main/java/com/yr/warehouse/admin/replenish/data/ReplenishOrderInfo.java
  33. 1 1
      warehouse-admin-data/src/main/java/com/yr/warehouse/admin/replenish/mapper/AggregationPickDetailMapper.java
  34. 1 1
      warehouse-admin-data/src/main/java/com/yr/warehouse/admin/replenish/mapper/AggregationPickInfoMapper.java
  35. 1 1
      warehouse-admin-data/src/main/java/com/yr/warehouse/admin/replenish/mapper/AggregationPickLinkMapper.java
  36. 1 1
      warehouse-admin-data/src/main/java/com/yr/warehouse/admin/replenish/mapper/PickingOrderDetailMapper.java
  37. 1 1
      warehouse-admin-data/src/main/java/com/yr/warehouse/admin/replenish/mapper/PickingOrderInfoMapper.java
  38. 1 1
      warehouse-admin-data/src/main/java/com/yr/warehouse/admin/replenish/mapper/ReplenishOrderDetailMapper.java
  39. 1 1
      warehouse-admin-data/src/main/java/com/yr/warehouse/admin/replenish/mapper/ReplenishOrderInfoMapper.java
  40. 26 0
      warehouse-admin-data/src/main/resources/mapper/driver/DriverEquipmentLossRecordMapper.xml
  41. 28 0
      warehouse-admin-data/src/main/resources/mapper/driver/DriverGoodsLossIntervalDetailMapper.xml
  42. 38 0
      warehouse-admin-data/src/main/resources/mapper/driver/DriverGoodsLossIntervalMainMapper.xml
  43. 28 0
      warehouse-admin-data/src/main/resources/mapper/driver/DriverGoodsLossRecordMapper.xml
  44. 24 0
      warehouse-admin-data/src/main/resources/mapper/driver/DriverOnRouteAccountRecordDetailMapper.xml
  45. 30 0
      warehouse-admin-data/src/main/resources/mapper/driver/DriverOnRouteAccountRecordMainMapper.xml
  46. 30 0
      warehouse-admin-data/src/main/resources/mapper/driver/DriverOnRouteDetailLogMapper.xml
  47. 24 0
      warehouse-admin-data/src/main/resources/mapper/driver/EquipmentLossIntervalDetailMapper.xml
  48. 1 1
      warehouse-admin-data/src/main/resources/mapper/replenish/AggregationPickDetailMapper.xml
  49. 1 1
      warehouse-admin-data/src/main/resources/mapper/replenish/AggregationPickInfoMapper.xml
  50. 1 1
      warehouse-admin-data/src/main/resources/mapper/replenish/AggregationPickLinkMapper.xml
  51. 1 1
      warehouse-admin-data/src/main/resources/mapper/replenish/PickingOrderDetailMapper.xml
  52. 1 1
      warehouse-admin-data/src/main/resources/mapper/replenish/PickingOrderInfoMapper.xml
  53. 1 1
      warehouse-admin-data/src/main/resources/mapper/replenish/ReplenishOrderDetailMapper.xml
  54. 1 1
      warehouse-admin-data/src/main/resources/mapper/replenish/ReplenishOrderInfoMapper.xml
  55. 19 7
      warehouse-admin-data/src/main/test/com/supplychain/CodeGenerator.java
  56. 1 1
      warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/context/SpringContext.java
  57. 16 0
      warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/driver/DriverEquipmentLossRecordService.java
  58. 16 0
      warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/driver/DriverGoodsLossIntervalDetailService.java
  59. 16 0
      warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/driver/DriverGoodsLossIntervalMainService.java
  60. 16 0
      warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/driver/DriverGoodsLossRecordService.java
  61. 16 0
      warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/driver/DriverOnRouteAccountRecordDetailService.java
  62. 16 0
      warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/driver/DriverOnRouteAccountRecordMainService.java
  63. 16 0
      warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/driver/DriverOnRouteDetailLogService.java
  64. 16 0
      warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/driver/EquipmentLossIntervalDetailService.java
  65. 20 0
      warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/driver/impl/DriverEquipmentLossRecordServiceImpl.java
  66. 20 0
      warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/driver/impl/DriverGoodsLossIntervalDetailServiceImpl.java
  67. 20 0
      warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/driver/impl/DriverGoodsLossIntervalMainServiceImpl.java
  68. 20 0
      warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/driver/impl/DriverGoodsLossRecordServiceImpl.java
  69. 20 0
      warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/driver/impl/DriverOnRouteAccountRecordDetailServiceImpl.java
  70. 20 0
      warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/driver/impl/DriverOnRouteAccountRecordMainServiceImpl.java
  71. 20 0
      warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/driver/impl/DriverOnRouteDetailLogServiceImpl.java
  72. 20 0
      warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/driver/impl/EquipmentLossIntervalDetailServiceImpl.java
  73. 2 2
      warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/replenish/AggregationPickDetailService.java
  74. 2 2
      warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/replenish/AggregationPickInfoService.java
  75. 2 2
      warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/replenish/AggregationPickLinkService.java
  76. 2 2
      warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/replenish/PickingOrderDetailService.java
  77. 2 2
      warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/replenish/PickingOrderInfoService.java
  78. 2 2
      warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/replenish/ReplenishOrderDetailService.java
  79. 2 2
      warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/replenish/ReplenishOrderInfoService.java
  80. 3 3
      warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/replenish/impl/AggregationPickDetailServiceImpl.java
  81. 3 3
      warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/replenish/impl/AggregationPickInfoServiceImpl.java
  82. 3 3
      warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/replenish/impl/AggregationPickLinkServiceImpl.java
  83. 3 3
      warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/replenish/impl/PickingOrderDetailServiceImpl.java
  84. 3 3
      warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/replenish/impl/PickingOrderInfoServiceImpl.java
  85. 3 3
      warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/replenish/impl/ReplenishOrderDetailServiceImpl.java
  86. 3 3
      warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/replenish/impl/ReplenishOrderInfoServiceImpl.java
  87. 53 0
      warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/controller/DriverDailyCargoDamageController.java
  88. 158 0
      warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/controller/DriverIntervalCargoDamageController.java
  89. 39 0
      warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/controller/DriverRouteDetailController.java
  90. 18 0
      warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/mapstruct/DriverDailyCargoDamageMapStruct.java
  91. 26 0
      warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/mapstruct/DriverIntervalCargoDamageMapStruct.java
  92. 35 0
      warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/request/DriverDailyCargoDamageExportRequest.java
  93. 38 0
      warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/request/DriverDailyCargoDamagePageRequest.java
  94. 29 0
      warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/request/DriverIntervalCargoDamageDetailExportRequest.java
  95. 32 0
      warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/request/DriverIntervalCargoDamageDetailPageRequest.java
  96. 44 0
      warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/request/DriverIntervalCargoDamageGeneratorRequest.java
  97. 44 0
      warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/request/DriverIntervalCargoDamagePageRequest.java
  98. 45 0
      warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/request/DriverIntervalRouteAccountRecordCreateRequest.java
  99. 30 0
      warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/request/DriverIntervalRouteAccountRecordDetailCreateRequest.java
  100. 31 0
      warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/request/DriverIntervalRouteAccountRecordEditorRequest.java

+ 35 - 2
warehouse-admin-component/pom.xml

@@ -14,12 +14,39 @@
 	<packaging>jar</packaging>
 
 	<dependencies>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.dubbo</groupId>
+			<artifactId>dubbo-common</artifactId>
+			<version>3.2.9</version>
+			<scope>compile</scope>
+		</dependency>
+		<!-- springboot -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter</artifactId>
+		</dependency>
+		<!-- springboot end-->
+		<!-- 外部引用 -->
+		<!-- 外部dubbo接口 -->
+		<dependency>
+			<groupId>com.yr.prism</groupId>
+			<artifactId>prism-auth-support</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>com.supplychain.support</groupId>
+			<artifactId>yr-supply-chain-api</artifactId>
+		</dependency>
+		<!-- 外部dubbo接口 end-->
 		<!-- apollo -->
 		<dependency>
 			<groupId>com.ctrip.framework.apollo</groupId>
 			<artifactId>apollo-client</artifactId>
 		</dependency>
-
 		<!-- 实体类对象赋值copy -->
 		<dependency>
 			<groupId>org.projectlombok</groupId>
@@ -33,13 +60,18 @@
 			<groupId>org.mapstruct</groupId>
 			<artifactId>mapstruct-processor</artifactId>
 		</dependency>
-
 		<!-- 工具类 -->
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
 			<version>1.10</version>
 		</dependency>
+
+		<dependency>
+			<groupId>com.yr.bluecat.common</groupId>
+			<artifactId>bluecat-common-utils</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
@@ -57,5 +89,6 @@
 			<version>2.13.0</version>
 			<scope>compile</scope>
 		</dependency>
+
 	</dependencies>
 </project>

+ 16 - 0
warehouse-admin-component/src/main/java/com/yr/warehouse/admin/component/device/DeviceCargoWayComponent.java

@@ -0,0 +1,16 @@
+package com.yr.warehouse.admin.component.device;
+
+import com.supplychain.api.server.device.DeviceCargoWayApi;
+import org.apache.dubbo.config.annotation.DubboReference;
+import org.springframework.stereotype.Component;
+
+/**
+ * 设备货道组件
+ */
+@Component
+public class DeviceCargoWayComponent {
+
+    @DubboReference(timeout = 5000, retries = 0 /*, url="dubbo://127.0.0.1:21887" */)
+    private DeviceCargoWayApi deviceCargoWayApi;
+
+}

+ 40 - 0
warehouse-admin-component/src/main/java/com/yr/warehouse/admin/component/goods/ProductComponent.java

@@ -0,0 +1,40 @@
+package com.yr.warehouse.admin.component.goods;
+
+import com.supplychain.api.response.basegoods.ProductSkuResponse;
+import com.supplychain.api.server.basegoods.ProductApi;
+import com.yr.bluecat.common.entity.response.Result;
+import org.apache.dubbo.config.annotation.DubboReference;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 商品组件
+ */
+@Component
+public class ProductComponent {
+    @DubboReference(timeout = 5000, retries = 0 /*, url="dubbo://127.0.0.1:21887" */)
+    private ProductApi productApi;
+
+    /**
+     * 根据商品规格ID查询商品信息
+     * @param specIds 商品规格ID
+     * @return 商品信息
+     */
+    public List<ProductSkuResponse> searchProductBySpecIds(List<Integer> specIds) {
+        Result<List<ProductSkuResponse>> result = productApi.searchProductBySpecIds(specIds);
+        return result.getData();
+    }
+
+    /**
+     * 根据商品名称查询商品信息
+     * @param name 商品名称
+     * @return 商品信息
+     */
+    public List<ProductSkuResponse> searchProductByName(String name) {
+        Result<List<ProductSkuResponse>> result = productApi.searchProductByName(name);
+        return result.getData();
+    }
+
+
+}

+ 36 - 0
warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/bo/DriverDailyCargoDamageExportBo.java

@@ -0,0 +1,36 @@
+package com.yr.warehouse.admin.driver.bo;
+
+import com.yr.warehouse.admin.common.bo.BaseBo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * 司机货损统计(日统计)请求参数
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class DriverDailyCargoDamageExportBo extends BaseBo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 运营商id
+     */
+    private Long operatorId;
+
+    /**
+     * 区域员工名称
+     */
+    private String areaStaffName;
+
+    /**
+     * 统计日期
+     */
+    private LocalDate statDate;
+
+}

+ 36 - 0
warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/bo/DriverDailyCargoDamagePageBo.java

@@ -0,0 +1,36 @@
+package com.yr.warehouse.admin.driver.bo;
+
+import com.yr.warehouse.admin.common.bo.BasePageBo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * 司机货损统计(日统计)请求参数
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class DriverDailyCargoDamagePageBo extends BasePageBo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 运营商id
+     */
+    private Long operatorId;
+
+    /**
+     * 区域员工名称
+     */
+    private String areaStaffName;
+
+    /**
+     * 统计日期
+     */
+    private LocalDate statDate;
+
+}

+ 30 - 0
warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/bo/DriverIntervalCargoDamageDetailExportBo.java

@@ -0,0 +1,30 @@
+package com.yr.warehouse.admin.driver.bo;
+
+import com.yr.warehouse.admin.common.bo.BaseBo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 区间货损详情分页请求参数
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class DriverIntervalCargoDamageDetailExportBo extends BaseBo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 货损统计id
+     */
+    private Long goodsLossMonthlyMainId;
+
+    /**
+     * 区域员工名称
+     */
+    private String areaStaffName;
+
+}

+ 30 - 0
warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/bo/DriverIntervalCargoDamageDetailPageBo.java

@@ -0,0 +1,30 @@
+package com.yr.warehouse.admin.driver.bo;
+
+import com.yr.warehouse.admin.common.bo.BasePageBo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 区间货损详情分页请求参数
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class DriverIntervalCargoDamageDetailPageBo extends BasePageBo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 货损统计id
+     */
+    private Long goodsLossMonthlyMainId;
+
+    /**
+     * 区域员工名称
+     */
+    private String areaStaffName;
+
+}

+ 42 - 0
warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/bo/DriverIntervalCargoDamageGeneratorBo.java

@@ -0,0 +1,42 @@
+package com.yr.warehouse.admin.driver.bo;
+
+import com.yr.warehouse.admin.common.bo.BaseBo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 区域员工货损统计(区间统计)
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class DriverIntervalCargoDamageGeneratorBo extends BaseBo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 运营商id
+     */
+    private Long operatorId;
+
+    /**
+     * 区间开始时间
+     */
+    private LocalDateTime intervalStartTime;
+
+    /**
+     * 区间结束时间
+     */
+    private LocalDateTime intervalEndTime;
+
+    /**
+     * 区域员工id列表
+     */
+    private List<Long> areaStaffIds;
+
+}

+ 40 - 0
warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/bo/DriverIntervalCargoDamagePageBo.java

@@ -0,0 +1,40 @@
+package com.yr.warehouse.admin.driver.bo;
+
+import com.yr.warehouse.admin.common.bo.BasePageBo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 分页查询货损统计(区间统计)请求参数
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class DriverIntervalCargoDamagePageBo extends BasePageBo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 运营商id
+     */
+    private Long operatorId;
+
+    /**
+     * 区域员工名称
+     */
+    private String areaStaffName;
+
+    /**
+     * 创建时间-开始
+     */
+    private LocalDateTime createBeginTime;
+
+    /**
+     * 创建时间-结束
+     */
+    private LocalDateTime createEndTime;
+}

+ 99 - 0
warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/data/DriverEquipmentLossRecord.java

@@ -0,0 +1,99 @@
+package com.yr.warehouse.admin.driver.data;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 司机设备货损记录表
+ * </p>
+ *
+ * @author 
+ * @since 2025-12-03 15:26:37
+ */
+@Getter
+@Setter
+@TableName("yr_driver_equipment_loss_record")
+public class DriverEquipmentLossRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 自增主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 运营商id
+     */
+    @TableField("operatorId")
+    private Long operatorId;
+
+    /**
+     * 运营商id链
+     */
+    @TableField("operatorChain")
+    private String operatorChain;
+
+    /**
+     * 区域员工关系id
+     */
+    @TableField("areaStaffId")
+    private Long areaStaffId;
+
+    /**
+     * 统计日期(YYYY-MM-dd)
+     */
+    @TableField("statDate")
+    private LocalDate statDate;
+
+    /**
+     * 设备库存数
+     */
+    @TableField("equipmentStockNum")
+    private Long equipmentStockNum;
+
+    /**
+     * 设备补货数
+     */
+    @TableField("equipmentReplenishNum")
+    private Long equipmentReplenishNum;
+
+    /**
+     * 设备销量
+     */
+    @TableField("equipmentSalesNum")
+    private Long equipmentSalesNum;
+
+    /**
+     * 理论设备库存数
+     */
+    @TableField("theoreticalEquipmentStockNum")
+    private Long theoreticalEquipmentStockNum;
+
+    /**
+     * 实际设备库存数
+     */
+    @TableField("actualEquipmentStockNum")
+    private Long actualEquipmentStockNum;
+
+    /**
+     * 盈亏数
+     */
+    @TableField("profitLossNum")
+    private Long profitLossNum;
+
+    /**
+     * 创建时间
+     */
+    @TableField("createTime")
+    private LocalDateTime createTime;
+}

+ 110 - 0
warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/data/DriverGoodsLossIntervalDetail.java

@@ -0,0 +1,110 @@
+package com.yr.warehouse.admin.driver.data;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 司机货损区间统计明细表
+ * </p>
+ *
+ * @author 
+ * @since 2025-12-03 15:26:37
+ */
+@Getter
+@Setter
+@TableName("yr_driver_goods_loss_interval_detail")
+public class DriverGoodsLossIntervalDetail implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 自增主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 货损区间统计主表id(关联司机货损区间统计主表id)
+     */
+    @TableField("goodsLossMonthlyMainId")
+    private Long goodsLossMonthlyMainId;
+
+    /**
+     * 区域员工关系id
+     */
+    @TableField("areaStaffId")
+    private Long areaStaffId;
+
+    /**
+     * 上次剩余在途库存数
+     */
+    @TableField("lastRemainingOnRouteStock")
+    private Long lastRemainingOnRouteStock;
+
+    /**
+     * 拣货单开单数
+     */
+    @TableField("pickingOrderCreateNum")
+    private Long pickingOrderCreateNum;
+
+    /**
+     * 整件单开单数
+     */
+    @TableField("wholeOrderCreateNum")
+    private Long wholeOrderCreateNum;
+
+    /**
+     * 未出库取消数
+     */
+    @TableField("unshippedCancelNum")
+    private Long unshippedCancelNum;
+
+    /**
+     * 已出库取消数
+     */
+    @TableField("shippedCancelNum")
+    private Long shippedCancelNum;
+
+    /**
+     * 补货数
+     */
+    @TableField("replenishNum")
+    private Long replenishNum;
+
+    /**
+     * 回仓数
+     */
+    @TableField("returnWarehouseNum")
+    private Long returnWarehouseNum;
+
+    /**
+     * 剩余未补货数
+     */
+    @TableField("remainingUnReplenishedNum")
+    private Long remainingUnReplenishedNum;
+
+    /**
+     * 整件核实数
+     */
+    @TableField("wholeVerifyNum")
+    private Long wholeVerifyNum;
+
+    /**
+     * 盈亏数
+     */
+    @TableField("profitLossNum")
+    private Long profitLossNum;
+
+    /**
+     * 创建时间
+     */
+    @TableField("createTime")
+    private LocalDateTime createTime;
+}

+ 170 - 0
warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/data/DriverGoodsLossIntervalMain.java

@@ -0,0 +1,170 @@
+package com.yr.warehouse.admin.driver.data;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 司机货损区间统计主表
+ * </p>
+ *
+ * @author 
+ * @since 2025-12-03 15:26:37
+ */
+@Getter
+@Setter
+@TableName("yr_driver_goods_loss_interval_main")
+public class DriverGoodsLossIntervalMain implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 自增主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 区间开始时间(精确到时分秒)
+     */
+    @TableField("intervalStartTime")
+    private LocalDateTime intervalStartTime;
+
+    /**
+     * 区间结束时间(精确到时分秒)
+     */
+    @TableField("intervalEndTime")
+    private LocalDateTime intervalEndTime;
+
+    /**
+     * 运营商id
+     */
+    @TableField("operatorId")
+    private Long operatorId;
+
+    /**
+     * 运营商id链
+     */
+    @TableField("operatorChain")
+    private String operatorChain;
+
+    /**
+     * 统计类型 SPOT_CHECK 抽查(指定补货员) REGULAR 定期(全部补货员)
+     */
+    @TableField("stockTakingType")
+    private String stockTakingType;
+
+    /**
+     * 拣货单开单数
+     */
+    @TableField("pickingOrderCreateNum")
+    private Long pickingOrderCreateNum;
+
+    /**
+     * 整件单开单数
+     */
+    @TableField("wholeOrderCreateNum")
+    private Long wholeOrderCreateNum;
+
+    /**
+     * 补货数
+     */
+    @TableField("replenishNum")
+    private Long replenishNum;
+
+    /**
+     * 回仓数
+     */
+    @TableField("returnWarehouseNum")
+    private Long returnWarehouseNum;
+
+    /**
+     * 在途库存数
+     */
+    @TableField("onRouteInventoryNum")
+    private Long onRouteInventoryNum;
+
+    /**
+     * 未出库取消数
+     */
+    @TableField("unshippedCancelNum")
+    private Long unshippedCancelNum;
+
+    /**
+     * 已出库取消数
+     */
+    @TableField("shippedCancelNum")
+    private Long shippedCancelNum;
+
+    /**
+     * 未补货数
+     */
+    @TableField("unReplenishedNum")
+    private Long unReplenishedNum;
+
+    /**
+     * 司机盈亏数
+     */
+    @TableField("driverProfitLossNum")
+    private Long driverProfitLossNum;
+
+    /**
+     * 设备盈亏数
+     */
+    @TableField("equipmentProfitLossNum")
+    private Long equipmentProfitLossNum;
+
+    /**
+     * 总盈亏数(建议业务层确保 = 司机盈亏数 + 设备盈亏数)
+     */
+    @TableField("totalProfitLossNum")
+    private Long totalProfitLossNum;
+
+    /**
+     * 创建时间
+     */
+    @TableField("createTime")
+    private LocalDateTime createTime;
+
+    /**
+     * 创建人uid
+     */
+    @TableField("createUid")
+    private Long createUid;
+
+    /**
+     * 创建人名称
+     */
+    @TableField("createName")
+    private String createName;
+
+    /**
+     * 修改时间
+     */
+    @TableField("modifyTime")
+    private LocalDateTime modifyTime;
+
+    /**
+     * 修改人uid
+     */
+    @TableField("modifyUid")
+    private Long modifyUid;
+
+    /**
+     * 修改人名称
+     */
+    @TableField("modifyName")
+    private String modifyName;
+
+    /**
+     * 删除状态:NORMAL:正常|DELETE:删除
+     */
+    @TableField("isDelete")
+    private String isDelete;
+}

+ 111 - 0
warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/data/DriverGoodsLossRecord.java

@@ -0,0 +1,111 @@
+package com.yr.warehouse.admin.driver.data;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 司机货损记录表
+ * </p>
+ *
+ * @author 
+ * @since 2025-12-03 15:26:37
+ */
+@Getter
+@Setter
+@TableName("yr_driver_goods_loss_record")
+public class DriverGoodsLossRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 自增主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 运营商id
+     */
+    @TableField("operatorId")
+    private Long operatorId;
+
+    /**
+     * 运营商id链
+     */
+    @TableField("operatorChain")
+    private String operatorChain;
+
+    /**
+     * 区域员工关系id
+     */
+    @TableField("areaStaffId")
+    private Long areaStaffId;
+
+    /**
+     * 统计日期(YYYY-MM-dd)
+     */
+    @TableField("statDate")
+    private LocalDate statDate;
+
+    /**
+     * 昨日在途数
+     */
+    @TableField("yesterdayOnRouteNum")
+    private Long yesterdayOnRouteNum;
+
+    /**
+     * 拣货单开单数
+     */
+    @TableField("pickingOrderCreateNum")
+    private Long pickingOrderCreateNum;
+
+    /**
+     * 整件单开单数
+     */
+    @TableField("wholeOrderCreateNum")
+    private Long wholeOrderCreateNum;
+
+    /**
+     * 未出库取消数
+     */
+    @TableField("unshippedCancelNum")
+    private Long unshippedCancelNum;
+
+    /**
+     * 已出库取消数
+     */
+    @TableField("shippedCancelNum")
+    private Long shippedCancelNum;
+
+    /**
+     * 补货数
+     */
+    @TableField("replenishNum")
+    private Long replenishNum;
+
+    /**
+     * 回仓数
+     */
+    @TableField("returnWarehouseNum")
+    private Long returnWarehouseNum;
+
+    /**
+     * 当日在途数
+     */
+    @TableField("currentOnRouteNum")
+    private Long currentOnRouteNum;
+
+    /**
+     * 创建时间
+     */
+    @TableField("createTime")
+    private LocalDateTime createTime;
+}

+ 86 - 0
warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/data/DriverOnRouteAccountRecordDetail.java

@@ -0,0 +1,86 @@
+package com.yr.warehouse.admin.driver.data;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 司机在途核算记录子表
+ * </p>
+ *
+ * @author 
+ * @since 2025-12-03 15:26:37
+ */
+@Getter
+@Setter
+@TableName("yr_driver_on_route_account_record_detail")
+public class DriverOnRouteAccountRecordDetail implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 自增主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 司机在途核算记录主表id(关联司机在途核算记录主表id)
+     */
+    @TableField("routeAccountRecordMainId")
+    private Long routeAccountRecordMainId;
+
+    /**
+     * 商品ID
+     */
+    @TableField("goodsId")
+    private Integer goodsId;
+
+    /**
+     * 库存数
+     */
+    @TableField("inventory")
+    private Long inventory;
+
+    /**
+     * 创建时间
+     */
+    @TableField("createTime")
+    private LocalDateTime createTime;
+
+    /**
+     * 创建人uid
+     */
+    @TableField("createUid")
+    private Long createUid;
+
+    /**
+     * 创建人名称
+     */
+    @TableField("createName")
+    private String createName;
+
+    /**
+     * 修改时间
+     */
+    @TableField("modifyTime")
+    private LocalDateTime modifyTime;
+
+    /**
+     * 修改人uid
+     */
+    @TableField("modifyUid")
+    private Long modifyUid;
+
+    /**
+     * 修改人名称
+     */
+    @TableField("modifyName")
+    private String modifyName;
+}

+ 123 - 0
warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/data/DriverOnRouteAccountRecordMain.java

@@ -0,0 +1,123 @@
+package com.yr.warehouse.admin.driver.data;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 司机在途核算记录主表
+ * </p>
+ *
+ * @author 
+ * @since 2025-12-03 15:26:37
+ */
+@Getter
+@Setter
+@TableName("yr_driver_on_route_account_record_main")
+public class DriverOnRouteAccountRecordMain implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 自增主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 运营商id
+     */
+    @TableField("operatorId")
+    private Long operatorId;
+
+    /**
+     * 运营商id链
+     */
+    @TableField("operatorChain")
+    private String operatorChain;
+
+    /**
+     * 区域员工关系id
+     */
+    @TableField("areaStaffId")
+    private Long areaStaffId;
+
+    /**
+     * 仓库ID
+     */
+    @TableField("warehouseId")
+    private Long warehouseId;
+
+    /**
+     * 统计日期(YYYY-MM-dd)
+     */
+    @TableField("statDate")
+    private LocalDate statDate;
+
+    /**
+     * 货损区间统计主表id(关联司机货损区间统计主表id - 核算后绑定)
+     */
+    @TableField("goodsLossMonthlyMainId")
+    private Long goodsLossMonthlyMainId;
+
+    /**
+     * 统计总数
+     */
+    @TableField("statTotalNum")
+    private Long statTotalNum;
+
+    /**
+     * 状态 UN_VERIFIED 未核算 VERIFIED 已核算 CANCEL 已取消
+     */
+    @TableField("status")
+    private String status;
+
+    /**
+     * 创建时间
+     */
+    @TableField("createTime")
+    private LocalDateTime createTime;
+
+    /**
+     * 创建人uid
+     */
+    @TableField("createUid")
+    private Long createUid;
+
+    /**
+     * 创建人名称
+     */
+    @TableField("createName")
+    private String createName;
+
+    /**
+     * 修改时间
+     */
+    @TableField("modifyTime")
+    private LocalDateTime modifyTime;
+
+    /**
+     * 修改人uid
+     */
+    @TableField("modifyUid")
+    private Long modifyUid;
+
+    /**
+     * 修改人名称
+     */
+    @TableField("modifyName")
+    private String modifyName;
+
+    /**
+     * 删除状态:NORMAL:正常|DELETE:删除
+     */
+    @TableField("isDelete")
+    private String isDelete;
+}

+ 123 - 0
warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/data/DriverOnRouteDetailLog.java

@@ -0,0 +1,123 @@
+package com.yr.warehouse.admin.driver.data;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 司机在途明细日志表
+ * </p>
+ *
+ * @author 
+ * @since 2025-12-03 15:26:38
+ */
+@Getter
+@Setter
+@TableName("yr_driver_on_route_detail_log")
+public class DriverOnRouteDetailLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 自增主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 运营商id
+     */
+    @TableField("operatorId")
+    private Long operatorId;
+
+    /**
+     * 运营商id链
+     */
+    @TableField("operatorChain")
+    private String operatorChain;
+
+    /**
+     * 区域员工关系id
+     */
+    @TableField("areaStaffId")
+    private Long areaStaffId;
+
+    /**
+     * 统计日期(YYYY-MM-dd)
+     */
+    @TableField("statDate")
+    private LocalDate statDate;
+
+    /**
+     * 货损记录id(关联货损记录表id)
+     */
+    @TableField("goodsLossRecordId")
+    private Long goodsLossRecordId;
+
+    /**
+     * 商品ID
+     */
+    @TableField("goodsId")
+    private Integer goodsId;
+
+    /**
+     * 开单数
+     */
+    @TableField("createNum")
+    private Long createNum;
+
+    /**
+     * 未出库取消数
+     */
+    @TableField("unshippedCancelNum")
+    private Long unshippedCancelNum;
+
+    /**
+     * 已出库取消数
+     */
+    @TableField("shippedCancelNum")
+    private Long shippedCancelNum;
+
+    /**
+     * 补货数
+     */
+    @TableField("replenishNum")
+    private Long replenishNum;
+
+    /**
+     * 回仓数
+     */
+    @TableField("returnWarehouseNum")
+    private Long returnWarehouseNum;
+
+    /**
+     * 昨日库存数
+     */
+    @TableField("yesterdayStockNum")
+    private Long yesterdayStockNum;
+
+    /**
+     * 今日库存数
+     */
+    @TableField("todayStockNum")
+    private Long todayStockNum;
+
+    /**
+     * 盈亏数
+     */
+    @TableField("profitLossNum")
+    private Long profitLossNum;
+
+    /**
+     * 创建时间
+     */
+    @TableField("createTime")
+    private LocalDateTime createTime;
+}

+ 86 - 0
warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/data/EquipmentLossIntervalDetail.java

@@ -0,0 +1,86 @@
+package com.yr.warehouse.admin.driver.data;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 设备货损区间统计明细表
+ * </p>
+ *
+ * @author 
+ * @since 2025-12-03 15:26:38
+ */
+@Getter
+@Setter
+@TableName("yr_equipment_loss_interval_detail")
+public class EquipmentLossIntervalDetail implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 自增主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 货损区间统计主表id(关联司机货损区间统计主表id)
+     */
+    @TableField("goodsLossMonthlyMainId")
+    private Long goodsLossMonthlyMainId;
+
+    /**
+     * 区域员工关系id
+     */
+    @TableField("areaStaffId")
+    private Long areaStaffId;
+
+    /**
+     * 上次剩余设备库存
+     */
+    @TableField("lastRemainingEquipmentStock")
+    private Long lastRemainingEquipmentStock;
+
+    /**
+     * 总补货数
+     */
+    @TableField("totalReplenishNum")
+    private Long totalReplenishNum;
+
+    /**
+     * 设备销量
+     */
+    @TableField("equipmentSalesNum")
+    private Long equipmentSalesNum;
+
+    /**
+     * 理论库存数
+     */
+    @TableField("theoreticalStockNum")
+    private Long theoreticalStockNum;
+
+    /**
+     * 实际库存数
+     */
+    @TableField("actualStockNum")
+    private Long actualStockNum;
+
+    /**
+     * 盈亏数
+     */
+    @TableField("profitLossNum")
+    private Long profitLossNum;
+
+    /**
+     * 创建时间
+     */
+    @TableField("createTime")
+    private LocalDateTime createTime;
+}

+ 16 - 0
warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/mapper/DriverEquipmentLossRecordMapper.java

@@ -0,0 +1,16 @@
+package com.yr.warehouse.admin.driver.mapper;
+
+import com.yr.warehouse.admin.driver.data.DriverEquipmentLossRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 司机设备货损记录表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2025-12-03 15:26:37
+ */
+public interface DriverEquipmentLossRecordMapper extends BaseMapper<DriverEquipmentLossRecord> {
+
+}

+ 16 - 0
warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/mapper/DriverGoodsLossIntervalDetailMapper.java

@@ -0,0 +1,16 @@
+package com.yr.warehouse.admin.driver.mapper;
+
+import com.yr.warehouse.admin.driver.data.DriverGoodsLossIntervalDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 司机货损区间统计明细表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2025-12-03 15:26:37
+ */
+public interface DriverGoodsLossIntervalDetailMapper extends BaseMapper<DriverGoodsLossIntervalDetail> {
+
+}

+ 16 - 0
warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/mapper/DriverGoodsLossIntervalMainMapper.java

@@ -0,0 +1,16 @@
+package com.yr.warehouse.admin.driver.mapper;
+
+import com.yr.warehouse.admin.driver.data.DriverGoodsLossIntervalMain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 司机货损区间统计主表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2025-12-03 15:26:37
+ */
+public interface DriverGoodsLossIntervalMainMapper extends BaseMapper<DriverGoodsLossIntervalMain> {
+
+}

+ 16 - 0
warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/mapper/DriverGoodsLossRecordMapper.java

@@ -0,0 +1,16 @@
+package com.yr.warehouse.admin.driver.mapper;
+
+import com.yr.warehouse.admin.driver.data.DriverGoodsLossRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 司机货损记录表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2025-12-03 15:26:37
+ */
+public interface DriverGoodsLossRecordMapper extends BaseMapper<DriverGoodsLossRecord> {
+
+}

+ 16 - 0
warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/mapper/DriverOnRouteAccountRecordDetailMapper.java

@@ -0,0 +1,16 @@
+package com.yr.warehouse.admin.driver.mapper;
+
+import com.yr.warehouse.admin.driver.data.DriverOnRouteAccountRecordDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 司机在途核算记录子表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2025-12-03 15:26:37
+ */
+public interface DriverOnRouteAccountRecordDetailMapper extends BaseMapper<DriverOnRouteAccountRecordDetail> {
+
+}

+ 16 - 0
warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/mapper/DriverOnRouteAccountRecordMainMapper.java

@@ -0,0 +1,16 @@
+package com.yr.warehouse.admin.driver.mapper;
+
+import com.yr.warehouse.admin.driver.data.DriverOnRouteAccountRecordMain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 司机在途核算记录主表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2025-12-03 15:26:37
+ */
+public interface DriverOnRouteAccountRecordMainMapper extends BaseMapper<DriverOnRouteAccountRecordMain> {
+
+}

+ 16 - 0
warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/mapper/DriverOnRouteDetailLogMapper.java

@@ -0,0 +1,16 @@
+package com.yr.warehouse.admin.driver.mapper;
+
+import com.yr.warehouse.admin.driver.data.DriverOnRouteDetailLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 司机在途明细日志表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2025-12-03 15:26:38
+ */
+public interface DriverOnRouteDetailLogMapper extends BaseMapper<DriverOnRouteDetailLog> {
+
+}

+ 16 - 0
warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/mapper/EquipmentLossIntervalDetailMapper.java

@@ -0,0 +1,16 @@
+package com.yr.warehouse.admin.driver.mapper;
+
+import com.yr.warehouse.admin.driver.data.EquipmentLossIntervalDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 设备货损区间统计明细表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2025-12-03 15:26:38
+ */
+public interface EquipmentLossIntervalDetailMapper extends BaseMapper<EquipmentLossIntervalDetail> {
+
+}

+ 1 - 1
warehouse-admin-data/src/main/java/com/yr/warehouse/admin/replenish/entity/AggregationPickDetail.java → warehouse-admin-data/src/main/java/com/yr/warehouse/admin/replenish/data/AggregationPickDetail.java

@@ -1,4 +1,4 @@
-package com.yr.warehouse.admin.replenish.entity;
+package com.yr.warehouse.admin.replenish.data;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

+ 1 - 1
warehouse-admin-data/src/main/java/com/yr/warehouse/admin/replenish/entity/AggregationPickInfo.java → warehouse-admin-data/src/main/java/com/yr/warehouse/admin/replenish/data/AggregationPickInfo.java

@@ -1,4 +1,4 @@
-package com.yr.warehouse.admin.replenish.entity;
+package com.yr.warehouse.admin.replenish.data;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

+ 1 - 1
warehouse-admin-data/src/main/java/com/yr/warehouse/admin/replenish/entity/AggregationPickLink.java → warehouse-admin-data/src/main/java/com/yr/warehouse/admin/replenish/data/AggregationPickLink.java

@@ -1,4 +1,4 @@
-package com.yr.warehouse.admin.replenish.entity;
+package com.yr.warehouse.admin.replenish.data;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

+ 1 - 1
warehouse-admin-data/src/main/java/com/yr/warehouse/admin/replenish/entity/PickingOrderDetail.java → warehouse-admin-data/src/main/java/com/yr/warehouse/admin/replenish/data/PickingOrderDetail.java

@@ -1,4 +1,4 @@
-package com.yr.warehouse.admin.replenish.entity;
+package com.yr.warehouse.admin.replenish.data;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

+ 1 - 1
warehouse-admin-data/src/main/java/com/yr/warehouse/admin/replenish/entity/PickingOrderInfo.java → warehouse-admin-data/src/main/java/com/yr/warehouse/admin/replenish/data/PickingOrderInfo.java

@@ -1,4 +1,4 @@
-package com.yr.warehouse.admin.replenish.entity;
+package com.yr.warehouse.admin.replenish.data;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

+ 1 - 1
warehouse-admin-data/src/main/java/com/yr/warehouse/admin/replenish/entity/ReplenishOrderDetail.java → warehouse-admin-data/src/main/java/com/yr/warehouse/admin/replenish/data/ReplenishOrderDetail.java

@@ -1,4 +1,4 @@
-package com.yr.warehouse.admin.replenish.entity;
+package com.yr.warehouse.admin.replenish.data;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

+ 1 - 1
warehouse-admin-data/src/main/java/com/yr/warehouse/admin/replenish/entity/ReplenishOrderInfo.java → warehouse-admin-data/src/main/java/com/yr/warehouse/admin/replenish/data/ReplenishOrderInfo.java

@@ -1,4 +1,4 @@
-package com.yr.warehouse.admin.replenish.entity;
+package com.yr.warehouse.admin.replenish.data;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

+ 1 - 1
warehouse-admin-data/src/main/java/com/yr/warehouse/admin/replenish/mapper/AggregationPickDetailMapper.java

@@ -1,6 +1,6 @@
 package com.yr.warehouse.admin.replenish.mapper;
 
-import com.yr.warehouse.admin.replenish.entity.AggregationPickDetail;
+import com.yr.warehouse.admin.replenish.data.AggregationPickDetail;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

+ 1 - 1
warehouse-admin-data/src/main/java/com/yr/warehouse/admin/replenish/mapper/AggregationPickInfoMapper.java

@@ -1,6 +1,6 @@
 package com.yr.warehouse.admin.replenish.mapper;
 
-import com.yr.warehouse.admin.replenish.entity.AggregationPickInfo;
+import com.yr.warehouse.admin.replenish.data.AggregationPickInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

+ 1 - 1
warehouse-admin-data/src/main/java/com/yr/warehouse/admin/replenish/mapper/AggregationPickLinkMapper.java

@@ -1,6 +1,6 @@
 package com.yr.warehouse.admin.replenish.mapper;
 
-import com.yr.warehouse.admin.replenish.entity.AggregationPickLink;
+import com.yr.warehouse.admin.replenish.data.AggregationPickLink;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

+ 1 - 1
warehouse-admin-data/src/main/java/com/yr/warehouse/admin/replenish/mapper/PickingOrderDetailMapper.java

@@ -1,6 +1,6 @@
 package com.yr.warehouse.admin.replenish.mapper;
 
-import com.yr.warehouse.admin.replenish.entity.PickingOrderDetail;
+import com.yr.warehouse.admin.replenish.data.PickingOrderDetail;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

+ 1 - 1
warehouse-admin-data/src/main/java/com/yr/warehouse/admin/replenish/mapper/PickingOrderInfoMapper.java

@@ -1,6 +1,6 @@
 package com.yr.warehouse.admin.replenish.mapper;
 
-import com.yr.warehouse.admin.replenish.entity.PickingOrderInfo;
+import com.yr.warehouse.admin.replenish.data.PickingOrderInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

+ 1 - 1
warehouse-admin-data/src/main/java/com/yr/warehouse/admin/replenish/mapper/ReplenishOrderDetailMapper.java

@@ -1,6 +1,6 @@
 package com.yr.warehouse.admin.replenish.mapper;
 
-import com.yr.warehouse.admin.replenish.entity.ReplenishOrderDetail;
+import com.yr.warehouse.admin.replenish.data.ReplenishOrderDetail;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

+ 1 - 1
warehouse-admin-data/src/main/java/com/yr/warehouse/admin/replenish/mapper/ReplenishOrderInfoMapper.java

@@ -1,6 +1,6 @@
 package com.yr.warehouse.admin.replenish.mapper;
 
-import com.yr.warehouse.admin.replenish.entity.ReplenishOrderInfo;
+import com.yr.warehouse.admin.replenish.data.ReplenishOrderInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

+ 26 - 0
warehouse-admin-data/src/main/resources/mapper/driver/DriverEquipmentLossRecordMapper.xml

@@ -0,0 +1,26 @@
+<?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.yr.warehouse.admin.driver.mapper.DriverEquipmentLossRecordMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.yr.warehouse.admin.driver.data.DriverEquipmentLossRecord">
+        <id column="id" property="id" />
+        <result column="operatorId" property="operatorId" />
+        <result column="operatorChain" property="operatorChain" />
+        <result column="areaStaffId" property="areaStaffId" />
+        <result column="statDate" property="statDate" />
+        <result column="equipmentStockNum" property="equipmentStockNum" />
+        <result column="equipmentReplenishNum" property="equipmentReplenishNum" />
+        <result column="equipmentSalesNum" property="equipmentSalesNum" />
+        <result column="theoreticalEquipmentStockNum" property="theoreticalEquipmentStockNum" />
+        <result column="actualEquipmentStockNum" property="actualEquipmentStockNum" />
+        <result column="profitLossNum" property="profitLossNum" />
+        <result column="createTime" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, operatorId, operatorChain, areaStaffId, statDate, equipmentStockNum, equipmentReplenishNum, equipmentSalesNum, theoreticalEquipmentStockNum, actualEquipmentStockNum, profitLossNum, createTime
+    </sql>
+
+</mapper>

+ 28 - 0
warehouse-admin-data/src/main/resources/mapper/driver/DriverGoodsLossIntervalDetailMapper.xml

@@ -0,0 +1,28 @@
+<?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.yr.warehouse.admin.driver.mapper.DriverGoodsLossIntervalDetailMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.yr.warehouse.admin.driver.data.DriverGoodsLossIntervalDetail">
+        <id column="id" property="id" />
+        <result column="goodsLossMonthlyMainId" property="goodsLossMonthlyMainId" />
+        <result column="areaStaffId" property="areaStaffId" />
+        <result column="lastRemainingOnRouteStock" property="lastRemainingOnRouteStock" />
+        <result column="pickingOrderCreateNum" property="pickingOrderCreateNum" />
+        <result column="wholeOrderCreateNum" property="wholeOrderCreateNum" />
+        <result column="unshippedCancelNum" property="unshippedCancelNum" />
+        <result column="shippedCancelNum" property="shippedCancelNum" />
+        <result column="replenishNum" property="replenishNum" />
+        <result column="returnWarehouseNum" property="returnWarehouseNum" />
+        <result column="remainingUnReplenishedNum" property="remainingUnReplenishedNum" />
+        <result column="wholeVerifyNum" property="wholeVerifyNum" />
+        <result column="profitLossNum" property="profitLossNum" />
+        <result column="createTime" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, goodsLossMonthlyMainId, areaStaffId, lastRemainingOnRouteStock, pickingOrderCreateNum, wholeOrderCreateNum, unshippedCancelNum, shippedCancelNum, replenishNum, returnWarehouseNum, remainingUnReplenishedNum, wholeVerifyNum, profitLossNum, createTime
+    </sql>
+
+</mapper>

+ 38 - 0
warehouse-admin-data/src/main/resources/mapper/driver/DriverGoodsLossIntervalMainMapper.xml

@@ -0,0 +1,38 @@
+<?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.yr.warehouse.admin.driver.mapper.DriverGoodsLossIntervalMainMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.yr.warehouse.admin.driver.data.DriverGoodsLossIntervalMain">
+        <id column="id" property="id" />
+        <result column="intervalStartTime" property="intervalStartTime" />
+        <result column="intervalEndTime" property="intervalEndTime" />
+        <result column="operatorId" property="operatorId" />
+        <result column="operatorChain" property="operatorChain" />
+        <result column="stockTakingType" property="stockTakingType" />
+        <result column="pickingOrderCreateNum" property="pickingOrderCreateNum" />
+        <result column="wholeOrderCreateNum" property="wholeOrderCreateNum" />
+        <result column="replenishNum" property="replenishNum" />
+        <result column="returnWarehouseNum" property="returnWarehouseNum" />
+        <result column="onRouteInventoryNum" property="onRouteInventoryNum" />
+        <result column="unshippedCancelNum" property="unshippedCancelNum" />
+        <result column="shippedCancelNum" property="shippedCancelNum" />
+        <result column="unReplenishedNum" property="unReplenishedNum" />
+        <result column="driverProfitLossNum" property="driverProfitLossNum" />
+        <result column="equipmentProfitLossNum" property="equipmentProfitLossNum" />
+        <result column="totalProfitLossNum" property="totalProfitLossNum" />
+        <result column="createTime" property="createTime" />
+        <result column="createUid" property="createUid" />
+        <result column="createName" property="createName" />
+        <result column="modifyTime" property="modifyTime" />
+        <result column="modifyUid" property="modifyUid" />
+        <result column="modifyName" property="modifyName" />
+        <result column="isDelete" property="isDelete" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, intervalStartTime, intervalEndTime, operatorId, operatorChain, stockTakingType, pickingOrderCreateNum, wholeOrderCreateNum, replenishNum, returnWarehouseNum, onRouteInventoryNum, unshippedCancelNum, shippedCancelNum, unReplenishedNum, driverProfitLossNum, equipmentProfitLossNum, totalProfitLossNum, createTime, createUid, createName, modifyTime, modifyUid, modifyName, isDelete
+    </sql>
+
+</mapper>

+ 28 - 0
warehouse-admin-data/src/main/resources/mapper/driver/DriverGoodsLossRecordMapper.xml

@@ -0,0 +1,28 @@
+<?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.yr.warehouse.admin.driver.mapper.DriverGoodsLossRecordMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.yr.warehouse.admin.driver.data.DriverGoodsLossRecord">
+        <id column="id" property="id" />
+        <result column="operatorId" property="operatorId" />
+        <result column="operatorChain" property="operatorChain" />
+        <result column="areaStaffId" property="areaStaffId" />
+        <result column="statDate" property="statDate" />
+        <result column="yesterdayOnRouteNum" property="yesterdayOnRouteNum" />
+        <result column="pickingOrderCreateNum" property="pickingOrderCreateNum" />
+        <result column="wholeOrderCreateNum" property="wholeOrderCreateNum" />
+        <result column="unshippedCancelNum" property="unshippedCancelNum" />
+        <result column="shippedCancelNum" property="shippedCancelNum" />
+        <result column="replenishNum" property="replenishNum" />
+        <result column="returnWarehouseNum" property="returnWarehouseNum" />
+        <result column="currentOnRouteNum" property="currentOnRouteNum" />
+        <result column="createTime" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, operatorId, operatorChain, areaStaffId, statDate, yesterdayOnRouteNum, pickingOrderCreateNum, wholeOrderCreateNum, unshippedCancelNum, shippedCancelNum, replenishNum, returnWarehouseNum, currentOnRouteNum, createTime
+    </sql>
+
+</mapper>

+ 24 - 0
warehouse-admin-data/src/main/resources/mapper/driver/DriverOnRouteAccountRecordDetailMapper.xml

@@ -0,0 +1,24 @@
+<?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.yr.warehouse.admin.driver.mapper.DriverOnRouteAccountRecordDetailMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.yr.warehouse.admin.driver.data.DriverOnRouteAccountRecordDetail">
+        <id column="id" property="id" />
+        <result column="routeAccountRecordMainId" property="routeAccountRecordMainId" />
+        <result column="goodsId" property="goodsId" />
+        <result column="inventory" property="inventory" />
+        <result column="createTime" property="createTime" />
+        <result column="createUid" property="createUid" />
+        <result column="createName" property="createName" />
+        <result column="modifyTime" property="modifyTime" />
+        <result column="modifyUid" property="modifyUid" />
+        <result column="modifyName" property="modifyName" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, routeAccountRecordMainId, goodsId, inventory, createTime, createUid, createName, modifyTime, modifyUid, modifyName
+    </sql>
+
+</mapper>

+ 30 - 0
warehouse-admin-data/src/main/resources/mapper/driver/DriverOnRouteAccountRecordMainMapper.xml

@@ -0,0 +1,30 @@
+<?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.yr.warehouse.admin.driver.mapper.DriverOnRouteAccountRecordMainMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.yr.warehouse.admin.driver.data.DriverOnRouteAccountRecordMain">
+        <id column="id" property="id" />
+        <result column="operatorId" property="operatorId" />
+        <result column="operatorChain" property="operatorChain" />
+        <result column="areaStaffId" property="areaStaffId" />
+        <result column="warehouseId" property="warehouseId" />
+        <result column="statDate" property="statDate" />
+        <result column="goodsLossMonthlyMainId" property="goodsLossMonthlyMainId" />
+        <result column="statTotalNum" property="statTotalNum" />
+        <result column="status" property="status" />
+        <result column="createTime" property="createTime" />
+        <result column="createUid" property="createUid" />
+        <result column="createName" property="createName" />
+        <result column="modifyTime" property="modifyTime" />
+        <result column="modifyUid" property="modifyUid" />
+        <result column="modifyName" property="modifyName" />
+        <result column="isDelete" property="isDelete" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, operatorId, operatorChain, areaStaffId, warehouseId, statDate, goodsLossMonthlyMainId, statTotalNum, status, createTime, createUid, createName, modifyTime, modifyUid, modifyName, isDelete
+    </sql>
+
+</mapper>

+ 30 - 0
warehouse-admin-data/src/main/resources/mapper/driver/DriverOnRouteDetailLogMapper.xml

@@ -0,0 +1,30 @@
+<?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.yr.warehouse.admin.driver.mapper.DriverOnRouteDetailLogMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.yr.warehouse.admin.driver.data.DriverOnRouteDetailLog">
+        <id column="id" property="id" />
+        <result column="operatorId" property="operatorId" />
+        <result column="operatorChain" property="operatorChain" />
+        <result column="areaStaffId" property="areaStaffId" />
+        <result column="statDate" property="statDate" />
+        <result column="goodsLossRecordId" property="goodsLossRecordId" />
+        <result column="goodsId" property="goodsId" />
+        <result column="createNum" property="createNum" />
+        <result column="unshippedCancelNum" property="unshippedCancelNum" />
+        <result column="shippedCancelNum" property="shippedCancelNum" />
+        <result column="replenishNum" property="replenishNum" />
+        <result column="returnWarehouseNum" property="returnWarehouseNum" />
+        <result column="yesterdayStockNum" property="yesterdayStockNum" />
+        <result column="todayStockNum" property="todayStockNum" />
+        <result column="profitLossNum" property="profitLossNum" />
+        <result column="createTime" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, operatorId, operatorChain, areaStaffId, statDate, goodsLossRecordId, goodsId, createNum, unshippedCancelNum, shippedCancelNum, replenishNum, returnWarehouseNum, yesterdayStockNum, todayStockNum, profitLossNum, createTime
+    </sql>
+
+</mapper>

+ 24 - 0
warehouse-admin-data/src/main/resources/mapper/driver/EquipmentLossIntervalDetailMapper.xml

@@ -0,0 +1,24 @@
+<?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.yr.warehouse.admin.driver.mapper.EquipmentLossIntervalDetailMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.yr.warehouse.admin.driver.data.EquipmentLossIntervalDetail">
+        <id column="id" property="id" />
+        <result column="goodsLossMonthlyMainId" property="goodsLossMonthlyMainId" />
+        <result column="areaStaffId" property="areaStaffId" />
+        <result column="lastRemainingEquipmentStock" property="lastRemainingEquipmentStock" />
+        <result column="totalReplenishNum" property="totalReplenishNum" />
+        <result column="equipmentSalesNum" property="equipmentSalesNum" />
+        <result column="theoreticalStockNum" property="theoreticalStockNum" />
+        <result column="actualStockNum" property="actualStockNum" />
+        <result column="profitLossNum" property="profitLossNum" />
+        <result column="createTime" property="createTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, goodsLossMonthlyMainId, areaStaffId, lastRemainingEquipmentStock, totalReplenishNum, equipmentSalesNum, theoreticalStockNum, actualStockNum, profitLossNum, createTime
+    </sql>
+
+</mapper>

+ 1 - 1
warehouse-admin-data/src/main/resources/mapper/replenish/AggregationPickDetailMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.yr.warehouse.admin.replenish.mapper.AggregationPickDetailMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.yr.warehouse.admin.replenish.entity.AggregationPickDetail">
+    <resultMap id="BaseResultMap" type="com.yr.warehouse.admin.replenish.data.AggregationPickDetail">
         <id column="id" property="id" />
         <result column="order_number" property="orderNumber" />
         <result column="goods_id" property="goodsId" />

+ 1 - 1
warehouse-admin-data/src/main/resources/mapper/replenish/AggregationPickInfoMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.yr.warehouse.admin.replenish.mapper.AggregationPickInfoMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.yr.warehouse.admin.replenish.entity.AggregationPickInfo">
+    <resultMap id="BaseResultMap" type="com.yr.warehouse.admin.replenish.data.AggregationPickInfo">
         <id column="id" property="id" />
         <result column="order_number" property="orderNumber" />
         <result column="warehouse_info_id" property="warehouseInfoId" />

+ 1 - 1
warehouse-admin-data/src/main/resources/mapper/replenish/AggregationPickLinkMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.yr.warehouse.admin.replenish.mapper.AggregationPickLinkMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.yr.warehouse.admin.replenish.entity.AggregationPickLink">
+    <resultMap id="BaseResultMap" type="com.yr.warehouse.admin.replenish.data.AggregationPickLink">
         <id column="id" property="id" />
         <result column="aggregation_order_number" property="aggregationOrderNumber" />
         <result column="picking_order_number" property="pickingOrderNumber" />

+ 1 - 1
warehouse-admin-data/src/main/resources/mapper/replenish/PickingOrderDetailMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.yr.warehouse.admin.replenish.mapper.PickingOrderDetailMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.yr.warehouse.admin.replenish.entity.PickingOrderDetail">
+    <resultMap id="BaseResultMap" type="com.yr.warehouse.admin.replenish.data.PickingOrderDetail">
         <id column="id" property="id" />
         <result column="order_number" property="orderNumber" />
         <result column="picking_number" property="pickingNumber" />

+ 1 - 1
warehouse-admin-data/src/main/resources/mapper/replenish/PickingOrderInfoMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.yr.warehouse.admin.replenish.mapper.PickingOrderInfoMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.yr.warehouse.admin.replenish.entity.PickingOrderInfo">
+    <resultMap id="BaseResultMap" type="com.yr.warehouse.admin.replenish.data.PickingOrderInfo">
         <id column="id" property="id" />
         <result column="operator_id" property="operatorId" />
         <result column="operator_chain" property="operatorChain" />

+ 1 - 1
warehouse-admin-data/src/main/resources/mapper/replenish/ReplenishOrderDetailMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.yr.warehouse.admin.replenish.mapper.ReplenishOrderDetailMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.yr.warehouse.admin.replenish.entity.ReplenishOrderDetail">
+    <resultMap id="BaseResultMap" type="com.yr.warehouse.admin.replenish.data.ReplenishOrderDetail">
         <id column="id" property="id" />
         <result column="order_number" property="orderNumber" />
         <result column="picking_number" property="pickingNumber" />

+ 1 - 1
warehouse-admin-data/src/main/resources/mapper/replenish/ReplenishOrderInfoMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.yr.warehouse.admin.replenish.mapper.ReplenishOrderInfoMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.yr.warehouse.admin.replenish.entity.ReplenishOrderInfo">
+    <resultMap id="BaseResultMap" type="com.yr.warehouse.admin.replenish.data.ReplenishOrderInfo">
         <id column="id" property="id" />
         <result column="operator_id" property="operatorId" />
         <result column="operator_chain" property="operatorChain" />

+ 19 - 7
warehouse-admin-data/src/main/test/com/supplychain/CodeGenerator.java

@@ -45,16 +45,28 @@ public class CodeGenerator {
     private static final String TABLE_PREFIX = "yr";
 
     /**
+     * 包 名
+     */
+    private static final String PACKAGE_NAME = "com.yr.warehouse.admin.";
+
+    /**
      * 模块名
      */
-    //private static final String MODULE_NAME = "";
+    private static final String PACKAGE_BUSINESS = "driver";
 
     /**
      * 需要生成的表名,必填
      */
-    private static final List<String> TABLES = List.of("yr_picking_order_info", "yr_picking_order_detail", "yr_replenish_order_info", "yr_replenish_order_detail",
-            "yr_aggregation_pick_info", "yr_aggregation_pick_link", "yr_aggregation_pick_detail"
-            );
+    private static final List<String> TABLES = List.of(
+            "yr_driver_goods_loss_record",
+            "yr_driver_equipment_loss_record",
+            "yr_driver_on_route_detail_log",
+            "yr_driver_goods_loss_interval_main",
+            "yr_driver_goods_loss_interval_detail",
+            "yr_equipment_loss_interval_detail",
+            "yr_driver_on_route_account_record_main",
+            "yr_driver_on_route_account_record_detail"
+    );
 
 
     public static void main(String[] args) {
@@ -77,16 +89,16 @@ public class CodeGenerator {
 
         //包名配置
         PackageConfig packageConfig = new PackageConfig.Builder()
-                .parent("com.yr.warehouse.admin.replenish.data")                      //父包名
+                .parent(PACKAGE_NAME + PACKAGE_BUSINESS)                      //父包名
                 //.moduleName(moduleName)           //模块名
                 //.controller("controller")       //controller包名
                 //.service("service.sys")           //service接口包名
                 .service("service")
                 .serviceImpl("service.impl")         //service实现类包名
-                .entity("entity")               //实体类包名
+                .entity("data")               //实体类包名
                 .mapper("mapper")               //mapper包名
                 .xml("mapper")                  //mapper对应的xml包名
-                .pathInfo(Collections.singletonMap(OutputFile.mapper.xml, projectPath + "/warehouse-admin-data/src/main/resources/mapper/replenish"))                  //mapper对应的xml路径
+                .pathInfo(Collections.singletonMap(OutputFile.mapper.xml, projectPath + "/warehouse-admin-data/src/main/resources/mapper/" + PACKAGE_BUSINESS))                  //mapper对应的xml路径
                 .build();
 
         //策略配置

+ 1 - 1
warehouse-admin-server/src/main/java/com/yr/warehouse/admin/server/context/SpringContext.java → warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/context/SpringContext.java

@@ -1,4 +1,4 @@
-package com.yr.warehouse.admin.server.context;
+package com.yr.warehouse.admin.service.context;
 
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.BeansException;

+ 16 - 0
warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/driver/DriverEquipmentLossRecordService.java

@@ -0,0 +1,16 @@
+package com.yr.warehouse.admin.service.driver;
+
+import com.yr.warehouse.admin.driver.data.DriverEquipmentLossRecord;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 司机设备货损记录表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2025-12-03 15:26:37
+ */
+public interface DriverEquipmentLossRecordService extends IService<DriverEquipmentLossRecord> {
+
+}

+ 16 - 0
warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/driver/DriverGoodsLossIntervalDetailService.java

@@ -0,0 +1,16 @@
+package com.yr.warehouse.admin.service.driver;
+
+import com.yr.warehouse.admin.driver.data.DriverGoodsLossIntervalDetail;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 司机货损区间统计明细表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2025-12-03 15:26:37
+ */
+public interface DriverGoodsLossIntervalDetailService extends IService<DriverGoodsLossIntervalDetail> {
+
+}

+ 16 - 0
warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/driver/DriverGoodsLossIntervalMainService.java

@@ -0,0 +1,16 @@
+package com.yr.warehouse.admin.service.driver;
+
+import com.yr.warehouse.admin.driver.data.DriverGoodsLossIntervalMain;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 司机货损区间统计主表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2025-12-03 15:26:37
+ */
+public interface DriverGoodsLossIntervalMainService extends IService<DriverGoodsLossIntervalMain> {
+
+}

+ 16 - 0
warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/driver/DriverGoodsLossRecordService.java

@@ -0,0 +1,16 @@
+package com.yr.warehouse.admin.service.driver;
+
+import com.yr.warehouse.admin.driver.data.DriverGoodsLossRecord;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 司机货损记录表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2025-12-03 15:26:37
+ */
+public interface DriverGoodsLossRecordService extends IService<DriverGoodsLossRecord> {
+
+}

+ 16 - 0
warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/driver/DriverOnRouteAccountRecordDetailService.java

@@ -0,0 +1,16 @@
+package com.yr.warehouse.admin.service.driver;
+
+import com.yr.warehouse.admin.driver.data.DriverOnRouteAccountRecordDetail;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 司机在途核算记录子表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2025-12-03 15:26:37
+ */
+public interface DriverOnRouteAccountRecordDetailService extends IService<DriverOnRouteAccountRecordDetail> {
+
+}

+ 16 - 0
warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/driver/DriverOnRouteAccountRecordMainService.java

@@ -0,0 +1,16 @@
+package com.yr.warehouse.admin.service.driver;
+
+import com.yr.warehouse.admin.driver.data.DriverOnRouteAccountRecordMain;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 司机在途核算记录主表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2025-12-03 15:26:37
+ */
+public interface DriverOnRouteAccountRecordMainService extends IService<DriverOnRouteAccountRecordMain> {
+
+}

+ 16 - 0
warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/driver/DriverOnRouteDetailLogService.java

@@ -0,0 +1,16 @@
+package com.yr.warehouse.admin.service.driver;
+
+import com.yr.warehouse.admin.driver.data.DriverOnRouteDetailLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 司机在途明细日志表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2025-12-03 15:26:38
+ */
+public interface DriverOnRouteDetailLogService extends IService<DriverOnRouteDetailLog> {
+
+}

+ 16 - 0
warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/driver/EquipmentLossIntervalDetailService.java

@@ -0,0 +1,16 @@
+package com.yr.warehouse.admin.service.driver;
+
+import com.yr.warehouse.admin.driver.data.EquipmentLossIntervalDetail;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 设备货损区间统计明细表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2025-12-03 15:26:38
+ */
+public interface EquipmentLossIntervalDetailService extends IService<EquipmentLossIntervalDetail> {
+
+}

+ 20 - 0
warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/driver/impl/DriverEquipmentLossRecordServiceImpl.java

@@ -0,0 +1,20 @@
+package com.yr.warehouse.admin.service.driver.impl;
+
+import com.yr.warehouse.admin.driver.data.DriverEquipmentLossRecord;
+import com.yr.warehouse.admin.driver.mapper.DriverEquipmentLossRecordMapper;
+import com.yr.warehouse.admin.service.driver.DriverEquipmentLossRecordService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 司机设备货损记录表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2025-12-03 15:26:37
+ */
+@Service
+public class DriverEquipmentLossRecordServiceImpl extends ServiceImpl<DriverEquipmentLossRecordMapper, DriverEquipmentLossRecord> implements DriverEquipmentLossRecordService {
+
+}

+ 20 - 0
warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/driver/impl/DriverGoodsLossIntervalDetailServiceImpl.java

@@ -0,0 +1,20 @@
+package com.yr.warehouse.admin.service.driver.impl;
+
+import com.yr.warehouse.admin.driver.data.DriverGoodsLossIntervalDetail;
+import com.yr.warehouse.admin.driver.mapper.DriverGoodsLossIntervalDetailMapper;
+import com.yr.warehouse.admin.service.driver.DriverGoodsLossIntervalDetailService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 司机货损区间统计明细表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2025-12-03 15:26:37
+ */
+@Service
+public class DriverGoodsLossIntervalDetailServiceImpl extends ServiceImpl<DriverGoodsLossIntervalDetailMapper, DriverGoodsLossIntervalDetail> implements DriverGoodsLossIntervalDetailService {
+
+}

+ 20 - 0
warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/driver/impl/DriverGoodsLossIntervalMainServiceImpl.java

@@ -0,0 +1,20 @@
+package com.yr.warehouse.admin.service.driver.impl;
+
+import com.yr.warehouse.admin.driver.data.DriverGoodsLossIntervalMain;
+import com.yr.warehouse.admin.driver.mapper.DriverGoodsLossIntervalMainMapper;
+import com.yr.warehouse.admin.service.driver.DriverGoodsLossIntervalMainService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 司机货损区间统计主表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2025-12-03 15:26:37
+ */
+@Service
+public class DriverGoodsLossIntervalMainServiceImpl extends ServiceImpl<DriverGoodsLossIntervalMainMapper, DriverGoodsLossIntervalMain> implements DriverGoodsLossIntervalMainService {
+
+}

+ 20 - 0
warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/driver/impl/DriverGoodsLossRecordServiceImpl.java

@@ -0,0 +1,20 @@
+package com.yr.warehouse.admin.service.driver.impl;
+
+import com.yr.warehouse.admin.driver.data.DriverGoodsLossRecord;
+import com.yr.warehouse.admin.driver.mapper.DriverGoodsLossRecordMapper;
+import com.yr.warehouse.admin.service.driver.DriverGoodsLossRecordService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 司机货损记录表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2025-12-03 15:26:37
+ */
+@Service
+public class DriverGoodsLossRecordServiceImpl extends ServiceImpl<DriverGoodsLossRecordMapper, DriverGoodsLossRecord> implements DriverGoodsLossRecordService {
+
+}

+ 20 - 0
warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/driver/impl/DriverOnRouteAccountRecordDetailServiceImpl.java

@@ -0,0 +1,20 @@
+package com.yr.warehouse.admin.service.driver.impl;
+
+import com.yr.warehouse.admin.driver.data.DriverOnRouteAccountRecordDetail;
+import com.yr.warehouse.admin.driver.mapper.DriverOnRouteAccountRecordDetailMapper;
+import com.yr.warehouse.admin.service.driver.DriverOnRouteAccountRecordDetailService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 司机在途核算记录子表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2025-12-03 15:26:37
+ */
+@Service
+public class DriverOnRouteAccountRecordDetailServiceImpl extends ServiceImpl<DriverOnRouteAccountRecordDetailMapper, DriverOnRouteAccountRecordDetail> implements DriverOnRouteAccountRecordDetailService {
+
+}

+ 20 - 0
warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/driver/impl/DriverOnRouteAccountRecordMainServiceImpl.java

@@ -0,0 +1,20 @@
+package com.yr.warehouse.admin.service.driver.impl;
+
+import com.yr.warehouse.admin.driver.data.DriverOnRouteAccountRecordMain;
+import com.yr.warehouse.admin.driver.mapper.DriverOnRouteAccountRecordMainMapper;
+import com.yr.warehouse.admin.service.driver.DriverOnRouteAccountRecordMainService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 司机在途核算记录主表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2025-12-03 15:26:37
+ */
+@Service
+public class DriverOnRouteAccountRecordMainServiceImpl extends ServiceImpl<DriverOnRouteAccountRecordMainMapper, DriverOnRouteAccountRecordMain> implements DriverOnRouteAccountRecordMainService {
+
+}

+ 20 - 0
warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/driver/impl/DriverOnRouteDetailLogServiceImpl.java

@@ -0,0 +1,20 @@
+package com.yr.warehouse.admin.service.driver.impl;
+
+import com.yr.warehouse.admin.driver.data.DriverOnRouteDetailLog;
+import com.yr.warehouse.admin.driver.mapper.DriverOnRouteDetailLogMapper;
+import com.yr.warehouse.admin.service.driver.DriverOnRouteDetailLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 司机在途明细日志表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2025-12-03 15:26:38
+ */
+@Service
+public class DriverOnRouteDetailLogServiceImpl extends ServiceImpl<DriverOnRouteDetailLogMapper, DriverOnRouteDetailLog> implements DriverOnRouteDetailLogService {
+
+}

+ 20 - 0
warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/driver/impl/EquipmentLossIntervalDetailServiceImpl.java

@@ -0,0 +1,20 @@
+package com.yr.warehouse.admin.service.driver.impl;
+
+import com.yr.warehouse.admin.driver.data.EquipmentLossIntervalDetail;
+import com.yr.warehouse.admin.driver.mapper.EquipmentLossIntervalDetailMapper;
+import com.yr.warehouse.admin.service.driver.EquipmentLossIntervalDetailService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 设备货损区间统计明细表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2025-12-03 15:26:38
+ */
+@Service
+public class EquipmentLossIntervalDetailServiceImpl extends ServiceImpl<EquipmentLossIntervalDetailMapper, EquipmentLossIntervalDetail> implements EquipmentLossIntervalDetailService {
+
+}

+ 2 - 2
warehouse-admin-server/src/main/java/com/yr/warehouse/admin/server/replenish/service/AggregationPickDetailService.java → warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/replenish/AggregationPickDetailService.java

@@ -1,6 +1,6 @@
-package com.yr.warehouse.admin.server.replenish.service;
+package com.yr.warehouse.admin.service.replenish;
 
-import com.yr.warehouse.admin.replenish.entity.AggregationPickDetail;
+import com.yr.warehouse.admin.replenish.data.AggregationPickDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

+ 2 - 2
warehouse-admin-server/src/main/java/com/yr/warehouse/admin/server/replenish/service/AggregationPickInfoService.java → warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/replenish/AggregationPickInfoService.java

@@ -1,6 +1,6 @@
-package com.yr.warehouse.admin.server.replenish.service;
+package com.yr.warehouse.admin.service.replenish;
 
-import com.yr.warehouse.admin.replenish.entity.AggregationPickInfo;
+import com.yr.warehouse.admin.replenish.data.AggregationPickInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

+ 2 - 2
warehouse-admin-server/src/main/java/com/yr/warehouse/admin/server/replenish/service/AggregationPickLinkService.java → warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/replenish/AggregationPickLinkService.java

@@ -1,6 +1,6 @@
-package com.yr.warehouse.admin.server.replenish.service;
+package com.yr.warehouse.admin.service.replenish;
 
-import com.yr.warehouse.admin.replenish.entity.AggregationPickLink;
+import com.yr.warehouse.admin.replenish.data.AggregationPickLink;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

+ 2 - 2
warehouse-admin-server/src/main/java/com/yr/warehouse/admin/server/replenish/service/PickingOrderDetailService.java → warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/replenish/PickingOrderDetailService.java

@@ -1,6 +1,6 @@
-package com.yr.warehouse.admin.server.replenish.service;
+package com.yr.warehouse.admin.service.replenish;
 
-import com.yr.warehouse.admin.replenish.entity.PickingOrderDetail;
+import com.yr.warehouse.admin.replenish.data.PickingOrderDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

+ 2 - 2
warehouse-admin-server/src/main/java/com/yr/warehouse/admin/server/replenish/service/PickingOrderInfoService.java → warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/replenish/PickingOrderInfoService.java

@@ -1,6 +1,6 @@
-package com.yr.warehouse.admin.server.replenish.service;
+package com.yr.warehouse.admin.service.replenish;
 
-import com.yr.warehouse.admin.replenish.entity.PickingOrderInfo;
+import com.yr.warehouse.admin.replenish.data.PickingOrderInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

+ 2 - 2
warehouse-admin-server/src/main/java/com/yr/warehouse/admin/server/replenish/service/ReplenishOrderDetailService.java → warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/replenish/ReplenishOrderDetailService.java

@@ -1,6 +1,6 @@
-package com.yr.warehouse.admin.server.replenish.service;
+package com.yr.warehouse.admin.service.replenish;
 
-import com.yr.warehouse.admin.replenish.entity.ReplenishOrderDetail;
+import com.yr.warehouse.admin.replenish.data.ReplenishOrderDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

+ 2 - 2
warehouse-admin-server/src/main/java/com/yr/warehouse/admin/server/replenish/service/ReplenishOrderInfoService.java → warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/replenish/ReplenishOrderInfoService.java

@@ -1,6 +1,6 @@
-package com.yr.warehouse.admin.server.replenish.service;
+package com.yr.warehouse.admin.service.replenish;
 
-import com.yr.warehouse.admin.replenish.entity.ReplenishOrderInfo;
+import com.yr.warehouse.admin.replenish.data.ReplenishOrderInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

+ 3 - 3
warehouse-admin-server/src/main/java/com/yr/warehouse/admin/server/replenish/service/impl/AggregationPickDetailServiceImpl.java → warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/replenish/impl/AggregationPickDetailServiceImpl.java

@@ -1,8 +1,8 @@
-package com.yr.warehouse.admin.server.replenish.service.impl;
+package com.yr.warehouse.admin.service.replenish.impl;
 
-import com.yr.warehouse.admin.replenish.entity.AggregationPickDetail;
+import com.yr.warehouse.admin.replenish.data.AggregationPickDetail;
 import com.yr.warehouse.admin.replenish.mapper.AggregationPickDetailMapper;
-import com.yr.warehouse.admin.server.replenish.service.AggregationPickDetailService;
+import com.yr.warehouse.admin.service.replenish.AggregationPickDetailService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

+ 3 - 3
warehouse-admin-server/src/main/java/com/yr/warehouse/admin/server/replenish/service/impl/AggregationPickInfoServiceImpl.java → warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/replenish/impl/AggregationPickInfoServiceImpl.java

@@ -1,8 +1,8 @@
-package com.yr.warehouse.admin.server.replenish.service.impl;
+package com.yr.warehouse.admin.service.replenish.impl;
 
-import com.yr.warehouse.admin.replenish.entity.AggregationPickInfo;
+import com.yr.warehouse.admin.replenish.data.AggregationPickInfo;
 import com.yr.warehouse.admin.replenish.mapper.AggregationPickInfoMapper;
-import com.yr.warehouse.admin.server.replenish.service.AggregationPickInfoService;
+import com.yr.warehouse.admin.service.replenish.AggregationPickInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

+ 3 - 3
warehouse-admin-server/src/main/java/com/yr/warehouse/admin/server/replenish/service/impl/AggregationPickLinkServiceImpl.java → warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/replenish/impl/AggregationPickLinkServiceImpl.java

@@ -1,8 +1,8 @@
-package com.yr.warehouse.admin.server.replenish.service.impl;
+package com.yr.warehouse.admin.service.replenish.impl;
 
-import com.yr.warehouse.admin.replenish.entity.AggregationPickLink;
+import com.yr.warehouse.admin.replenish.data.AggregationPickLink;
 import com.yr.warehouse.admin.replenish.mapper.AggregationPickLinkMapper;
-import com.yr.warehouse.admin.server.replenish.service.AggregationPickLinkService;
+import com.yr.warehouse.admin.service.replenish.AggregationPickLinkService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

+ 3 - 3
warehouse-admin-server/src/main/java/com/yr/warehouse/admin/server/replenish/service/impl/PickingOrderDetailServiceImpl.java → warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/replenish/impl/PickingOrderDetailServiceImpl.java

@@ -1,8 +1,8 @@
-package com.yr.warehouse.admin.server.replenish.service.impl;
+package com.yr.warehouse.admin.service.replenish.impl;
 
-import com.yr.warehouse.admin.replenish.entity.PickingOrderDetail;
+import com.yr.warehouse.admin.replenish.data.PickingOrderDetail;
 import com.yr.warehouse.admin.replenish.mapper.PickingOrderDetailMapper;
-import com.yr.warehouse.admin.server.replenish.service.PickingOrderDetailService;
+import com.yr.warehouse.admin.service.replenish.PickingOrderDetailService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

+ 3 - 3
warehouse-admin-server/src/main/java/com/yr/warehouse/admin/server/replenish/service/impl/PickingOrderInfoServiceImpl.java → warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/replenish/impl/PickingOrderInfoServiceImpl.java

@@ -1,8 +1,8 @@
-package com.yr.warehouse.admin.server.replenish.service.impl;
+package com.yr.warehouse.admin.service.replenish.impl;
 
-import com.yr.warehouse.admin.replenish.entity.PickingOrderInfo;
+import com.yr.warehouse.admin.replenish.data.PickingOrderInfo;
 import com.yr.warehouse.admin.replenish.mapper.PickingOrderInfoMapper;
-import com.yr.warehouse.admin.server.replenish.service.PickingOrderInfoService;
+import com.yr.warehouse.admin.service.replenish.PickingOrderInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

+ 3 - 3
warehouse-admin-server/src/main/java/com/yr/warehouse/admin/server/replenish/service/impl/ReplenishOrderDetailServiceImpl.java → warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/replenish/impl/ReplenishOrderDetailServiceImpl.java

@@ -1,8 +1,8 @@
-package com.yr.warehouse.admin.server.replenish.service.impl;
+package com.yr.warehouse.admin.service.replenish.impl;
 
-import com.yr.warehouse.admin.replenish.entity.ReplenishOrderDetail;
+import com.yr.warehouse.admin.replenish.data.ReplenishOrderDetail;
 import com.yr.warehouse.admin.replenish.mapper.ReplenishOrderDetailMapper;
-import com.yr.warehouse.admin.server.replenish.service.ReplenishOrderDetailService;
+import com.yr.warehouse.admin.service.replenish.ReplenishOrderDetailService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

+ 3 - 3
warehouse-admin-server/src/main/java/com/yr/warehouse/admin/server/replenish/service/impl/ReplenishOrderInfoServiceImpl.java → warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/replenish/impl/ReplenishOrderInfoServiceImpl.java

@@ -1,8 +1,8 @@
-package com.yr.warehouse.admin.server.replenish.service.impl;
+package com.yr.warehouse.admin.service.replenish.impl;
 
-import com.yr.warehouse.admin.replenish.entity.ReplenishOrderInfo;
+import com.yr.warehouse.admin.replenish.data.ReplenishOrderInfo;
 import com.yr.warehouse.admin.replenish.mapper.ReplenishOrderInfoMapper;
-import com.yr.warehouse.admin.server.replenish.service.ReplenishOrderInfoService;
+import com.yr.warehouse.admin.service.replenish.ReplenishOrderInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

+ 53 - 0
warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/controller/DriverDailyCargoDamageController.java

@@ -0,0 +1,53 @@
+package com.yr.warehouse.admin.web.driver.controller;
+
+import com.yr.bluecat.common.entity.response.PageResult;
+import com.yr.bluecat.common.entity.response.Result;
+import com.yr.prism.auth.core.user.AdminUserInfo;
+import com.yr.warehouse.admin.driver.bo.DriverDailyCargoDamageExportBo;
+import com.yr.warehouse.admin.driver.bo.DriverDailyCargoDamagePageBo;
+import com.yr.warehouse.admin.service.driver.DriverGoodsLossRecordService;
+import com.yr.warehouse.admin.web.common.BaseController;
+import com.yr.warehouse.admin.web.driver.mapstruct.DriverDailyCargoDamageMapStruct;
+import com.yr.warehouse.admin.web.driver.request.DriverDailyCargoDamageExportRequest;
+import com.yr.warehouse.admin.web.driver.request.DriverDailyCargoDamagePageRequest;
+import com.yr.warehouse.admin.web.driver.response.DriverGoodsLossRecordResponse;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 司机日货损
+ */
+@RestController
+@RequestMapping("/driver/daily/cargoDamage")
+public class DriverDailyCargoDamageController extends BaseController {
+    @Resource
+    private DriverGoodsLossRecordService driverGoodsLossRecordService;
+
+    /**
+     * 分页查询货损记录
+     * @param request
+     * @return
+     */
+    @PostMapping("/page")
+    @ResponseBody
+    public PageResult<DriverGoodsLossRecordResponse> page(@Validated @RequestBody DriverDailyCargoDamagePageRequest request, AdminUserInfo adminUserInfo) {
+        DriverDailyCargoDamagePageBo bo = DriverDailyCargoDamageMapStruct.MAPSTRUCT.pageRequestToBo(request);
+        buildUserInfo(bo, adminUserInfo);
+        return null;
+    }
+
+    /**
+     * 导出货损记录
+     * @param request
+     * @return
+     */
+    @PostMapping("/export")
+    @ResponseBody
+    public Result<String> export(@Validated @RequestBody DriverDailyCargoDamageExportRequest request, AdminUserInfo adminUserInfo) {
+        DriverDailyCargoDamageExportBo bo = DriverDailyCargoDamageMapStruct.MAPSTRUCT.exportRequestToBo(request);
+        buildUserInfo(bo, adminUserInfo);
+        return null;
+    }
+
+}

+ 158 - 0
warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/controller/DriverIntervalCargoDamageController.java

@@ -0,0 +1,158 @@
+package com.yr.warehouse.admin.web.driver.controller;
+
+import com.yr.bluecat.common.entity.response.PageResult;
+import com.yr.bluecat.common.entity.response.Result;
+import com.yr.prism.auth.core.user.AdminUserInfo;
+import com.yr.warehouse.admin.driver.bo.DriverIntervalCargoDamageDetailExportBo;
+import com.yr.warehouse.admin.driver.bo.DriverIntervalCargoDamageDetailPageBo;
+import com.yr.warehouse.admin.driver.bo.DriverIntervalCargoDamageGeneratorBo;
+import com.yr.warehouse.admin.driver.bo.DriverIntervalCargoDamagePageBo;
+import com.yr.warehouse.admin.web.common.BaseController;
+import com.yr.warehouse.admin.web.driver.mapstruct.DriverIntervalCargoDamageMapStruct;
+import com.yr.warehouse.admin.web.driver.request.*;
+import com.yr.warehouse.admin.web.driver.response.DriverIntervalCargoDamageDetailPageResponse;
+import com.yr.warehouse.admin.web.driver.response.DriverIntervalCargoDamagePageResponse;
+import com.yr.warehouse.admin.web.driver.response.DriverRouteAccountRecordMainResponse;
+import com.yr.warehouse.admin.web.driver.response.DriverRouteDetailResponse;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 司机区间货损
+ */
+@RestController
+@RequestMapping("/driver/interval/cargoDamage")
+public class DriverIntervalCargoDamageController extends BaseController {
+
+    /**
+     * 查询运营商对应的区间货损最后统计时间
+     * @return
+     */
+    @GetMapping("/searchLastTotalTime/{operatorId}")
+    @ResponseBody
+    public Result<String> searchLastTotalTime(@PathVariable("operatorId") Long operatorId, AdminUserInfo adminUserInfo) {
+        return null;
+    }
+
+    /**
+     * 生成区间统计记录
+     * @return
+     */
+    @PostMapping("/generator")
+    @ResponseBody
+    public Result<String> generator(@Validated @RequestBody DriverIntervalCargoDamageGeneratorRequest request, AdminUserInfo adminUserInfo) {
+        DriverIntervalCargoDamageGeneratorBo bo = DriverIntervalCargoDamageMapStruct.MAPSTRUCT.generatorRequestToBo(request);
+        buildUserInfo(bo, adminUserInfo);
+        return null;
+    }
+
+    /**
+     * 分页查询区间生成统计记录
+     * @return
+     */
+    @PostMapping("/page")
+    @ResponseBody
+    public PageResult<DriverIntervalCargoDamagePageResponse> page(@Validated @RequestBody DriverIntervalCargoDamagePageRequest request, AdminUserInfo adminUserInfo) {
+        DriverIntervalCargoDamagePageBo bo = DriverIntervalCargoDamageMapStruct.MAPSTRUCT.pageRequestToBo(request);
+        buildUserInfo(bo, adminUserInfo);
+        return null;
+    }
+
+    /**
+     * 区间生成统计记录详情分页查询
+     * @return
+     */
+    @PostMapping("/detail/page")
+    @ResponseBody
+    public PageResult<DriverIntervalCargoDamageDetailPageResponse> detailPage(@Validated @RequestBody DriverIntervalCargoDamageDetailPageRequest request, AdminUserInfo adminUserInfo) {
+        DriverIntervalCargoDamageDetailPageBo bo = DriverIntervalCargoDamageMapStruct.MAPSTRUCT.detailPageRequestToBo(request);
+        buildUserInfo(bo, adminUserInfo);
+        return null;
+    }
+
+    /**
+     * 导出区间生成统计记录详情
+     * @return
+     */
+    @PostMapping("/detail/export")
+    @ResponseBody
+    public Result<String> detailExport(@Validated @RequestBody DriverIntervalCargoDamageDetailExportRequest request, AdminUserInfo adminUserInfo) {
+        DriverIntervalCargoDamageDetailExportBo bo = DriverIntervalCargoDamageMapStruct.MAPSTRUCT.detailExportRequestToBo(request);
+        buildUserInfo(bo, adminUserInfo);
+        return null;
+    }
+
+    /**
+     * 添加司机在途核算记录
+     * @return
+     */
+    @PostMapping("/routeAccountRecord/add")
+    @ResponseBody
+    public Result<String> addRouteAccountRecord(@Validated @RequestBody DriverIntervalRouteAccountRecordCreateRequest request, AdminUserInfo adminUserInfo) {
+        return null;
+    }
+
+    /**
+     * 取消司机在途核算记录
+     * @return
+     */
+    @GetMapping("/routeAccountRecord/cancel/{routeAccountRecordMainId}")
+    @ResponseBody
+    public Result<String> cancelRouteAccountRecord(@PathVariable("routeAccountRecordMainId") Long routeAccountRecordMainId, AdminUserInfo adminUserInfo) {
+        return null;
+    }
+
+    /**
+     * 导出司机在途核算记录
+     * @return
+     */
+    @PostMapping("/routeAccountRecord/export")
+    @ResponseBody
+    public Result<String> exportRouteAccountRecord(@Validated @RequestBody DriverRouteAccountRecordExportRequest request, AdminUserInfo adminUserInfo) {
+        return null;
+    }
+
+    /**
+     * 分页查询司机在途核算记录
+     * @return
+     */
+    @PostMapping("/routeAccountRecord/page")
+    @ResponseBody
+    public PageResult<DriverRouteAccountRecordMainResponse> routeAccountRecordPage(@Validated @RequestBody DriverRouteAccountRecordPageRequest request, AdminUserInfo adminUserInfo) {
+        return null;
+    }
+
+    /**
+     * 查询司机在途核算记录明细
+     * @return
+     */
+    @GetMapping("/routeAccountRecord/detail/{routeAccountRecordMainId}")
+    @ResponseBody
+    public Result<List<DriverRouteDetailResponse>> routeAccountRecordDetail(@PathVariable("routeAccountRecordMainId") Long routeAccountId, AdminUserInfo adminUserInfo) {
+        return null;
+    }
+
+    /**
+     * 编辑司机在途明细
+     * @return
+     */
+    @PostMapping("/routeAccountRecord/detail/edit")
+    @ResponseBody
+    public Result<String> editRouteAccountRecord(@Validated @RequestBody DriverIntervalRouteAccountRecordEditorRequest request, AdminUserInfo adminUserInfo) {
+        return null;
+    }
+
+    /**
+     * 导出司机在途明细
+     * @return
+     */
+    @GetMapping("/routeAccountRecord/detail/export/{routeAccountRecordMainId}")
+    @ResponseBody
+    public Result<String> exportRouteAccountRecordDetail(@PathVariable("routeAccountRecordMainId") Long routeAccountId, AdminUserInfo adminUserInfo) {
+        return null;
+    }
+
+
+}

+ 39 - 0
warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/controller/DriverRouteDetailController.java

@@ -0,0 +1,39 @@
+package com.yr.warehouse.admin.web.driver.controller;
+
+import com.yr.bluecat.common.entity.response.PageResult;
+import com.yr.bluecat.common.entity.response.Result;
+import com.yr.prism.auth.core.user.AdminUserInfo;
+import com.yr.warehouse.admin.web.common.BaseController;
+import com.yr.warehouse.admin.web.driver.request.DriverRouteDetailPageRequest;
+import com.yr.warehouse.admin.web.driver.response.DriverRouteDetailResponse;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 司机在途明细
+ */
+@RestController
+@RequestMapping("/driver/route")
+public class DriverRouteDetailController extends BaseController {
+
+    /**
+     * 导出司机在途明细
+     * @return
+     */
+    @GetMapping("/export/{goodsLossRecordId}")
+    @ResponseBody
+    public Result<String> export(@PathVariable("goodsLossRecordId") Long goodsLossRecordId) {
+        return null;
+    }
+
+    /**
+     * 分页查询司机在途明细
+     * @return
+     */
+    @PostMapping("/page")
+    @ResponseBody
+    public PageResult<DriverRouteDetailResponse> page(@Validated @RequestBody DriverRouteDetailPageRequest request, AdminUserInfo adminUserInfo) {
+        return null;
+    }
+
+}

+ 18 - 0
warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/mapstruct/DriverDailyCargoDamageMapStruct.java

@@ -0,0 +1,18 @@
+package com.yr.warehouse.admin.web.driver.mapstruct;
+
+import com.yr.warehouse.admin.driver.bo.DriverDailyCargoDamageExportBo;
+import com.yr.warehouse.admin.driver.bo.DriverDailyCargoDamagePageBo;
+import com.yr.warehouse.admin.web.driver.request.DriverDailyCargoDamageExportRequest;
+import com.yr.warehouse.admin.web.driver.request.DriverDailyCargoDamagePageRequest;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+@Mapper
+public interface DriverDailyCargoDamageMapStruct {
+
+    DriverDailyCargoDamageMapStruct MAPSTRUCT = Mappers.getMapper(DriverDailyCargoDamageMapStruct.class);
+
+    DriverDailyCargoDamagePageBo pageRequestToBo(DriverDailyCargoDamagePageRequest request);
+
+    DriverDailyCargoDamageExportBo exportRequestToBo(DriverDailyCargoDamageExportRequest request);
+}

+ 26 - 0
warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/mapstruct/DriverIntervalCargoDamageMapStruct.java

@@ -0,0 +1,26 @@
+package com.yr.warehouse.admin.web.driver.mapstruct;
+
+import com.yr.warehouse.admin.driver.bo.DriverIntervalCargoDamageDetailExportBo;
+import com.yr.warehouse.admin.driver.bo.DriverIntervalCargoDamageDetailPageBo;
+import com.yr.warehouse.admin.driver.bo.DriverIntervalCargoDamageGeneratorBo;
+import com.yr.warehouse.admin.driver.bo.DriverIntervalCargoDamagePageBo;
+import com.yr.warehouse.admin.web.driver.request.DriverIntervalCargoDamageDetailExportRequest;
+import com.yr.warehouse.admin.web.driver.request.DriverIntervalCargoDamageDetailPageRequest;
+import com.yr.warehouse.admin.web.driver.request.DriverIntervalCargoDamageGeneratorRequest;
+import com.yr.warehouse.admin.web.driver.request.DriverIntervalCargoDamagePageRequest;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+@Mapper
+public interface DriverIntervalCargoDamageMapStruct {
+
+    DriverIntervalCargoDamageMapStruct MAPSTRUCT = Mappers.getMapper(DriverIntervalCargoDamageMapStruct.class);
+
+    DriverIntervalCargoDamageGeneratorBo generatorRequestToBo(DriverIntervalCargoDamageGeneratorRequest request);
+
+    DriverIntervalCargoDamagePageBo pageRequestToBo(DriverIntervalCargoDamagePageRequest request);
+
+    DriverIntervalCargoDamageDetailPageBo detailPageRequestToBo(DriverIntervalCargoDamageDetailPageRequest request);
+
+    DriverIntervalCargoDamageDetailExportBo detailExportRequestToBo(DriverIntervalCargoDamageDetailExportRequest request);
+}

+ 35 - 0
warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/request/DriverDailyCargoDamageExportRequest.java

@@ -0,0 +1,35 @@
+package com.yr.warehouse.admin.web.driver.request;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * 司机货损统计(日统计)请求参数
+ */
+@Data
+public class DriverDailyCargoDamageExportRequest implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 运营商id
+     */
+    private Long operatorId;
+
+    /**
+     * 区域员工名称
+     */
+    private String areaStaffName;
+
+    /**
+     * 统计日期
+     */
+    @NotNull(message = "统计日期不能为空")
+    private LocalDate statDate;
+
+}

+ 38 - 0
warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/request/DriverDailyCargoDamagePageRequest.java

@@ -0,0 +1,38 @@
+package com.yr.warehouse.admin.web.driver.request;
+
+import com.yr.bluecat.common.entity.request.PageRequest;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * 司机货损统计(日统计)请求参数
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class DriverDailyCargoDamagePageRequest extends PageRequest implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 运营商id
+     */
+    private Long operatorId;
+
+    /**
+     * 区域员工名称
+     */
+    private String areaStaffName;
+
+    /**
+     * 统计日期
+     */
+    @NotNull(message = "统计日期不能为空")
+    private LocalDate statDate;
+
+}

+ 29 - 0
warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/request/DriverIntervalCargoDamageDetailExportRequest.java

@@ -0,0 +1,29 @@
+package com.yr.warehouse.admin.web.driver.request;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 区间货损详情分页请求参数
+ */
+@Data
+public class DriverIntervalCargoDamageDetailExportRequest implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 货损统计id
+     */
+    @NotNull(message = "货损统计id不能为空")
+    private Long goodsLossMonthlyMainId;
+
+    /**
+     * 区域员工名称
+     */
+    private String areaStaffName;
+
+}

+ 32 - 0
warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/request/DriverIntervalCargoDamageDetailPageRequest.java

@@ -0,0 +1,32 @@
+package com.yr.warehouse.admin.web.driver.request;
+
+import com.yr.bluecat.common.entity.request.PageRequest;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 区间货损详情分页请求参数
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class DriverIntervalCargoDamageDetailPageRequest extends PageRequest implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 货损统计id
+     */
+    @NotNull(message = "货损统计id不能为空")
+    private Long goodsLossMonthlyMainId;
+
+    /**
+     * 区域员工名称
+     */
+    private String areaStaffName;
+
+}

+ 44 - 0
warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/request/DriverIntervalCargoDamageGeneratorRequest.java

@@ -0,0 +1,44 @@
+package com.yr.warehouse.admin.web.driver.request;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 生成货损统计(区间统计)请求参数
+ */
+@Data
+public class DriverIntervalCargoDamageGeneratorRequest implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 运营商id
+     */
+    @NotNull(message = "请选择运营商")
+    private Long operatorId;
+
+    /**
+     * 区间开始时间
+     */
+    @NotNull(message = "请选择区间开始时间")
+    private LocalDateTime intervalStartTime;
+
+    /**
+     * 区间结束时间
+     */
+    @NotNull(message = "请选择区间结束时间")
+    private LocalDateTime intervalEndTime;
+
+    /**
+     * 区域员工id列表
+     */
+    private List<Long> areaStaffIds;
+
+}

+ 44 - 0
warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/request/DriverIntervalCargoDamagePageRequest.java

@@ -0,0 +1,44 @@
+package com.yr.warehouse.admin.web.driver.request;
+
+import com.yr.bluecat.common.entity.request.PageRequest;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 分页查询货损统计(区间统计)请求参数
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class DriverIntervalCargoDamagePageRequest extends PageRequest implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 运营商id
+     */
+    @NotNull(message = "请选择运营商")
+    private Long operatorId;
+
+    /**
+     * 区域员工名称
+     */
+    private String areaStaffName;
+
+    /**
+     * 创建时间-开始
+     */
+    private LocalDateTime createBeginTime;
+
+    /**
+     * 创建时间-结束
+     */
+    private LocalDateTime createEndTime;
+
+}

+ 45 - 0
warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/request/DriverIntervalRouteAccountRecordCreateRequest.java

@@ -0,0 +1,45 @@
+package com.yr.warehouse.admin.web.driver.request;
+
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * 司机在途核算记录创建请求参数
+ */
+@Data
+public class DriverIntervalRouteAccountRecordCreateRequest implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 区域员工id
+     */
+    @NotNull(message = "区域员工id不能为空")
+    private Long areaStaffId;
+
+    /**
+     * 仓库id
+     */
+    @NotNull(message = "仓库id不能为空")
+    private Long warehouseId;
+
+    /**
+     * 统计日期
+     */
+    @NotNull(message = "统计日期不能为空")
+    private LocalDate statDate;
+
+    /**
+     * 商品列表
+     */
+    @NotEmpty(message = "商品列表不能为空")
+    private List<DriverIntervalRouteAccountRecordDetailCreateRequest> details;
+
+}

+ 30 - 0
warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/request/DriverIntervalRouteAccountRecordDetailCreateRequest.java

@@ -0,0 +1,30 @@
+package com.yr.warehouse.admin.web.driver.request;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 创建司机在途账户记录详情参数
+ */
+@Data
+public class DriverIntervalRouteAccountRecordDetailCreateRequest implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 商品id
+     */
+    @NotNull(message = "商品id不能为空")
+    private Integer goodsId;
+
+    /**
+     * 库存数
+     */
+    @NotNull(message = "库存数不能为空")
+    private Long stockNum;
+
+}

+ 31 - 0
warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/request/DriverIntervalRouteAccountRecordEditorRequest.java

@@ -0,0 +1,31 @@
+package com.yr.warehouse.admin.web.driver.request;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 司机在途核算记录编辑请求参数
+ */
+@Data
+public class DriverIntervalRouteAccountRecordEditorRequest implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 司机在途核算记录id
+     */
+    @NotNull(message = "司机在途核算记录id不能为空")
+    private Long routeAccountRecordMainId;
+
+    /**
+     * 货损记录id
+     */
+    @NotNull(message = "货损记录id不能为空")
+    private List<DriverIntervalRouteAccountRecordDetailCreateRequest> details;
+
+}

Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff