[insert] 新增区间货损司机盈亏明细查询及导出

[insert] 新增区间货损司机未补货补货单列表查询及导出

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

@@ -0,0 +1,49 @@
+package com.yr.warehouse.admin.driver.bo;
+
+import com.yr.bluecat.common.entity.bo.BasePageBo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 司机区间货损盈亏记录分页查询参数
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class DriverIntervalCargoDamageGoodsLossStatProfitPageBo extends BasePageBo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 货损区间统计主表id（关联司机货损区间统计主表id）
+     */
+    private Long goodsLossMonthlyMainId;
+
+    /**
+     * 区域员工关系id
+     */
+    private Long areaStaffId;
+
+    /**
+     * 商品名称
+     */
+    private String goodsName;
+
+    /**
+     * 商品编码
+     */
+    private String goodsCode;
+
+    /**
+     * 品牌名称
+     */
+    private String brandName;
+
+    /**
+     * 分类名称
+     */
+    private String classifyName;
+}

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

@@ -0,0 +1,30 @@
+package com.yr.warehouse.admin.driver.bo;
+
+import com.yr.bluecat.common.entity.bo.BasePageBo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 司机在途区间货损记录未补货的补货单分页Bo
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class DriverIntervalCargoDamageUnReplenishOrderPageBo extends BasePageBo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 货损记录主表id
+     */
+    private Long goodsLossMonthlyMainId;
+
+    /**
+     * 区域员工id
+     */
+    private Long areaStaffId;
+
+}

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

@@ -1,7 +1,10 @@
 package com.yr.warehouse.admin.driver.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yr.warehouse.admin.driver.bo.DriverIntervalCargoDamageGoodsLossStatProfitPageBo;
 import com.yr.warehouse.admin.driver.data.DriverGoodsLossStatProfitLossDetail;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yr.warehouse.admin.driver.vo.DriverIntervalCargoDamageGoodsLossStatProfitPageVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -23,4 +26,13 @@ public interface DriverGoodsLossStatProfitLossDetailMapper extends BaseMapper<Dr
      * @param driverGoodsLossStatProfitLossDetails 批量插入数据
      */
     void insertBatch(@Param("goodsLossMonthlyMainId") Long goodsLossMonthlyMainId, @Param("driverGoodsLossStatProfitLossDetails") List<DriverGoodsLossStatProfitLossDetail> driverGoodsLossStatProfitLossDetails);
+
+    /**
+     * 货损区间统计详情分页查询
+     *
+     * @param page 分页参数
+     * @param bo   查询参数
+     * @return 货损区间统计详情分页数据
+     */
+    Page<DriverIntervalCargoDamageGoodsLossStatProfitPageVo> searchPage(@Param("page") Page<DriverGoodsLossStatProfitLossDetail> page, @Param("bo") DriverIntervalCargoDamageGoodsLossStatProfitPageBo bo);
 }

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

@@ -1,7 +1,10 @@
 package com.yr.warehouse.admin.driver.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yr.warehouse.admin.driver.bo.DriverIntervalCargoDamageUnReplenishOrderPageBo;
 import com.yr.warehouse.admin.driver.data.DriverGoodsLossStatUnReplenishSnapshot;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yr.warehouse.admin.driver.vo.DriverIntervalCargoDamageUnReplenishOrderPageVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.time.LocalDateTime;
@@ -33,4 +36,13 @@ public interface DriverGoodsLossStatUnReplenishSnapshotMapper extends BaseMapper
      * @return 未补货的补货单
      */
     List<DriverGoodsLossStatUnReplenishSnapshot> searchDriverGoodsLossStatUnReplenishSnapshot(@Param("areaStaffIds") List<Long> areaStaffIds, @Param("intervalStartTime") LocalDateTime intervalStartTime, @Param("intervalEndTime") LocalDateTime intervalEndTime);
+
+    /**
+     * 查询司机货损区间统计未补货的补货单快照
+     *
+     * @param page 分页参数
+     * @param bo 查询参数
+     * @return 司机货损区间统计未补货的补货单
+     */
+    Page<DriverIntervalCargoDamageUnReplenishOrderPageVo> searchPage(@Param("page") Page<DriverIntervalCargoDamageUnReplenishOrderPageVo> page, @Param("bo") DriverIntervalCargoDamageUnReplenishOrderPageBo bo);
 }

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

