[update] 权限逻辑整改删除原基础bo, 司机在途库存编辑异常问题修复

pom.xml

@@ -29,7 +29,7 @@
         <java.version>17</java.version>
         <springboot.version>3.1.5</springboot.version>
         <mapstruct.version>1.4.2.Final</mapstruct.version>
-        <bluecat.common.version>1.1.0-SNAPSHOT</bluecat.common.version>
+        <bluecat.common.version>1.1.2-SNAPSHOT</bluecat.common.version>
         <prism-auth-core.version>1.9.0-SNAPSHOT</prism-auth-core.version>
         <prism-auth-support.version>1.9.0-SNAPSHOT</prism-auth-support.version>
         <yr-supply-chain-api.version>1.2.1-SNAPSHOT</yr-supply-chain-api.version>
@@ -210,7 +210,7 @@
             <properties>
                 <!-- 开发环境固定1.0.2 -->
                 <revision>1.0.0-SNAPSHOT</revision>
-                <bluecat.common.version>1.1.0-SNAPSHOT</bluecat.common.version>
+                <bluecat.common.version>1.1.2-SNAPSHOT</bluecat.common.version>
                 <prism-auth-support.version>1.9.0-SNAPSHOT</prism-auth-support.version>
                 <prism-auth-core.version>1.9.0-SNAPSHOT</prism-auth-core.version>
                 <yr-supply-chain-api.version>1.2.1-SNAPSHOT</yr-supply-chain-api.version>
@@ -229,7 +229,7 @@
             <id>test</id>
             <properties>
                 <revision>1.0.0-SNAPSHOT</revision>
-                <bluecat.common.version>1.1.0-SNAPSHOT</bluecat.common.version>
+                <bluecat.common.version>1.1.2-SNAPSHOT</bluecat.common.version>
                 <prism-auth-support.version>1.9.0-SNAPSHOT</prism-auth-support.version>
                 <prism-auth-core.version>1.9.0-SNAPSHOT</prism-auth-core.version>
                 <yr-supply-chain-api.version>1.2.1-SNAPSHOT</yr-supply-chain-api.version>
@@ -247,7 +247,7 @@
             <id>prod</id>
             <properties>
                 <revision>1.0.0-RELEASE</revision>
-                <bluecat.common.version>1.1.0-RELEASE</bluecat.common.version>
+                <bluecat.common.version>1.1.2-RELEASE</bluecat.common.version>
                 <prism-auth-support.version>1.9.0-RELEASE</prism-auth-support.version>
                 <prism-auth-core.version>1.9.0-RELEASE</prism-auth-core.version>
                 <yr-supply-chain-api.version>1.2.1-RELEASE</yr-supply-chain-api.version>

warehouse-admin-data/pom.xml

@@ -15,6 +15,12 @@
 
 
     <dependencies>
+
+        <dependency>
+            <groupId>com.yr.bluecat.common</groupId>
+            <artifactId>bluecat-common-entity</artifactId>
+        </dependency>
+
         <!-- mybatisplus -->
         <dependency>
             <groupId>com.baomidou</groupId>

warehouse-admin-data/src/main/java/com/yr/warehouse/admin/common/bo/AdminUserDeviceBo.java

@@ -1,30 +0,0 @@
-/**
- * 湖南有人网络有限公司
- **/
-package com.yr.warehouse.admin.common.bo;
-
-import lombok.Data;
-
-/**
- * @ClassName AdminUserDevice
- * @Description: 类描述
- * @Author: pete
- * @CreateDate: 2024/4/23 16:19
- * @Version: 1.0
- */
-@Data
-public class AdminUserDeviceBo {
-
-    /**
-     * 设备id
-     */
-    private Long deviceId;
-    /**
-     * 设备编号
-     */
-    private String deviceNumber;
-    /**
-     * 设备名称
-     */
-    private String deviceName;
-}

warehouse-admin-data/src/main/java/com/yr/warehouse/admin/common/bo/AdminUserRoleBo.java

@@ -1,34 +0,0 @@
-/**
- * 湖南有人网络有限公司
- **/
-package com.yr.warehouse.admin.common.bo;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 用户资源信息
- *
- * @ClassName SourceContex
- * @Description: 类描述
- * @Author: pete
- * @CreateDate: 2024/4/22 19:18
- * @Version: 1.0
- */
-@Data
-public class AdminUserRoleBo implements Serializable {
-    /**
-     * 角色id
-     */
-    private Long roleId;
-    /**
-     * 角色编码
-     */
-    private String roleCode;
-    /**
-     * 角色名称
-     */
-    private String roleName;
-
-}

