高级搜索代码编写

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/ContainerMainController.java

@@ -2,7 +2,6 @@ package com.win.module.wms.controller.container;
 
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.consumereRequest.vo.ConsumereRequestDetailbExcelVO;
 import com.win.module.wms.controller.container.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/ConsumeRecordDetailbController.java

@@ -8,7 +8,7 @@ import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.productrepairRecord.vo.*;
 import com.win.module.wms.convert.productrepairRecord.ConsumeRecordDetailbConvert;
-import com.win.module.wms.dal.dataobject.consumeRecord.ConsumeRecordDetailbDO;
+import com.win.module.wms.dal.dataobject.productrepairRecord.ConsumeRecordDetailbDO;
 import com.win.module.wms.service.productrepairRecord.ConsumeRecordDetailbService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumereRequest/ConsumereRequestDetailbController.java → win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ConsumereRequestDetailbController.java

@@ -1,35 +1,32 @@
-package com.win.module.wms.controller.consumereRequest;
+package com.win.module.wms.controller.productrepairRequest;
 
+import com.win.framework.common.pojo.CommonResult;
+import com.win.framework.common.pojo.CustomConditions;
+import com.win.framework.common.pojo.PageResult;
+import com.win.framework.excel.core.util.ExcelUtils;
+import com.win.framework.operatelog.core.annotations.OperateLog;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.consumeRecord.vo.ConsumeRecordDetailbExcelVO;
+import com.win.module.wms.controller.productrepairRequest.vo.*;
-import com.win.module.wms.controller.consumereRequest.vo.*;
+import com.win.module.wms.convert.productrepairRequest.ConsumereRequestDetailbConvert;
-import org.springframework.web.bind.annotation.*;
+import com.win.module.wms.dal.dataobject.productrepairRequest.ConsumereRequestDetailbDO;
-import javax.annotation.Resource;
+import com.win.module.wms.service.productrepairRequest.ConsumereRequestDetailbService;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
-import javax.validation.*;
+import javax.annotation.Resource;
-import javax.servlet.http.*;
+import javax.servlet.http.HttpServletResponse;
-import java.util.*;
+import javax.validation.Valid;
 import java.io.IOException;
+import java.util.Collection;
+import java.util.List;
 
-import com.win.framework.common.pojo.PageResult;
-import com.win.framework.common.pojo.CommonResult;
 import static com.win.framework.common.pojo.CommonResult.success;
-
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
-import com.win.framework.excel.core.util.ExcelUtils;
-
-import com.win.framework.operatelog.core.annotations.OperateLog;
-import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-import com.win.module.wms.controller.consumereRequest.vo.*;
-import com.win.module.wms.dal.dataobject.consumereRequest.ConsumereRequestDetailbDO;
-import com.win.module.wms.convert.consumereRequest.ConsumereRequestDetailbConvert;
-import com.win.module.wms.service.consumereRequest.ConsumereRequestDetailbService;
 
 @Tag(name = "管理后台 - 制品返修申请子")
 @RestController