@@ -0,0 +1,77 @@
+package com.yr.warehouse.admin.driver.vo;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 司机区间货损记录盈亏明细分页结果vo
+ */
+@Data
+public class DriverIntervalCargoDamageGoodsLossStatProfitPageVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 司机区域货损盈亏记录id
+     */
+    private Long id;
+
+    /**
+     * 商品id
+     */
+    private Integer goodsId;
+
+    /**
+     * 商品名称
+     */
+    private String goodsName;
+
+    /**
+     * 商品编号
+     */
+    private String goodsCode;
+
+    /**
+     * 商品图片
+     */
+    private String goodsImg;
+
+    /**
+     * 商品分类-名称
+     */
+    private String classifyName;
+
+    /**
+     * 商品品牌-名称
+     */
+    private String brandName;
+
+    /**
+     * 商品规格
+     */
+    private String goodsSpec;
+
+    /**
+     * 在途库存数
+     */
+    private Long onRouteInventoryNum;
+
+    /**
+     * 未补货数
+     */
+    private Long unReplenishedNum;
+
+    /**
+     * 核算数
+     */
+    private Long verifiedNum;
+
+    /**
+     * 盈亏数
+     */
+    private Long profitLossNum;
+
+}

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

@@ -0,0 +1,95 @@
+package com.yr.warehouse.admin.driver.vo;
+
+import com.yr.warehouse.admin.areastaff.fase.AreaStaffIdFace;
+import com.yr.warehouse.admin.operator.face.OperatorNameFace;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 司机在途区间货损记录未补货的补货单分页Vo
+ */
+@Data
+public class DriverIntervalCargoDamageUnReplenishOrderPageVo implements Serializable, OperatorNameFace, AreaStaffIdFace {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 司机区域货损统计未补货补货单快照 id
+     */
+    private Long id;
+
+    /**
+     * 补货单单号
+     */
+    private String orderNumber;
+
+    /**
+     * 运营商id
+     */
+    private Long operatorId;
+
+    /**
+     * 运营商名称
+     */
+    private String operatorName;
+
+    /**
+     * 运营商链
+     */
+    private String operatorChain;
+
+    /**
+     * 运营商名称链
+     */
+    private String operatorChainName;
+
+    /**
+     * 设备编号
+     */
+    private String deviceNumber;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 设备型号名称
+     */
+    private String deviceModelName;
+
+    /**
+     * 补货单类型
+     */
+    private Integer replenishType;
+
+    /**
+     * 区域员工id
+     */
+    private Long areaStaffId;
+
+    /**
+     * 补货员名称
+     */
+    private String areaStaffName;
+
+    /**
+     * 区域名称链
+     */
+    private String areaChainName;
+
+    /**
+     * 未补货数
+     */
+    private Integer unReplenishedNum;
+
+    /**
+     * 补货单创建时间
+     */
+    private LocalDateTime createTime;
+
+}

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

@@ -29,5 +29,41 @@
             #{item.unReplenishedNum}, #{item.verifiedNum}, #{item.profitLossNum})
         </foreach>
     </insert>