warehouse-admin-data/src/main/java/com/yr/warehouse/admin/common/bo/BaseBo.java

@@ -1,92 +0,0 @@
-/**
- * 湖南有人网络有限公司
- **/
-package com.yr.warehouse.admin.common.bo;
-
-import lombok.Data;
-
-import java.util.List;
-import java.util.Objects;
-
-/**
- * @ClassName BaseBo
- * @Description: 类描述
- * @Author: pete
- * @CreateDate: 2024/4/25 10:54
- * @Version: 1.0
- */
-@Data
-public class BaseBo {
-    /**
-     * 用户uid
-     */
-    private Long uid;
-    /**
-     * 用户名称
-     */
-    private String username;
-    /**
-     * 运营商id
-     */
-    private Long adminOperatorId;
-    /**
-     * 运营商id链
-     */
-    private String adminOperatorChain;
-    /**
-     * 部门id
-     */
-    private Long adminDepartmentId;
-    /**
-     * 部门链
-     */
-    private String adminDepartmentChain;
-    /**
-     * 用户角色标识
-     */
-    private List<String> roleCodeSet;
-    /**
-     * 用户角色
-     */
-    private List<AdminUserRoleBo> roleList;
-    /**
-     * 当前资源限制数据等级：ONESELF：仅自己|DEPARTMENT_SELF：本部门|DEPARTMENT：部门及以下|ALL：所有
-     */
-    private String limitLevel;
-    /**
-     * 当前登录用户绑定设备
-     */
-    private List<AdminUserDeviceBo> userDeviceList;
-    /**
-     * 用户域：ADMIN：管理员|EMPLOYEE：员工|CUSTOMER：客户
-     */
-    private String userDomain;
-
-    public boolean authChildren() {
-        return Objects.equals(this.limitLevel, "DEPARTMENT") || Objects.equals(this.limitLevel, "ALL");
-    }
-
-    public boolean isAdminUser() {
-        return Objects.equals(this.userDomain, "ADMIN");
-    }
-
-    public boolean isSuperUser() {
-        return adminOperatorChain != null && !adminOperatorChain.contains("-");
-    }
-
-    public Long getCreateUid() {
-        return uid;
-    }
-
-    public String getCreateName() {
-        return username;
-    }
-
-    public Long getModifyUid() {
-        return uid;
-    }
-
-    public String getModifyName() {
-        return username;
-    }
-}

warehouse-admin-data/src/main/java/com/yr/warehouse/admin/common/bo/BaseIdBo.java

@@ -1,5 +1,6 @@
 package com.yr.warehouse.admin.common.bo;
 
+import com.yr.bluecat.common.entity.bo.BaseBo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

warehouse-admin-data/src/main/java/com/yr/warehouse/admin/common/bo/BasePageBo.java

@@ -1,25 +0,0 @@
-/**
- * 湖南有人网络有限公司
- **/
-package com.yr.warehouse.admin.common.bo;
-
-import lombok.Data;
-
-/**
- * @ClassName BaseBo
- * @Description: 类描述
- * @Author: pete
- * @CreateDate: 2024/4/25 10:54
- * @Version: 1.0
- */
-@Data
-public class BasePageBo extends BaseBo {
-    /**
-     * 当前页
-     */
-    private Integer pageNum;
-    /**
-     * 每页显示条数
-     */
-    private Integer pageSize;
-}

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

@@ -1,6 +1,6 @@
 package com.yr.warehouse.admin.driver.bo;
 
-import com.yr.warehouse.admin.common.bo.BaseBo;
+import com.yr.bluecat.common.entity.bo.BaseBo;
 import com.yr.warehouse.admin.driver.face.AreaStaffNameSearchFace;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

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

@@ -1,6 +1,6 @@
 package com.yr.warehouse.admin.driver.bo;
 
-import com.yr.warehouse.admin.common.bo.BasePageBo;
+import com.yr.bluecat.common.entity.bo.BasePageBo;
 import com.yr.warehouse.admin.driver.face.AreaStaffNameSearchFace;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

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

@@ -1,6 +1,6 @@
 package com.yr.warehouse.admin.driver.bo;
 
-import com.yr.warehouse.admin.common.bo.BaseBo;
+import com.yr.bluecat.common.entity.bo.BaseBo;
 import com.yr.warehouse.admin.driver.face.DriverIntervalCargoDamageDetailSearchFace;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

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

@@ -1,6 +1,6 @@
 package com.yr.warehouse.admin.driver.bo;
 