@@ -92,7 +89,19 @@ public class ConsumereRequestDetailbController {
         PageResult<ConsumereRequestDetailbDO> pageResult = consumereRequestDetailbService.getConsumereRequestDetailbPage(pageVO);
         return success(ConsumereRequestDetailbConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得制品返修申请子分页")
+    @PreAuthorize("@ss.hasPermission('wms:consumere:query')")
+    public CommonResult<PageResult<ConsumereRequestDetailbRespVO>> getConsumereSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ConsumereRequestDetailbDO> pageResult = consumereRequestDetailbService.getConsumereRequestDetailbSenior(conditions);
+        PageResult<ConsumereRequestDetailbRespVO> result = ConsumereRequestDetailbConvert.INSTANCE.convertPage(pageResult);
+        for(ConsumereRequestDetailbRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/export-excel")
     @Operation(summary = "导出制品返修申请子 Excel")
     @PreAuthorize("@ss.hasPermission('wms:consumere-request-detailb:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumereRequest/vo/ConsumereRequestDetailbBaseVO.java → win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbBaseVO.java

@@ -1,13 +1,12 @@
-package com.win.module.wms.controller.consumereRequest.vo;
+package com.win.module.wms.controller.productrepairRequest.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import javax.validation.constraints.*;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
+
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 /**

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumereRequest/vo/ConsumereRequestDetailbCreateReqVO.java → win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbCreateReqVO.java

@@ -1,7 +1,9 @@
-package com.win.module.wms.controller.consumereRequest.vo;
+package com.win.module.wms.controller.productrepairRequest.vo;
 
-import lombok.*;
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 @Schema(description = "管理后台 - 制品返修申请子创建 Request VO")
 @Data

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumereRequest/vo/ConsumereRequestDetailbExcelVO.java → win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbExcelVO.java

@@ -1,14 +1,11 @@
-package com.win.module.wms.controller.consumereRequest.vo;
+package com.win.module.wms.controller.productrepairRequest.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.win.framework.excel.core.annotations.DictFormat;
 import com.win.framework.excel.core.convert.DictConvert;
+import lombok.Data;
+
+import java.time.LocalDateTime;
 
 
 /**

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumereRequest/vo/ConsumereRequestDetailbExportReqVO.java → win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbExportReqVO.java

@@ -1,12 +1,11 @@
-package com.win.module.wms.controller.consumereRequest.vo;
+package com.win.module.wms.controller.productrepairRequest.vo;
 
-import lombok.*;
-import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
-import com.win.framework.common.pojo.PageParam;
+import lombok.Data;
-import java.time.LocalDateTime;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.time.LocalDateTime;
+
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @Schema(description = "管理后台 - 制品返修申请子 Excel 导出 Request VO，参数和 ConsumereRequestDetailbPageReqVO 是一致的")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumereRequest/vo/ConsumereRequestDetailbPageReqVO.java → win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbPageReqVO.java

@@ -1,10 +1,12 @@
-package com.win.module.wms.controller.consumereRequest.vo;
+package com.win.module.wms.controller.productrepairRequest.vo;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.win.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumereRequest/vo/ConsumereRequestDetailbRespVO.java → win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbRespVO.java

@@ -1,7 +1,9 @@
-package com.win.module.wms.controller.consumereRequest.vo;
+package com.win.module.wms.controller.productrepairRequest.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 @Schema(description = "管理后台 - 制品返修申请子 Response VO")
 @Data

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumereRequest/vo/ConsumereRequestDetailbUpdateReqVO.java → win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbUpdateReqVO.java

@@ -1,7 +1,9 @@
-package com.win.module.wms.controller.consumereRequest.vo;
+package com.win.module.wms.controller.productrepairRequest.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 @Schema(description = "管理后台 - 制品返修申请子更新 Request VO")
 @Data

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productrepairRecord/ConsumeRecordDetailbConvert.java

@@ -5,7 +5,7 @@ import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailb
 import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailbExcelVO;
 import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailbRespVO;
 import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailbUpdateReqVO;
-import com.win.module.wms.dal.dataobject.consumeRecord.ConsumeRecordDetailbDO;
+import com.win.module.wms.dal.dataobject.productrepairRecord.ConsumeRecordDetailbDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/consumereRequest/ConsumereRequestDetailbConvert.java → win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productrepairRequest/ConsumereRequestDetailbConvert.java

@@ -1,16 +1,15 @@
-package com.win.module.wms.convert.consumereRequest;
+package com.win.module.wms.convert.productrepairRequest;
-
-import java.util.*;
 
 import com.win.framework.common.pojo.PageResult;
-
+import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbCreateReqVO;
-import com.win.module.wms.controller.consumereRequest.vo.ConsumereRequestDetailbCreateReqVO;
+import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbExcelVO;
-import com.win.module.wms.controller.consumereRequest.vo.ConsumereRequestDetailbExcelVO;
+import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbRespVO;
-import com.win.module.wms.controller.consumereRequest.vo.ConsumereRequestDetailbRespVO;
+import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbUpdateReqVO;
-import com.win.module.wms.controller.consumereRequest.vo.ConsumereRequestDetailbUpdateReqVO;
+import com.win.module.wms.dal.dataobject.productrepairRequest.ConsumereRequestDetailbDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
-import com.win.module.wms.dal.dataobject.consumereRequest.ConsumereRequestDetailbDO;
+
+import java.util.List;
 
 /**
  * 制品返修申请子 Convert

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/consumeRecord/ConsumeRecordDetailbDO.java

@@ -1,107 +0,0 @@
-package com.win.module.wms.dal.dataobject.consumeRecord;
-
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
-import com.win.framework.mybatis.core.dataobject.BaseDO;
-
-/**
- * 制品返修记录子 DO
- *
- * @author 超级管理员
- */
-@TableName("record_consume_detailb")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class ConsumeRecordDetailbDO extends BaseDO {
-
-    /**
-     * id
-     */
-    @TableId
-    private Long id;
-    /**
-     * 批次
-     */
-    private String batch;
-    /**
-     * 从库位代码
-     */
-    private String fromLocationCode;
-    /**
-     * 从库位组代码
-     */
-    private String fromLocationGroupCode;
-    /**
-     * 从库区代码
-     */
-    private String fromAreaCode;
-    /**
-     * 库存状态
-     *
-     * 枚举 {@link TODO inventory_status 对应的类}
-     */
-    private String inventoryStatus;
-    /**
-     * 包装号
-     */
-    private String packingNumber;
-    /**
-     * 主表ID
-     */
-    private String masterId;
-    /**
-     * 单据号
-     */
-    private String number;
-    /**
-     * 物品代码
-     */
-    private String itemCode;
-    /**
-     * 备注
-     */
-    private String remark;
-    /**
-     * 地点ID
-     */
-    private String siteId;
-    /**
-     * 物品名称
-     */
-    private String itemName;
-    /**
-     * 物品描述1
-     */
-    private String itemDesc1;
-    /**
-     * 物品描述2
-     */
-    private String itemDesc2;
-    /**
-     * 项目代码
-     */
-    private String projectCode;
-    /**
-     * 计量单位
-     *
-     * 枚举 {@link TODO uom 对应的类}
-     */
-    private String uom;
-    /**
-     * 代码
-     */
-    private String code;
-    /**
-     * 接口类型
-     *
-     * 枚举 {@link TODO interface_type 对应的类}
-     */
-    private String interfaceType;
-
-}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/consumereRequest/ConsumereRequestDetailbDO.java → win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productrepairRequest/ConsumereRequestDetailbDO.java

@@ -1,11 +1,11 @@
-package com.win.module.wms.dal.dataobject.consumereRequest;
+package com.win.module.wms.dal.dataobject.productrepairRequest;
 
-import lombok.*;
+import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.*;
+import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
+import com.sun.xml.bind.v2.TODO;
-import com.baomidou.mybatisplus.annotation.*;
 import com.win.framework.mybatis.core.dataobject.BaseDO;
+import lombok.*;
 
 /**
  * 制品返修申请子 DO

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRecord/ConsumeRecordDetailbMapper.java

@@ -5,7 +5,7 @@ import com.win.framework.mybatis.core.mapper.BaseMapperX;
 import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailbExportReqVO;
 import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailbPageReqVO;
-import com.win.module.wms.dal.dataobject.consumeRecord.ConsumeRecordDetailbDO;
+import com.win.module.wms.dal.dataobject.productrepairRecord.ConsumeRecordDetailbDO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/consumereRequest/ConsumereRequestDetailbMapper.java → win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRequest/ConsumereRequestDetailbMapper.java

@@ -1,15 +1,17 @@
-package com.win.module.wms.dal.mysql.consumereRequest;
+package com.win.module.wms.dal.mysql.productrepairRequest;
-
-import java.util.*;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
-import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.win.framework.mybatis.core.mapper.BaseMapperX;
-import com.win.module.wms.controller.consumereRequest.vo.ConsumereRequestDetailbExportReqVO;
+import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
-import com.win.module.wms.controller.consumereRequest.vo.ConsumereRequestDetailbPageReqVO;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
-import com.win.module.wms.dal.dataobject.consumereRequest.ConsumereRequestDetailbDO;
+import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbExportReqVO;
+import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbPageReqVO;
+import com.win.module.wms.dal.dataobject.productrepairRequest.ConsumereRequestDetailbDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 制品返修申请子 Mapper
  *
@@ -38,7 +40,9 @@ public interface ConsumereRequestDetailbMapper extends BaseMapperX<ConsumereRequ
                 .eqIfPresent(ConsumereRequestDetailbDO::getUpdater, reqVO.getUpdater())
                 .orderByDesc(ConsumereRequestDetailbDO::getId));
     }
-
+    default PageResult<ConsumereRequestDetailbDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<ConsumereRequestDetailbDO> selectList(ConsumereRequestDetailbExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ConsumereRequestDetailbDO>()
                 .eqIfPresent(ConsumereRequestDetailbDO::getInventoryStatus, reqVO.getInventoryStatus())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ConsumeRecordDetailbService.java

@@ -5,7 +5,7 @@ import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailb
 import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailbExportReqVO;
 import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailbPageReqVO;
 import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailbUpdateReqVO;
-import com.win.module.wms.dal.dataobject.consumeRecord.ConsumeRecordDetailbDO;
+import com.win.module.wms.dal.dataobject.productrepairRecord.ConsumeRecordDetailbDO;
 
 import javax.validation.Valid;
 import java.util.Collection;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ConsumeRecordDetailbServiceImpl.java

@@ -6,7 +6,7 @@ import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailb
 import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailbPageReqVO;
 import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailbUpdateReqVO;
 import com.win.module.wms.convert.productrepairRecord.ConsumeRecordDetailbConvert;
-import com.win.module.wms.dal.dataobject.consumeRecord.ConsumeRecordDetailbDO;
+import com.win.module.wms.dal.dataobject.productrepairRecord.ConsumeRecordDetailbDO;
 import com.win.module.wms.dal.mysql.productrepairRecord.ConsumeRecordDetailbMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/consumereRequest/ConsumereRequestDetailbService.java → win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ConsumereRequestDetailbService.java

@@ -1,14 +1,16 @@
-package com.win.module.wms.service.consumereRequest;
+package com.win.module.wms.service.productrepairRequest;
 
-import java.util.*;
+import com.win.framework.common.pojo.CustomConditions;
-import javax.validation.*;
-
-import com.win.module.wms.controller.consumereRequest.vo.ConsumereRequestDetailbCreateReqVO;
-import com.win.module.wms.controller.consumereRequest.vo.ConsumereRequestDetailbExportReqVO;
-import com.win.module.wms.controller.consumereRequest.vo.ConsumereRequestDetailbPageReqVO;
-import com.win.module.wms.controller.consumereRequest.vo.ConsumereRequestDetailbUpdateReqVO;
-import com.win.module.wms.dal.dataobject.consumereRequest.ConsumereRequestDetailbDO;
 import com.win.framework.common.pojo.PageResult;
+import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbCreateReqVO;
+import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbExportReqVO;
+import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbPageReqVO;
+import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbUpdateReqVO;
+import com.win.module.wms.dal.dataobject.productrepairRequest.ConsumereRequestDetailbDO;
+
+import javax.validation.Valid;
+import java.util.Collection;
+import java.util.List;
 
 /**
  * 制品返修申请子 Service 接口
@@ -55,6 +57,14 @@ public interface ConsumereRequestDetailbService {
      */
     List<ConsumereRequestDetailbDO> getConsumereRequestDetailbList(Collection<String> ids);
 
+    /**
+     * 获得用高级搜索制品返修申请子分页列表
+     *
+     * @param conditions 分页、排序和自定义条件
+     * @return 分页列表
+     */
+    PageResult<ConsumereRequestDetailbDO> getConsumereRequestDetailbSenior(CustomConditions conditions);
+
     /**
      * 获得制品返修申请子分页
      *

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/consumereRequest/ConsumereRequestDetailbServiceImpl.java → win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ConsumereRequestDetailbServiceImpl.java

@@ -1,23 +1,23 @@
-package com.win.module.wms.service.consumereRequest;
+package com.win.module.wms.service.productrepairRequest;
 
-import com.win.module.wms.controller.consumereRequest.vo.ConsumereRequestDetailbCreateReqVO;
+import com.win.framework.common.pojo.CustomConditions;
-import com.win.module.wms.controller.consumereRequest.vo.ConsumereRequestDetailbExportReqVO;
+import com.win.framework.common.pojo.PageResult;
-import com.win.module.wms.controller.consumereRequest.vo.ConsumereRequestDetailbPageReqVO;
+import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbCreateReqVO;
-import com.win.module.wms.controller.consumereRequest.vo.ConsumereRequestDetailbUpdateReqVO;
+import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbExportReqVO;
+import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbPageReqVO;
+import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbUpdateReqVO;
+import com.win.module.wms.convert.productrepairRequest.ConsumereRequestDetailbConvert;
+import com.win.module.wms.dal.dataobject.productrepairRequest.ConsumereRequestDetailbDO;
+import com.win.module.wms.dal.mysql.productrepairRequest.ConsumereRequestDetailbMapper;
 import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
 
-import java.util.*;
+import javax.annotation.Resource;
-
+import java.util.Collection;
-import com.win.module.wms.dal.dataobject.consumereRequest.ConsumereRequestDetailbDO;
+import java.util.List;
-import com.win.framework.common.pojo.PageResult;
-
-import com.win.module.wms.convert.consumereRequest.ConsumereRequestDetailbConvert;
-import com.win.module.wms.dal.mysql.consumereRequest.ConsumereRequestDetailbMapper;
 
 import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.win.module.wms.enums.ErrorCodeConstants.*;
+import static com.win.module.wms.enums.ErrorCodeConstants.CONSUMERE_REQUEST_DETAILB_NOT_EXISTS;
 
 /**
  * 制品返修申请子 Service 实现类
@@ -67,7 +67,10 @@ public class ConsumereRequestDetailbServiceImpl implements ConsumereRequestDetai
     public ConsumereRequestDetailbDO getConsumereRequestDetailb(String id) {
         return consumereRequestDetailbMapper.selectById(id);
     }
-
+    @Override
+    public PageResult<ConsumereRequestDetailbDO> getConsumereRequestDetailbSenior(CustomConditions conditions) {
+        return consumereRequestDetailbMapper.selectSenior(conditions);
+    }
     @Override
     public List<ConsumereRequestDetailbDO> getConsumereRequestDetailbList(Collection<String> ids) {
         return consumereRequestDetailbMapper.selectBatchIds(ids);