+    <select id="searchPage"
+            resultType="com.yr.warehouse.admin.driver.vo.DriverIntervalCargoDamageGoodsLossStatProfitPageVo">
+        select dglspld.id as id,
+        dglspld.goodsId as goodsId,
+        pd.display_name as goodsName,
+        pd.code as goodsCode,
+        ypii.product_img_url as goodsImg,
+        bi.name as brandName,
+        ci.name as classifyName,
+        pd.unpacking_priority as goodsSpec,
+        dglspld.onRouteInventoryNum as onRouteInventoryNum,
+        dglspld.unReplenishedNum as unReplenishedNum,
+        dglspld.verifiedNum as verifiedNum,
+        dglspld.profitLossNum as profitLossNum
+        from yr_driver_goods_loss_stat_profit_loss_detail as dglspld
+        left join yr_product_detail as pd on pd.id = dglspld.goodsId
+        left join yr_classify_info as ci on pd.classify_id = ci.id
+        left join yr_brand_info as bi on pd.brand_id = bi.id
+        left join yr_product_img_info as ypii
+        on pd.id = ypii.product_spec_id and ypii.product_img_type = 'PRODUCT_MAIN_IMAGE'
+        where dglspld.goodsLossMonthlyMainId = #{bo.goodsLossMonthlyMainId}
+        and dglspld.areaStaffId = #{bo.areaStaffId}
+        <if test="bo.goodsName != null and bo.goodsName != ''">
+            and pd.display_name like concat('%', #{bo.goodsName}, '%')
+        </if>
+        <if test="bo.goodsCode != null and bo.goodsCode != ''">
+            and pd.code like concat('%', #{bo.goodsCode}, '%')
+        </if>
+        <if test="bo.brandName != null and bo.brandName != ''">
+            and bi.name like concat('%', #{bo.brandName}, '%')
+        </if>
+        <if test="bo.classifyName != null and bo.classifyName != ''">
+            and ci.name like concat('%', #{bo.classifyName}, '%')
+        </if>
+        order by dglspld.id desc
+    </select>
 
 </mapper>

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

@@ -47,5 +47,25 @@
         </if>
         group by roi.area_staff_id, roi.order_number
     </select>
+    <select id="searchPage" resultType="com.yr.warehouse.admin.driver.vo.DriverIntervalCargoDamageUnReplenishOrderPageVo">
+        select
+            dgslus.id as id,
+            dgslus.unReplenishOrderNumber as orderNumber,
+            roi.operator_id as operatorId,
+            roi.operator_chain as operatorChain,
+            od.deviceNumber as deviceNumber,
+            od.deviceName as deviceName,
+            od.deviceModel as deviceModelName,
+            roi.replenish_type as replenishType,
+            roi.area_staff_id as areaStaffId,
+            dgslus.unReplenishedNum as unReplenishedNum,
+            roi.create_time as createTime
+        from yr_driver_goods_loss_stat_un_replenish_snapshot as dgslus
+        left join yr_replenish_order_info as roi on dgslus.unReplenishOrderNumber = roi.order_number
+        left join yr_operators_device as od on roi.device_id = od.id
+        where goodsLossMonthlyMainId = #{bo.goodsLossMonthlyMainId}
+          and areaStaffId = #{bo.areaStaffId}
+
+    </select>
 
 </mapper>

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

@@ -1,7 +1,10 @@
 package com.yr.warehouse.admin.service.driver;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yr.warehouse.admin.driver.bo.DriverIntervalCargoDamageGoodsLossStatProfitPageBo;
 import com.yr.warehouse.admin.driver.data.DriverGoodsLossStatProfitLossDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yr.warehouse.admin.driver.vo.DriverIntervalCargoDamageGoodsLossStatProfitPageVo;
 
 /**
  * <p>
@@ -13,4 +16,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface DriverGoodsLossStatProfitLossDetailService extends IService<DriverGoodsLossStatProfitLossDetail> {
 
+    /**
+     * 搜索分页
+     *
+     * @param bo 查询条件
+     * @return 分页结果
+     */
+    Page<DriverIntervalCargoDamageGoodsLossStatProfitPageVo> searchPage(DriverIntervalCargoDamageGoodsLossStatProfitPageBo bo);
 }

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

@@ -1,7 +1,10 @@
 package com.yr.warehouse.admin.service.driver;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yr.warehouse.admin.driver.bo.DriverIntervalCargoDamageUnReplenishOrderPageBo;
 import com.yr.warehouse.admin.driver.data.DriverGoodsLossStatUnReplenishSnapshot;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yr.warehouse.admin.driver.vo.DriverIntervalCargoDamageUnReplenishOrderPageVo;
 
 /**
  * <p>
@@ -13,4 +16,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface DriverGoodsLossStatUnReplenishSnapshotService extends IService<DriverGoodsLossStatUnReplenishSnapshot> {
 
+    /**
+     * 搜索分页
+     *
+     * @param bo 查询条件
+     * @return 分页结果
+     */
+    Page<DriverIntervalCargoDamageUnReplenishOrderPageVo> searchPage(DriverIntervalCargoDamageUnReplenishOrderPageBo bo);
 }

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

@@ -1,8 +1,11 @@
 package com.yr.warehouse.admin.service.driver.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yr.warehouse.admin.driver.bo.DriverIntervalCargoDamageGoodsLossStatProfitPageBo;
 import com.yr.warehouse.admin.driver.data.DriverGoodsLossStatProfitLossDetail;
 import com.yr.warehouse.admin.driver.mapper.DriverGoodsLossStatProfitLossDetailMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yr.warehouse.admin.driver.vo.DriverIntervalCargoDamageGoodsLossStatProfitPageVo;
 import com.yr.warehouse.admin.service.driver.DriverGoodsLossStatProfitLossDetailService;
 import org.springframework.stereotype.Service;
 
@@ -17,4 +20,9 @@ import org.springframework.stereotype.Service;
 @Service
 public class DriverGoodsLossStatProfitLossDetailServiceImpl extends ServiceImpl<DriverGoodsLossStatProfitLossDetailMapper, DriverGoodsLossStatProfitLossDetail> implements DriverGoodsLossStatProfitLossDetailService {
 
+    @Override
+    public Page<DriverIntervalCargoDamageGoodsLossStatProfitPageVo> searchPage(DriverIntervalCargoDamageGoodsLossStatProfitPageBo bo) {
+        Page<DriverGoodsLossStatProfitLossDetail> page = new Page<>(bo.getPageNum(), bo.getPageSize());
+        return baseMapper.searchPage(page, bo);
+    }
 }

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

@@ -1,8 +1,11 @@
 package com.yr.warehouse.admin.service.driver.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yr.warehouse.admin.driver.bo.DriverIntervalCargoDamageUnReplenishOrderPageBo;
 import com.yr.warehouse.admin.driver.data.DriverGoodsLossStatUnReplenishSnapshot;
 import com.yr.warehouse.admin.driver.mapper.DriverGoodsLossStatUnReplenishSnapshotMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yr.warehouse.admin.driver.vo.DriverIntervalCargoDamageUnReplenishOrderPageVo;
 import com.yr.warehouse.admin.service.driver.DriverGoodsLossStatUnReplenishSnapshotService;
 import org.springframework.stereotype.Service;
 
@@ -17,4 +20,9 @@ import org.springframework.stereotype.Service;
 @Service
 public class DriverGoodsLossStatUnReplenishSnapshotServiceImpl extends ServiceImpl<DriverGoodsLossStatUnReplenishSnapshotMapper, DriverGoodsLossStatUnReplenishSnapshot> implements DriverGoodsLossStatUnReplenishSnapshotService {
 
+    @Override
+    public Page<DriverIntervalCargoDamageUnReplenishOrderPageVo> searchPage(DriverIntervalCargoDamageUnReplenishOrderPageBo bo) {
+        Page<DriverIntervalCargoDamageUnReplenishOrderPageVo> page = new Page<>(bo.getPageNum(), bo.getPageSize());
+        return baseMapper.searchPage(page, bo);
+    }
 }

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

@@ -16,22 +16,18 @@ import com.yr.warehouse.admin.driver.bo.*;
 import com.yr.warehouse.admin.driver.data.DriverGoodsLossIntervalMain;
 import com.yr.warehouse.admin.driver.face.DriverIntervalCargoDamageDetailSearchFace;
 import com.yr.warehouse.admin.driver.menu.DriverOnRouteAccountRecordStatusEnum;
-import com.yr.warehouse.admin.driver.vo.DriverIntervalCargoDamageDetailVo;
-import com.yr.warehouse.admin.driver.vo.DriverIntervalCargoDamageVo;
-import com.yr.warehouse.admin.driver.vo.DriverRouteAccountRecordDetailVo;
-import com.yr.warehouse.admin.driver.vo.DriverRouteAccountRecordMainVo;
+import com.yr.warehouse.admin.driver.vo.*;
 import com.yr.warehouse.admin.service.areastaff.AreaStaffService;
 import com.yr.warehouse.admin.service.driver.*;
+import com.yr.warehouse.admin.service.operator.OperatorBuildService;
 import com.yr.warehouse.admin.web.common.BaseController;
 import com.yr.warehouse.admin.web.driver.export.DriverIntervalCargoDamageDetailExport;
+import com.yr.warehouse.admin.web.driver.export.DriverIntervalCargoDamageUnReplenishOrderExport;
 import com.yr.warehouse.admin.web.driver.export.DriverRouteAccountRecordDetailExport;
 import com.yr.warehouse.admin.web.driver.export.DriverRouteAccountRecordMainExport;
 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.DriverIntervalCargoDamageDetailResponse;
-import com.yr.warehouse.admin.web.driver.response.DriverIntervalCargoDamageResponse;
-import com.yr.warehouse.admin.web.driver.response.DriverRouteAccountRecordDetailResponse;
-import com.yr.warehouse.admin.web.driver.response.DriverRouteAccountRecordMainResponse;
+import com.yr.warehouse.admin.web.driver.response.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -68,6 +64,12 @@ public class DriverIntervalCargoDamageController extends BaseController {
     private DriverOnRouteAccountRecordDetailService driverOnRouteAccountRecordDetailService;
 
     @Resource
+    private DriverGoodsLossStatUnReplenishSnapshotService driverGoodsLossStatUnReplenishSnapshotService;
+
+    @Resource
+    private DriverGoodsLossStatProfitLossDetailService driverGoodsLossStatProfitLossDetailService;
+
+    @Resource
     private AreaStaffComponent areaStaffComponent;
 
     @Resource
@@ -77,6 +79,9 @@ public class DriverIntervalCargoDamageController extends BaseController {
     private AreaStaffService areaStaffService;
 
     @Resource
+    private OperatorBuildService operatorBuildService;
+
+    @Resource
     private ExportClient exportClient;
 
     /**
@@ -354,5 +359,103 @@ public class DriverIntervalCargoDamageController extends BaseController {
         }
     }
 
+    /**
+     * 区间货损记录未补货的补货单列表
+     */
+    @PostMapping("/unReplenish/page")
+    @ResponseBody
+    public PageResult<DriverIntervalCargoDamageUnReplenishOrderPageResponse> unReplenishPage(@Validated @RequestBody DriverIntervalCargoDamageUnReplenishOrderPageRequest request, AdminUserInfo adminUserInfo) {
+        DriverIntervalCargoDamageUnReplenishOrderPageBo bo = DriverIntervalCargoDamageMapStruct.MAPSTRUCT.driverIntervalCargoDamageUnReplenishOrderPageRequestToBo(request);
+        buildUserInfo(bo, adminUserInfo);
+        Page<DriverIntervalCargoDamageUnReplenishOrderPageVo> page = driverGoodsLossStatUnReplenishSnapshotService.searchPage(bo);
+
+        PageResult<DriverIntervalCargoDamageUnReplenishOrderPageResponse> pageResult = PageResult.newPageResult(request.getPageNum(), request.getPageSize());
+
+        List<DriverIntervalCargoDamageUnReplenishOrderPageVo> driverIntervalCargoDamageUnReplenishOrderPageVos = page.getRecords();
+        if (null == driverIntervalCargoDamageUnReplenishOrderPageVos || driverIntervalCargoDamageUnReplenishOrderPageVos.isEmpty()) {
+            return pageResult.success(0, new ArrayList<>());
+        }
 
+        areaStaffService.buildAreaStaffName(driverIntervalCargoDamageUnReplenishOrderPageVos);
+        operatorBuildService.buildOperatorName(driverIntervalCargoDamageUnReplenishOrderPageVos);
+
+        List<DriverIntervalCargoDamageUnReplenishOrderPageResponse> driverIntervalCargoDamageUnReplenishOrderPageResponses = DriverIntervalCargoDamageMapStruct.MAPSTRUCT.driverIntervalCargoDamageUnReplenishOrderPageVoToResponse(driverIntervalCargoDamageUnReplenishOrderPageVos);
+        return pageResult.success(page.getTotal(), driverIntervalCargoDamageUnReplenishOrderPageResponses);
+    }
+
+    /**
+     * 区间货损记录未补货的补货单列表导出
+     */
+    @PostMapping("/unReplenish/export")
+    @ResponseBody
+    public Result<String> unReplenishExport(@Validated @RequestBody DriverIntervalCargoDamageUnReplenishOrderExportRequest request, AdminUserInfo adminUserInfo) {
+        DriverIntervalCargoDamageUnReplenishOrderPageBo bo = DriverIntervalCargoDamageMapStruct.MAPSTRUCT.driverIntervalCargoDamageUnReplenishOrderExportRequestToBo(request);
+        buildUserInfo(bo, adminUserInfo);
+        bo.setPageNum(1);
+        bo.setPageSize(1000);
+        List<DriverIntervalCargoDamageUnReplenishOrderPageVo> resultVos = new ArrayList<>();
+        while ( true) {
+            Page<DriverIntervalCargoDamageUnReplenishOrderPageVo> page = driverGoodsLossStatUnReplenishSnapshotService.searchPage(bo);
+            List<DriverIntervalCargoDamageUnReplenishOrderPageVo> driverIntervalCargoDamageUnReplenishOrderPageVos = page.getRecords();
+            if (null == driverIntervalCargoDamageUnReplenishOrderPageVos || driverIntervalCargoDamageUnReplenishOrderPageVos.isEmpty()) {
+                break;
+            }
+            resultVos.addAll(driverIntervalCargoDamageUnReplenishOrderPageVos);
+            bo.setPageNum(bo.getPageNum() + 1);
+        }
+        if (resultVos.isEmpty()) {
+            return Result.fail("没有可导出的数据");
+        }
+        areaStaffService.buildAreaStaffName(resultVos);
+        operatorBuildService.buildOperatorName(resultVos);
+        List<DriverIntervalCargoDamageUnReplenishOrderExport> exports = DriverIntervalCargoDamageMapStruct.MAPSTRUCT.driverIntervalCargoDamageUnReplenishOrderPageVoToExport(resultVos);
+
+        String uri = exportClient.export(exports, "export/driver/interval/unReplenish", "区间货损记录未补货的补货单列表" + System.currentTimeMillis());
+        return Result.success(uri);
+    }
+
+    /**
+     * 区间货损盈亏记录查询
+     */
+    @PostMapping("/goodsLossStatProfit/page")
+    @ResponseBody
+    public PageResult<DriverIntervalCargoDamageGoodsLossStatProfitPageResponse> goodsLossStatProfitPage(@Validated @RequestBody DriverIntervalCargoDamageGoodsLossStatProfitPageRequest request, AdminUserInfo adminUserInfo) {
+        DriverIntervalCargoDamageGoodsLossStatProfitPageBo bo = DriverIntervalCargoDamageMapStruct.MAPSTRUCT.driverIntervalCargoDamageGoodsLossStatProfitPageRequestToBo(request);
+        buildUserInfo(bo, adminUserInfo);
+        Page<DriverIntervalCargoDamageGoodsLossStatProfitPageVo> page = driverGoodsLossStatProfitLossDetailService.searchPage(bo);
+        PageResult<DriverIntervalCargoDamageGoodsLossStatProfitPageResponse> pageResult = PageResult.newPageResult(request.getPageNum(), request.getPageSize());
+        List<DriverIntervalCargoDamageGoodsLossStatProfitPageVo> driverIntervalCargoDamageGoodsLossStatProfitPageVos = page.getRecords();
+        if (null == driverIntervalCargoDamageGoodsLossStatProfitPageVos || driverIntervalCargoDamageGoodsLossStatProfitPageVos.isEmpty()) {
+            return pageResult.success(0, new ArrayList<>());
+        }
+        List<DriverIntervalCargoDamageGoodsLossStatProfitPageResponse> responses = DriverIntervalCargoDamageMapStruct.MAPSTRUCT.driverIntervalCargoDamageGoodsLossStatProfitPageVoToResponse(driverIntervalCargoDamageGoodsLossStatProfitPageVos);
+        return pageResult.success(page.getTotal(), responses);
+    }
+
+    /**
+     * 区间货损盈亏记录导出
+     */
+    @PostMapping("/goodsLossStatProfit/export")
+    @ResponseBody
+    public Result<String> goodsLossStatProfitExport(@Validated @RequestBody DriverIntervalCargoDamageGoodsLossStatProfitExportRequest request, AdminUserInfo adminUserInfo) {
+        DriverIntervalCargoDamageGoodsLossStatProfitPageBo bo = DriverIntervalCargoDamageMapStruct.MAPSTRUCT.driverIntervalCargoDamageGoodsLossStatProfitExportRequestToBo(request);
+        buildUserInfo(bo, adminUserInfo);
+        bo.setPageNum(1);
+        bo.setPageSize(1000);
+        List<DriverIntervalCargoDamageGoodsLossStatProfitPageVo> resultVos = new ArrayList<>();
+        while ( true) {
+            Page<DriverIntervalCargoDamageGoodsLossStatProfitPageVo> page = driverGoodsLossStatProfitLossDetailService.searchPage(bo);
+            List<DriverIntervalCargoDamageGoodsLossStatProfitPageVo> driverIntervalCargoDamageGoodsLossStatProfitPageVos = page.getRecords();
+            if (null == driverIntervalCargoDamageGoodsLossStatProfitPageVos || driverIntervalCargoDamageGoodsLossStatProfitPageVos.isEmpty()) {
+                break;
+            }
+            resultVos.addAll(driverIntervalCargoDamageGoodsLossStatProfitPageVos);
+            bo.setPageNum(bo.getPageNum() + 1);
+        }
+        if (resultVos.isEmpty()) {
+            return Result.fail("没有可导出的数据");
+        }
+        String uri = exportClient.export(resultVos, "export/driver/interval/goodsLossStatProfit", "区间货损盈亏记录" + System.currentTimeMillis());
+        return Result.success(uri);
+    }
 }

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

@@ -131,4 +131,5 @@ public class DriverRouteDetailController extends BaseController {
         req.setGoodsName(request.getGoodsName());
         return export(req, adminUserInfo);
     }
+
 }

warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/export/DriverIntervalCargoDamageGoodsLossStatProfitExport.java

@@ -0,0 +1,78 @@
+package com.yr.warehouse.admin.web.driver.export;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 司机区间货损记录盈亏明细导出
+ */
+@Data
+public class DriverIntervalCargoDamageGoodsLossStatProfitExport implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 商品名称
+     */
+    @ExcelProperty("商品名称")
+    private String goodsName;
+
+    /**
+     * 商品编号
+     */
+    @ExcelProperty("商品编号")
+    private String goodsCode;
+
+    /**
+     * 商品图片
+     */
+    @ExcelProperty("商品图片")
+    private String goodsImg;
+
+    /**
+     * 商品分类
+     */
+    @ExcelProperty("商品分类")
+    private String classifyName;
+
+    /**
+     * 商品品牌
+     */
+    @ExcelProperty("商品品牌")
+    private String brandName;
+
+    /**
+     * 商品规格
+     */
+    @ExcelProperty("商品规格")
+    private String goodsSpec;
+
+    /**
+     * 在途库存数
+     */
+    @ExcelProperty("在途库存数")
+    private Long onRouteInventoryNum;
+
+    /**
+     * 未补货数
+     */
+    @ExcelProperty("未补货数")
+    private Long unReplenishedNum;
+
+    /**
+     * 核算数
+     */
+    @ExcelProperty("核算数")
+    private Long verifiedNum;
+
+    /**
+     * 盈亏数
+     */
+    @ExcelProperty("盈亏数")
+    private Long profitLossNum;
+
+}

warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/export/DriverIntervalCargoDamageUnReplenishOrderExport.java

@@ -0,0 +1,85 @@
+package com.yr.warehouse.admin.web.driver.export;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 区间生成统计记录未补货单导出
+ */
+@Data
+public class DriverIntervalCargoDamageUnReplenishOrderExport  implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 补货单单号
+     */
+    @ExcelProperty("补货单单号")
+    private String orderNumber;
+
+    /**
+     * 运营商名称
+     */
+    @ExcelProperty("运营商名称")
+    private String operatorName;
+
+    /**
+     * 运营商名称链
+     */
+    @ExcelProperty("运营商名称链")
+    private String operatorChainName;
+
+    /**
+     * 设备编号
+     */
+    @ExcelProperty("设备编号")
+    private String deviceNumber;
+
+    /**
+     * 设备名称
+     */
+    @ExcelProperty("设备名称")
+    private String deviceName;
+
+    /**
+     * 设备型号名称
+     */
+    @ExcelProperty("设备型号名称")
+    private String deviceModelName;
+
+    /**
+     * 补货单类型
+     */
+    @ExcelProperty("补货单类型")
+    private Integer replenishType;
+
+    /**
+     * 补货员名称
+     */
+    @ExcelProperty("补货员名称")
+    private String areaStaffName;
+
+    /**
+     * 区域名称链
+     */
+    @ExcelProperty("区域名称链")
+    private String areaChainName;
+
+    /**
+     * 未补货数
+     */
+    @ExcelProperty("未补货数")
+    private Integer unReplenishedNum;
+
+    /**
+     * 补货单创建时间
+     */
+    @ExcelProperty("补货单创建时间")
+    private LocalDateTime createTime;
+
+}

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