-import com.yr.warehouse.admin.common.bo.BasePageBo;
+import com.yr.bluecat.common.entity.bo.BasePageBo;
 import com.yr.warehouse.admin.driver.face.DriverIntervalCargoDamageDetailSearchFace;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

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

@@ -1,6 +1,6 @@
 package com.yr.warehouse.admin.driver.bo;
 
-import com.yr.warehouse.admin.common.bo.BaseBo;
+import com.yr.bluecat.common.entity.bo.BaseBo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

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

@@ -1,6 +1,6 @@
 package com.yr.warehouse.admin.driver.bo;
 
-import com.yr.warehouse.admin.common.bo.BasePageBo;
+import com.yr.bluecat.common.entity.bo.BasePageBo;
 import com.yr.warehouse.admin.driver.face.AreaStaffNameSearchFace;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/bo/DriverIntervalRouteAccountRecordCreateBo.java

@@ -1,6 +1,6 @@
 package com.yr.warehouse.admin.driver.bo;
 
-import com.yr.warehouse.admin.common.bo.BaseBo;
+import com.yr.bluecat.common.entity.bo.BaseBo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/bo/DriverIntervalRouteAccountRecordEditorBo.java

@@ -1,6 +1,6 @@
 package com.yr.warehouse.admin.driver.bo;
 
-import com.yr.warehouse.admin.common.bo.BaseBo;
+import com.yr.bluecat.common.entity.bo.BaseBo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/bo/DriverRouteAccountRecordPageBo.java

@@ -1,6 +1,6 @@
 package com.yr.warehouse.admin.driver.bo;
 
-import com.yr.warehouse.admin.common.bo.BasePageBo;
+import com.yr.bluecat.common.entity.bo.BasePageBo;
 import com.yr.warehouse.admin.driver.face.AreaStaffNameSearchFace;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -36,6 +36,11 @@ public class DriverRouteAccountRecordPageBo extends BasePageBo implements AreaSt
     private List<Long> areaStaffIds;
 
     /**
+     * 只查询当前司机在途
+     */
+    private Boolean onlySearchCurrentDriver;
+
+    /**
      * 统计开始时间
      */
     private LocalDate beginStatDate;

warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/bo/DriverRouteDetailPageBo.java

@@ -1,6 +1,6 @@
 package com.yr.warehouse.admin.driver.bo;
 
-import com.yr.warehouse.admin.common.bo.BasePageBo;
+import com.yr.bluecat.common.entity.bo.BasePageBo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/data/DriverDeviceStockSnapshot.java

@@ -4,11 +4,12 @@ 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;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 司机设备库存快照

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