@@ -2,18 +2,13 @@ package com.yr.warehouse.admin.web.driver.mapstruct;
 
 import com.yr.bluecat.common.entity.request.AdminUserRequest;
 import com.yr.warehouse.admin.driver.bo.*;
-import com.yr.warehouse.admin.driver.vo.DriverIntervalCargoDamageDetailVo;
-import com.yr.warehouse.admin.driver.vo.DriverIntervalCargoDamageVo;
-import com.yr.warehouse.admin.driver.vo.DriverRouteAccountRecordDetailVo;
-import com.yr.warehouse.admin.driver.vo.DriverRouteAccountRecordMainVo;
+import com.yr.warehouse.admin.driver.vo.*;
 import com.yr.warehouse.admin.web.driver.export.DriverIntervalCargoDamageDetailExport;
+import com.yr.warehouse.admin.web.driver.export.DriverIntervalCargoDamageUnReplenishOrderExport;
 import com.yr.warehouse.admin.web.driver.export.DriverRouteAccountRecordDetailExport;
 import com.yr.warehouse.admin.web.driver.export.DriverRouteAccountRecordMainExport;
 import com.yr.warehouse.admin.web.driver.request.*;
-import com.yr.warehouse.admin.web.driver.response.DriverIntervalCargoDamageDetailResponse;
-import com.yr.warehouse.admin.web.driver.response.DriverIntervalCargoDamageResponse;
-import com.yr.warehouse.admin.web.driver.response.DriverRouteAccountRecordDetailResponse;
-import com.yr.warehouse.admin.web.driver.response.DriverRouteAccountRecordMainResponse;
+import com.yr.warehouse.admin.web.driver.response.*;
 import com.yr.warehouse.api.driver.request.DriverCargoDamageInventoryRequest;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