@@ -4,11 +4,12 @@ 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 lombok.Getter;
+import lombok.Setter;
+
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import lombok.Getter;
-import lombok.Setter;
 
 /**
  * <p>

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

@@ -4,11 +4,12 @@ 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;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 司机货损区间统计明细表

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

@@ -4,11 +4,12 @@ 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;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 司机货损区间统计主表

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

@@ -4,11 +4,12 @@ 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 lombok.Getter;
+import lombok.Setter;
+
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import lombok.Getter;
-import lombok.Setter;
 
 /**
  * <p>

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

@@ -4,11 +4,12 @@ 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;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 司机在途核算记录子表

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

@@ -4,11 +4,12 @@ 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 lombok.Getter;
+import lombok.Setter;
+
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import lombok.Getter;
-import lombok.Setter;
 
 /**
  * <p>

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

@@ -4,11 +4,12 @@ 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 lombok.Getter;
+import lombok.Setter;
+
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import lombok.Getter;
-import lombok.Setter;
 
 /**
  * <p>

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

@@ -4,11 +4,12 @@ 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;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 设备货损区间统计明细表

warehouse-admin-data/src/main/java/com/yr/warehouse/admin/driver/mapper/DriverDeviceStockSnapshotMapper.java

@@ -1,7 +1,7 @@
 package com.yr.warehouse.admin.driver.mapper;
 
-import com.yr.warehouse.admin.driver.data.DriverDeviceStockSnapshot;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yr.warehouse.admin.driver.data.DriverDeviceStockSnapshot;
 import com.yr.warehouse.admin.replenish.vo.DriverGoodsOrderNumVo;
 import org.apache.ibatis.annotations.Param;
 

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

@@ -1,8 +1,8 @@
 package com.yr.warehouse.admin.driver.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yr.warehouse.admin.driver.bo.DriverIntervalCargoDamageGeneratorBo;
 import com.yr.warehouse.admin.driver.data.DriverEquipmentLossRecord;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.time.LocalDate;

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

@@ -1,9 +1,9 @@
 package com.yr.warehouse.admin.driver.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yr.warehouse.admin.driver.bo.DriverIntervalCargoDamageDetailPageBo;
 import com.yr.warehouse.admin.driver.data.DriverGoodsLossIntervalDetail;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yr.warehouse.admin.driver.vo.DriverIntervalCargoDamageDetailVo;
 import org.apache.ibatis.annotations.Param;
 

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

@@ -1,10 +1,10 @@
 package com.yr.warehouse.admin.driver.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yr.warehouse.admin.driver.bo.DriverDailyCargoDamagePageBo;
 import com.yr.warehouse.admin.driver.bo.DriverIntervalCargoDamageGeneratorBo;
 import com.yr.warehouse.admin.driver.data.DriverGoodsLossRecord;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yr.warehouse.admin.driver.vo.DriverGoodsLossRecordVo;
 import org.apache.ibatis.annotations.Param;
 

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

@@ -1,10 +1,10 @@
 package com.yr.warehouse.admin.driver.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yr.warehouse.admin.common.bo.BaseIdBo;
 import com.yr.warehouse.admin.driver.bo.DriverIntervalRouteAccountRecordCreateBo;
 import com.yr.warehouse.admin.driver.bo.DriverIntervalRouteAccountRecordEditorBo;
 import com.yr.warehouse.admin.driver.data.DriverOnRouteAccountRecordDetail;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yr.warehouse.admin.driver.vo.DriverRouteAccountRecordDetailVo;
 import org.apache.ibatis.annotations.Param;
 

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

@@ -2,7 +2,7 @@ package com.yr.warehouse.admin.driver.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yr.warehouse.admin.common.bo.BaseBo;
+import com.yr.bluecat.common.entity.bo.BaseBo;
 import com.yr.warehouse.admin.common.bo.BaseIdBo;
 import com.yr.warehouse.admin.driver.bo.DriverIntervalRouteAccountRecordCreateBo;
 import com.yr.warehouse.admin.driver.bo.DriverIntervalRouteAccountRecordEditorBo;

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

@@ -1,7 +1,7 @@
 package com.yr.warehouse.admin.driver.mapper;
 
-import com.yr.warehouse.admin.driver.data.EquipmentLossIntervalDetail;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yr.warehouse.admin.driver.data.EquipmentLossIntervalDetail;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

warehouse-admin-data/src/main/java/com/yr/warehouse/admin/replenish/data/AggregationPickDetail.java

@@ -4,11 +4,12 @@ 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;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 拣货单汇总单子表

warehouse-admin-data/src/main/java/com/yr/warehouse/admin/replenish/data/AggregationPickInfo.java

@@ -4,11 +4,12 @@ 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 lombok.Getter;
+import lombok.Setter;
+
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import lombok.Getter;
-import lombok.Setter;
 
 /**
  * <p>

warehouse-admin-data/src/main/java/com/yr/warehouse/admin/replenish/data/AggregationPickLink.java

@@ -4,11 +4,12 @@ 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;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 汇总单拣货单关联表

warehouse-admin-data/src/main/java/com/yr/warehouse/admin/replenish/data/PickingOrderDetail.java

@@ -4,11 +4,12 @@ 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;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 拣货单详情表

warehouse-admin-data/src/main/java/com/yr/warehouse/admin/replenish/data/PickingOrderInfo.java

@@ -4,11 +4,12 @@ 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;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 拣货单主表

warehouse-admin-data/src/main/java/com/yr/warehouse/admin/replenish/data/ReplenishOrderDetail.java

@@ -4,11 +4,12 @@ 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;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 补货单详情表

warehouse-admin-data/src/main/java/com/yr/warehouse/admin/replenish/data/ReplenishOrderInfo.java

@@ -4,11 +4,12 @@ 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;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 补货单主表

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

@@ -1,7 +1,7 @@
 package com.yr.warehouse.admin.replenish.mapper;
 
-import com.yr.warehouse.admin.replenish.data.AggregationPickDetail;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yr.warehouse.admin.replenish.data.AggregationPickDetail;
 
 /**
  * <p>

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

@@ -1,7 +1,7 @@
 package com.yr.warehouse.admin.replenish.mapper;
 
-import com.yr.warehouse.admin.replenish.data.AggregationPickInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yr.warehouse.admin.replenish.data.AggregationPickInfo;
 
 /**
  * <p>

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

@@ -1,7 +1,7 @@
 package com.yr.warehouse.admin.replenish.mapper;
 
-import com.yr.warehouse.admin.replenish.data.AggregationPickLink;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yr.warehouse.admin.replenish.data.AggregationPickLink;
 
 /**
  * <p>

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

@@ -1,7 +1,7 @@
 package com.yr.warehouse.admin.replenish.mapper;
 
-import com.yr.warehouse.admin.replenish.data.PickingOrderDetail;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yr.warehouse.admin.replenish.data.PickingOrderDetail;
 
 /**
  * <p>

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

@@ -1,7 +1,7 @@
 package com.yr.warehouse.admin.replenish.mapper;
 
-import com.yr.warehouse.admin.replenish.data.PickingOrderInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yr.warehouse.admin.replenish.data.PickingOrderInfo;
 
 /**
  * <p>

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

@@ -1,7 +1,7 @@
 package com.yr.warehouse.admin.replenish.mapper;
 
-import com.yr.warehouse.admin.replenish.data.ReplenishOrderDetail;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yr.warehouse.admin.replenish.data.ReplenishOrderDetail;
 
 /**
  * <p>

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

@@ -1,7 +1,7 @@
 package com.yr.warehouse.admin.replenish.mapper;
 
-import com.yr.warehouse.admin.replenish.data.ReplenishOrderInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yr.warehouse.admin.replenish.data.ReplenishOrderInfo;
 
 /**
  * <p>

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

@@ -40,7 +40,7 @@
     </insert>
     <delete id="deleteByRouteAccountRecordMainId" parameterType="java.lang.Long">
         delete from yr_driver_on_route_account_record_detail
-        where routeAccountRecordMainId = #{id}
+        where routeAccountRecordMainId = #{routeAccountRecordMainId}
     </delete>
     <select id="searchByRouteAccountRecordMainId"
             resultType="com.yr.warehouse.admin.driver.vo.DriverRouteAccountRecordDetailVo"

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

@@ -72,7 +72,13 @@
         dorarm.createTime as createTime
         from yr_driver_on_route_account_record_main as dorarm
         left join yr_warehouse_info as wi on dorarm.warehouseId = wi.id
+        <if test="bo.onlySearchCurrentDriver != null and bo.onlySearchCurrentDriver == true">
+            left join yr_operators_area_staff as oas on oas.id = dorarm.areaStaffId
+        </if>
         where dorarm.isDelete = 'NORMAL'
+        <if test="bo.onlySearchCurrentDriver != null and bo.onlySearchCurrentDriver == true">
+            and oas.accountId = #{bo.uid}
+        </if>
         <if test="bo.operatorId != null">
             and dorarm.operatorId = #{bo.operatorId}
         </if>

warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/areastaff/AreaStaffService.java

@@ -3,7 +3,6 @@ package com.yr.warehouse.admin.service.areastaff;
 import com.supplychain.api.response.areastaff.AreaStaffResponse;
 import com.yr.warehouse.admin.areastaff.fase.AreaStaffIdFace;
 import com.yr.warehouse.admin.driver.face.AreaStaffNameSearchFace;
-import org.apache.poi.ss.formula.functions.T;
 
 import java.util.List;
 import java.util.Map;

warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/areastaff/impl/AreaStaffServiceImpl.java

@@ -1,12 +1,11 @@
 package com.yr.warehouse.admin.service.areastaff.impl;
 
 import com.supplychain.api.response.areastaff.AreaStaffResponse;
-import com.yr.bluecat.common.entity.exception.MessageException;
 import com.yr.bluecat.common.entity.utils.StringUtils;
+import com.yr.warehouse.admin.areastaff.fase.AreaStaffIdFace;
 import com.yr.warehouse.admin.component.areastaff.AreaStaffComponent;
 import com.yr.warehouse.admin.driver.face.AreaStaffNameSearchFace;
 import com.yr.warehouse.admin.service.areastaff.AreaStaffService;
-import com.yr.warehouse.admin.areastaff.fase.AreaStaffIdFace;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 

warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/driver/DriverDeviceStockSnapshotService.java

@@ -1,7 +1,7 @@
 package com.yr.warehouse.admin.service.driver;
 
-import com.yr.warehouse.admin.driver.data.DriverDeviceStockSnapshot;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yr.warehouse.admin.driver.data.DriverDeviceStockSnapshot;
 
 /**
  * <p>

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

@@ -1,7 +1,7 @@
 package com.yr.warehouse.admin.service.driver;
 
-import com.yr.warehouse.admin.driver.data.DriverEquipmentLossRecord;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yr.warehouse.admin.driver.data.DriverEquipmentLossRecord;
 
 /**
  * <p>

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

@@ -1,9 +1,9 @@
 package com.yr.warehouse.admin.service.driver;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.yr.warehouse.admin.driver.bo.DriverIntervalCargoDamageDetailPageBo;
 import com.yr.warehouse.admin.driver.data.DriverGoodsLossIntervalDetail;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.yr.warehouse.admin.driver.vo.DriverIntervalCargoDamageDetailVo;
 
 /**

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

@@ -1,10 +1,10 @@
 package com.yr.warehouse.admin.service.driver;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yr.warehouse.admin.driver.vo.DriverIntervalCargoDamageVo;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.yr.warehouse.admin.driver.bo.DriverIntervalCargoDamagePageBo;
 import com.yr.warehouse.admin.driver.data.DriverGoodsLossIntervalMain;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.yr.warehouse.admin.driver.vo.DriverIntervalCargoDamageVo;
 
 import java.time.LocalDateTime;
 

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

@@ -1,10 +1,10 @@
 package com.yr.warehouse.admin.service.driver;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.yr.warehouse.admin.driver.bo.DriverDailyCargoDamageExportBo;
 import com.yr.warehouse.admin.driver.bo.DriverDailyCargoDamagePageBo;
 import com.yr.warehouse.admin.driver.data.DriverGoodsLossRecord;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.yr.warehouse.admin.driver.vo.DriverGoodsLossRecordVo;
 
 import java.time.LocalDate;

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

@@ -1,8 +1,8 @@
 package com.yr.warehouse.admin.service.driver;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.yr.warehouse.admin.common.bo.BaseIdBo;
 import com.yr.warehouse.admin.driver.data.DriverOnRouteAccountRecordDetail;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.yr.warehouse.admin.driver.vo.DriverRouteAccountRecordDetailVo;
 
 import java.util.List;

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

@@ -1,9 +1,9 @@
 package com.yr.warehouse.admin.service.driver;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.yr.warehouse.admin.driver.bo.DriverRouteAccountRecordPageBo;
 import com.yr.warehouse.admin.driver.data.DriverOnRouteAccountRecordMain;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.yr.warehouse.admin.driver.vo.DriverRouteAccountRecordMainVo;
 
 /**

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

@@ -1,9 +1,9 @@
 package com.yr.warehouse.admin.service.driver;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.yr.warehouse.admin.driver.bo.DriverRouteDetailPageBo;
 import com.yr.warehouse.admin.driver.data.DriverOnRouteDetailLog;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.yr.warehouse.admin.driver.vo.DriverRouteDetailVo;
 
 /**

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

@@ -1,7 +1,7 @@
 package com.yr.warehouse.admin.service.driver;
 
-import com.yr.warehouse.admin.driver.data.EquipmentLossIntervalDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yr.warehouse.admin.driver.data.EquipmentLossIntervalDetail;
 
 /**
  * <p>

warehouse-admin-server/src/main/java/com/yr/warehouse/admin/service/driver/impl/DriverDeviceStockSnapshotServiceImpl.java

@@ -1,8 +1,8 @@
 package com.yr.warehouse.admin.service.driver.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yr.warehouse.admin.driver.data.DriverDeviceStockSnapshot;
 import com.yr.warehouse.admin.driver.mapper.DriverDeviceStockSnapshotMapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yr.warehouse.admin.service.driver.DriverDeviceStockSnapshotService;
 import org.springframework.stereotype.Service;
 

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

@@ -1,9 +1,9 @@
 package com.yr.warehouse.admin.service.driver.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 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;
 
 /**

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

@@ -1,12 +1,12 @@
 package com.yr.warehouse.admin.service.driver.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yr.warehouse.admin.driver.bo.DriverIntervalCargoDamageDetailPageBo;
 import com.yr.warehouse.admin.driver.data.DriverGoodsLossIntervalDetail;
 import com.yr.warehouse.admin.driver.mapper.DriverGoodsLossIntervalDetailMapper;
 import com.yr.warehouse.admin.driver.vo.DriverIntervalCargoDamageDetailVo;
 import com.yr.warehouse.admin.service.driver.DriverGoodsLossIntervalDetailService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

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

@@ -1,12 +1,12 @@
 package com.yr.warehouse.admin.service.driver.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yr.warehouse.admin.driver.vo.DriverIntervalCargoDamageVo;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yr.warehouse.admin.driver.bo.DriverIntervalCargoDamagePageBo;
 import com.yr.warehouse.admin.driver.data.DriverGoodsLossIntervalMain;
 import com.yr.warehouse.admin.driver.mapper.DriverGoodsLossIntervalMainMapper;
+import com.yr.warehouse.admin.driver.vo.DriverIntervalCargoDamageVo;
 import com.yr.warehouse.admin.service.driver.DriverGoodsLossIntervalMainService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;

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

@@ -2,10 +2,7 @@ package com.yr.warehouse.admin.service.driver.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.supplychain.api.response.areastaff.AreaStaffResponse;
 import com.yr.warehouse.admin.component.areastaff.AreaStaffComponent;
-import com.yr.warehouse.admin.component.auth.OperatorComponent;
-import com.yr.warehouse.admin.component.auth.vo.OrgOperatorVo;
 import com.yr.warehouse.admin.driver.bo.DriverDailyCargoDamageExportBo;
 import com.yr.warehouse.admin.driver.bo.DriverDailyCargoDamagePageBo;
 import com.yr.warehouse.admin.driver.data.DriverGoodsLossRecord;
@@ -21,8 +18,6 @@ import org.springframework.stereotype.Service;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * <p>

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

@@ -1,11 +1,11 @@
 package com.yr.warehouse.admin.service.driver.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yr.warehouse.admin.common.bo.BaseIdBo;
 import com.yr.warehouse.admin.driver.data.DriverOnRouteAccountRecordDetail;
 import com.yr.warehouse.admin.driver.mapper.DriverOnRouteAccountRecordDetailMapper;
 import com.yr.warehouse.admin.driver.vo.DriverRouteAccountRecordDetailVo;
 import com.yr.warehouse.admin.service.driver.DriverOnRouteAccountRecordDetailService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

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

@@ -1,12 +1,12 @@
 package com.yr.warehouse.admin.service.driver.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yr.warehouse.admin.driver.bo.DriverRouteAccountRecordPageBo;
 import com.yr.warehouse.admin.driver.data.DriverOnRouteAccountRecordMain;
 import com.yr.warehouse.admin.driver.mapper.DriverOnRouteAccountRecordMainMapper;
 import com.yr.warehouse.admin.driver.vo.DriverRouteAccountRecordMainVo;
 import com.yr.warehouse.admin.service.driver.DriverOnRouteAccountRecordMainService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

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

@@ -1,12 +1,12 @@
 package com.yr.warehouse.admin.service.driver.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yr.warehouse.admin.driver.bo.DriverRouteDetailPageBo;
 import com.yr.warehouse.admin.driver.data.DriverOnRouteDetailLog;
 import com.yr.warehouse.admin.driver.mapper.DriverOnRouteDetailLogMapper;
 import com.yr.warehouse.admin.driver.vo.DriverRouteDetailVo;
 import com.yr.warehouse.admin.service.driver.DriverOnRouteDetailLogService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

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

@@ -1,9 +1,9 @@
 package com.yr.warehouse.admin.service.driver.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 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;
 
 /**

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

@@ -1,7 +1,7 @@
 package com.yr.warehouse.admin.service.replenish;
 
-import com.yr.warehouse.admin.replenish.data.AggregationPickDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yr.warehouse.admin.replenish.data.AggregationPickDetail;
 
 /**
  * <p>

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

@@ -1,7 +1,7 @@
 package com.yr.warehouse.admin.service.replenish;
 
-import com.yr.warehouse.admin.replenish.data.AggregationPickInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yr.warehouse.admin.replenish.data.AggregationPickInfo;
 
 /**
  * <p>

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

@@ -1,7 +1,7 @@
 package com.yr.warehouse.admin.service.replenish;
 
-import com.yr.warehouse.admin.replenish.data.AggregationPickLink;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yr.warehouse.admin.replenish.data.AggregationPickLink;
 
 /**
  * <p>

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

@@ -1,7 +1,7 @@
 package com.yr.warehouse.admin.service.replenish;
 
-import com.yr.warehouse.admin.replenish.data.PickingOrderDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yr.warehouse.admin.replenish.data.PickingOrderDetail;
 
 /**
  * <p>

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

@@ -1,7 +1,7 @@
 package com.yr.warehouse.admin.service.replenish;
 
-import com.yr.warehouse.admin.replenish.data.PickingOrderInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yr.warehouse.admin.replenish.data.PickingOrderInfo;
 
 /**
  * <p>

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

@@ -1,7 +1,7 @@
 package com.yr.warehouse.admin.service.replenish;
 
-import com.yr.warehouse.admin.replenish.data.ReplenishOrderDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yr.warehouse.admin.replenish.data.ReplenishOrderDetail;
 
 /**
  * <p>

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

@@ -1,7 +1,7 @@
 package com.yr.warehouse.admin.service.replenish;
 
-import com.yr.warehouse.admin.replenish.data.ReplenishOrderInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yr.warehouse.admin.replenish.data.ReplenishOrderInfo;
 
 /**
  * <p>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/common/BaseController.java

@@ -1,10 +1,10 @@
 package com.yr.warehouse.admin.web.common;
 
+import com.yr.bluecat.common.entity.bo.BaseBo;
 import com.yr.bluecat.common.entity.exception.MessageException;
 import com.yr.prism.auth.core.enums.AuthCodeEnum;
 import com.yr.prism.auth.core.user.AdminUserInfo;
 import com.yr.prism.auth.core.user.AdminUserRole;
-import com.yr.warehouse.admin.common.bo.BaseBo;
 import com.yr.warehouse.admin.web.common.mapstruct.AdminUserInfoMapstruct;
 import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.util.CollectionUtils;

warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/common/BuildUserInfo.java

@@ -1,7 +1,7 @@
 package com.yr.warehouse.admin.web.common;
 
+import com.yr.bluecat.common.entity.bo.BaseBo;
 import com.yr.prism.auth.core.user.AdminUserInfo;
-import com.yr.warehouse.admin.common.bo.BaseBo;
 
 public interface BuildUserInfo {
 

warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/common/mapstruct/AdminUserInfoMapstruct.java

@@ -3,10 +3,10 @@
  **/
 package com.yr.warehouse.admin.web.common.mapstruct;
 