@@ -60,4 +55,18 @@ public interface DriverIntervalCargoDamageMapStruct {
     DriverIntervalCargoDamageGeneratorBo inventoryRequestToBo(DriverCargoDamageInventoryRequest request, AdminUserRequest adminUserRequest);
 
     RouteAccountRecordDetailBo routeAccountRecordDetailRequestToBo(RouteAccountRecordDetailRequest request);
+
+    DriverIntervalCargoDamageUnReplenishOrderPageBo driverIntervalCargoDamageUnReplenishOrderPageRequestToBo(DriverIntervalCargoDamageUnReplenishOrderPageRequest request);
+
+    List<DriverIntervalCargoDamageUnReplenishOrderPageResponse> driverIntervalCargoDamageUnReplenishOrderPageVoToResponse(List<DriverIntervalCargoDamageUnReplenishOrderPageVo> driverIntervalCargoDamageUnReplenishOrderPageVos);
+
+    DriverIntervalCargoDamageUnReplenishOrderPageBo driverIntervalCargoDamageUnReplenishOrderExportRequestToBo(DriverIntervalCargoDamageUnReplenishOrderExportRequest request);
+
+    List<DriverIntervalCargoDamageUnReplenishOrderExport> driverIntervalCargoDamageUnReplenishOrderPageVoToExport(List<DriverIntervalCargoDamageUnReplenishOrderPageVo> resultVos);
+
+    DriverIntervalCargoDamageGoodsLossStatProfitPageBo driverIntervalCargoDamageGoodsLossStatProfitPageRequestToBo(DriverIntervalCargoDamageGoodsLossStatProfitPageRequest request);
+
+    List<DriverIntervalCargoDamageGoodsLossStatProfitPageResponse> driverIntervalCargoDamageGoodsLossStatProfitPageVoToResponse(List<DriverIntervalCargoDamageGoodsLossStatProfitPageVo> driverIntervalCargoDamageGoodsLossStatProfitPageVos);
+
+    DriverIntervalCargoDamageGoodsLossStatProfitPageBo driverIntervalCargoDamageGoodsLossStatProfitExportRequestToBo(DriverIntervalCargoDamageGoodsLossStatProfitExportRequest request);
 }

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

@@ -0,0 +1,49 @@
+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 DriverIntervalCargoDamageGoodsLossStatProfitExportRequest implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 货损区间统计主表id（关联司机货损区间统计主表id）
+     */
+    @NotNull(message = "货损区间统计主表id不能为空")
+    private Long goodsLossMonthlyMainId;
+
+    /**
+     * 区域员工关系id
+     */
+    @NotNull(message = "区域员工关系id不能为空")
+    private Long areaStaffId;
+
+    /**
+     * 商品名称
+     */
+    private String goodsName;
+
+    /**
+     * 商品编码
+     */
+    private String goodsCode;
+
+    /**
+     * 品牌名称
+     */
+    private String brandName;
+
+    /**
+     * 分类名称
+     */
+    private String classifyName;
+}

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

@@ -0,0 +1,52 @@
+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 DriverIntervalCargoDamageGoodsLossStatProfitPageRequest extends PageRequest implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 货损区间统计主表id（关联司机货损区间统计主表id）
+     */
+    @NotNull(message = "货损区间统计主表id不能为空")
+    private Long goodsLossMonthlyMainId;
+
+    /**
+     * 区域员工关系id
+     */
+    @NotNull(message = "区域员工关系id不能为空")
+    private Long areaStaffId;
+
+    /**
+     * 商品名称
+     */
+    private String goodsName;
+
+    /**
+     * 商品编码
+     */
+    private String goodsCode;
+
+    /**
+     * 品牌名称
+     */
+    private String brandName;
+
+    /**
+     * 分类名称
+     */
+    private String classifyName;
+}

warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/request/DriverIntervalCargoDamageUnReplenishOrderExportRequest.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 DriverIntervalCargoDamageUnReplenishOrderExportRequest implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 货损记录主表id
+     */
+    @NotNull(message = "货损记录主表id不能为空")
+    private Long goodsLossMonthlyMainId;
+
+    /**
+     * 区域员工id
+     */
+    @NotNull(message = "区域员工id不能为空")
+    private Long areaStaffId;
+}

warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/request/DriverIntervalCargoDamageUnReplenishOrderPageRequest.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 DriverIntervalCargoDamageUnReplenishOrderPageRequest extends PageRequest implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 货损记录主表id
+     */
+    @NotNull(message = "货损记录主表id不能为空")
+    private Long goodsLossMonthlyMainId;
+
+    /**
+     * 区域员工id
+     */
+    @NotNull(message = "区域员工id不能为空")
+    private Long areaStaffId;
+}

warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/response/DriverIntervalCargoDamageGoodsLossStatProfitPageResponse.java

@@ -0,0 +1,77 @@
+package com.yr.warehouse.admin.web.driver.response;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 司机区间货损记录盈亏明细分页结果
+ */
+@Data
+public class DriverIntervalCargoDamageGoodsLossStatProfitPageResponse implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 司机区域货损盈亏记录id
+     */
+    private Long id;
+
+    /**
+     * 商品id
+     */
+    private Integer goodsId;
+
+    /**
+     * 商品名称
+     */
+    private String goodsName;
+
+    /**
+     * 商品编号
+     */
+    private String goodsCode;
+
+    /**
+     * 商品图片
+     */
+    private String goodsImg;
+
+    /**
+     * 商品分类-名称
+     */
+    private String classifyName;
+
+    /**
+     * 商品品牌-名称
+     */
+    private String brandName;
+
+    /**
+     * 商品规格
+     */
+    private String goodsSpec;
+
+    /**
+     * 在途库存数
+     */
+    private Long onRouteInventoryNum;
+
+    /**
+     * 未补货数
+     */
+    private Long unReplenishedNum;
+
+    /**
+     * 核算数
+     */
+    private Long verifiedNum;
+
+    /**
+     * 盈亏数
+     */
+    private Long profitLossNum;
+
+}