+import com.yr.bluecat.common.entity.bo.AdminUserDeviceBo;
+import com.yr.bluecat.common.entity.bo.AdminUserRoleBo;
 import com.yr.prism.auth.core.user.AdminUserDevice;
 import com.yr.prism.auth.core.user.AdminUserRole;
-import com.yr.warehouse.admin.common.bo.AdminUserDeviceBo;
-import com.yr.warehouse.admin.common.bo.AdminUserRoleBo;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 

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

@@ -1,13 +1,10 @@
 package com.yr.warehouse.admin.web.driver.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.supplychain.api.response.areastaff.AreaStaffResponse;
 import com.yr.bluecat.common.entity.response.PageResult;
 import com.yr.bluecat.common.entity.response.Result;
-import com.yr.bluecat.common.entity.utils.StringUtils;
 import com.yr.bluecat.common.utils.excel.ExportClient;
 import com.yr.prism.auth.core.user.AdminUserInfo;
-import com.yr.warehouse.admin.component.areastaff.AreaStaffComponent;
 import com.yr.warehouse.admin.driver.bo.DriverDailyCargoDamageExportBo;
 import com.yr.warehouse.admin.driver.bo.DriverDailyCargoDamagePageBo;
 import com.yr.warehouse.admin.driver.vo.DriverGoodsLossRecordVo;

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