warehouse-admin-web/src/main/java/com/yr/warehouse/admin/web/driver/response/DriverIntervalCargoDamageUnReplenishOrderPageResponse.java

@@ -0,0 +1,93 @@
+package com.yr.warehouse.admin.web.driver.response;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 司机在途区间货损记录未补货的补货单分页Vo
+ */
+@Data
+public class DriverIntervalCargoDamageUnReplenishOrderPageResponse implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 司机区域货损统计未补货补货单快照 id
+     */
+    private Long id;
+
+    /**
+     * 补货单单号
+     */
+    private String orderNumber;
+
+    /**
+     * 运营商id
+     */
+    private Long operatorId;
+
+    /**
+     * 运营商名称
+     */
+    private String operatorName;
+
+    /**
+     * 运营商链
+     */
+    private String operatorChain;
+
+    /**
+     * 运营商名称链
+     */
+    private String operatorChainName;
+
+    /**
+     * 设备编号
+     */
+    private String deviceNumber;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 设备型号名称
+     */
+    private String deviceModelName;
+
+    /**
+     * 补货单类型
+     */
+    private Integer replenishType;
+
+    /**
+     * 区域员工id
+     */
+    private Long areaStaffId;
+
+    /**
+     * 补货员名称
+     */
+    private String areaStaffName;
+
+    /**
+     * 区域名称链
+     */
+    private String areaChainName;
+
+    /**
+     * 未补货数
+     */
+    private Integer unReplenishedNum;
+
+    /**
+     * 补货单创建时间
+     */
+    private LocalDateTime createTime;
+
+}