@@ -14,7 +14,6 @@ import com.yr.warehouse.admin.component.auth.OperatorComponent;
 import com.yr.warehouse.admin.component.auth.vo.OrgOperatorVo;
 import com.yr.warehouse.admin.driver.bo.*;
 import com.yr.warehouse.admin.driver.data.DriverGoodsLossIntervalMain;
-import com.yr.warehouse.admin.driver.face.AreaStaffNameSearchFace;
 import com.yr.warehouse.admin.driver.face.DriverIntervalCargoDamageDetailSearchFace;
 import com.yr.warehouse.admin.driver.menu.DriverOnRouteAccountRecordStatusEnum;
 import com.yr.warehouse.admin.driver.vo.DriverIntervalCargoDamageDetailVo;

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

@@ -6,7 +6,6 @@ import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 

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

@@ -1,14 +1,12 @@
 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;
 
 /**
  * 分页查询货损统计(区间统计)请求参数

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

@@ -1,6 +1,5 @@
 package com.yr.warehouse.admin.web.driver.request;
 
-import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 

warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/request/DriverRouteAccountRecordExportRequest.java

@@ -1,7 +1,6 @@
 package com.yr.warehouse.admin.web.driver.request;
 
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
 import java.io.Serializable;

warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/request/DriverRouteAccountRecordPageRequest.java

@@ -29,6 +29,11 @@ public class DriverRouteAccountRecordPageRequest extends PageRequest implements
     private String areaStaffName;
 
     /**
+     * 只查询当前司机在途
+     */
+    private Boolean onlySearchCurrentDriver;
+
+    /**
      * 统计开始时间
      */
     private LocalDate beginStatDate;