BUG修改

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/PackageController.java

@@ -1,39 +1,33 @@
 package com.win.module.wms.controller.packageMassage;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.packageMassage.vo.*;
+import com.win.module.wms.convert.packageMassage.PackageConvert;
+import com.win.module.wms.dal.dataobject.packageMassage.PackageDO;
 import com.win.module.wms.dal.mysql.packageMassage.PackageMapper;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-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 com.win.module.wms.service.packageMassage.PackageService;
 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.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+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.exception.util.ServiceExceptionUtil.exception;
 import static com.win.framework.common.pojo.CommonResult.success;
-
-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 static com.win.module.wms.enums.ErrorCodeConstants.PACKAGE_NOT_EXISTS;
-
-import com.win.module.wms.controller.packageMassage.vo.*;
-import com.win.module.wms.dal.dataobject.packageMassage.PackageDO;
-import com.win.module.wms.convert.packageMassage.PackageConvert;
-import com.win.module.wms.service.packageMassage.PackageService;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 包装")
 @RestController
@@ -114,4 +108,18 @@ public class PackageController {
         ExcelUtils.write(response, "包装.xls", "数据", PackageExcelVO.class, datas);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得包装分页")
+    @PreAuthorize("@ss.hasPermission('wms:package:query')")
+    public CommonResult<PageResult<PackageRespVO>> getPackageSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<PackageDO> pageResult = packageService.getPackageSenior(conditions);
+        PageResult<PackageRespVO> result = PackageConvert.INSTANCE.convertPage(pageResult);
+        for(PackageRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageBaseVO.java

@@ -1,17 +1,13 @@
 package com.win.module.wms.controller.packageMassage.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import javax.validation.constraints.*;
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 /**
@@ -152,4 +148,7 @@ public class PackageBaseVO {
     @Schema(description = "体积")
     private String volume;
 
+    @Schema(description = "创建者用户名")
+    private String creator;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/paramsetting/ParamsettingController.java

@@ -1,6 +1,7 @@
 package com.win.module.wms.controller.paramsetting;
 
 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.dict.core.util.DictFrameworkUtils;
 import com.win.framework.excel.core.util.ExcelUtils;
@@ -148,4 +149,18 @@ public class ParamsettingController {
             returnMap.put("errorFile", url);
         }
     }
+
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得参数设置分页")
+    @PreAuthorize("@ss.hasPermission('wms:paramsetting:query')")
+    public CommonResult<PageResult<ParamsettingRespVO>> getParamsettingSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ParamsettingDO> pageResult = paramsettingService.getParamsettingSenior(conditions);
+        PageResult<ParamsettingRespVO> result = ParamsettingConvert.INSTANCE.convertPage(pageResult);
+        for(ParamsettingRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/paramsetting/vo/ParamsettingBaseVO.java

@@ -1,9 +1,9 @@
 package com.win.module.wms.controller.paramsetting.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import javax.validation.constraints.*;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
 
 /**
  * 参数设置 Base VO，提供给添加、修改、详细的子 VO 使用
@@ -48,4 +48,7 @@ public class ParamsettingBaseVO {
     @NotNull(message = "必填不能为空")
     private String isRequired;
 
+    @Schema(description = "创建者用户名")
+    private String creator;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/PickJobDetailController.java

@@ -1,34 +1,32 @@
 package com.win.module.wms.controller.pickJob;
 
+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.pickJob.vo.*;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-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 com.win.module.wms.convert.pickJob.PickJobDetailConvert;
+import com.win.module.wms.dal.dataobject.pickJob.PickJobDetailDO;
+import com.win.module.wms.service.pickJob.PickJobDetailService;
 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.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+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 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.pickJob.vo.*;
-import com.win.module.wms.dal.dataobject.pickJob.PickJobDetailDO;
-import com.win.module.wms.convert.pickJob.PickJobDetailConvert;
-import com.win.module.wms.service.pickJob.PickJobDetailService;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 拣料任务子")
 @RestController
@@ -109,4 +107,18 @@ public class PickJobDetailController {
         ExcelUtils.write(response, "拣料任务子.xls", "数据", PickJobDetailExcelVO.class, datas);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得拣料任务子分页")
+    @PreAuthorize("@ss.hasPermission('wms:pick-job-detail:query')")
+    public CommonResult<PageResult<PickJobDetailRespVO>> getPickJobDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<PickJobDetailDO> pageResult = pickJobDetailService.getPickJobDetailSenior(conditions);
+        PageResult<PickJobDetailRespVO> result = PickJobDetailConvert.INSTANCE.convertPage(pageResult);
+        for(PickJobDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/PickJobMainController.java

@@ -1,34 +1,32 @@
 package com.win.module.wms.controller.pickJob;
 
+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.pickJob.vo.*;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-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 com.win.module.wms.convert.pickJob.PickJobMainConvert;
+import com.win.module.wms.dal.dataobject.pickJob.PickJobMainDO;
+import com.win.module.wms.service.pickJob.PickJobMainService;
 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.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+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 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.pickJob.vo.*;
-import com.win.module.wms.dal.dataobject.pickJob.PickJobMainDO;
-import com.win.module.wms.convert.pickJob.PickJobMainConvert;
-import com.win.module.wms.service.pickJob.PickJobMainService;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 拣料任务主")
 @RestController
@@ -108,4 +106,18 @@ public class PickJobMainController {
         ExcelUtils.write(response, "拣料任务主.xls", "数据", PickJobMainExcelVO.class, datas);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得拣料任务主分页")
+    @PreAuthorize("@ss.hasPermission('wms:pick-job-main:query')")
+    public CommonResult<PageResult<PickJobMainRespVO>> getPickJobMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<PickJobMainDO> pageResult = pickJobMainService.getPickJobMainSenior(conditions);
+        PageResult<PickJobMainRespVO> result = PickJobMainConvert.INSTANCE.convertPage(pageResult);
+        for(PickJobMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/vo/PickJobDetailBaseVO.java

@@ -1,12 +1,12 @@
 package com.win.module.wms.controller.pickJob.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import javax.validation.constraints.*;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
@@ -83,4 +83,7 @@ public class PickJobDetailBaseVO {
     @Schema(description = "到货主代码")
     private String toOwnerCode;
 
+    @Schema(description = "创建者用户名")
+    private String creator;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRecord/PickRecordDetailController.java

@@ -1,34 +1,32 @@
 package com.win.module.wms.controller.pickRecord;
 
+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.pickRecord.vo.*;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-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 com.win.module.wms.convert.pickRecord.PickRecordDetailConvert;
+import com.win.module.wms.dal.dataobject.pickRecord.PickRecordDetailDO;
+import com.win.module.wms.service.pickRecord.PickRecordDetailService;
 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.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+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 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.pickRecord.vo.*;
-import com.win.module.wms.dal.dataobject.pickRecord.PickRecordDetailDO;
-import com.win.module.wms.convert.pickRecord.PickRecordDetailConvert;
-import com.win.module.wms.service.pickRecord.PickRecordDetailService;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 拣料记录子")
 @RestController
@@ -109,4 +107,17 @@ public class PickRecordDetailController {
         ExcelUtils.write(response, "拣料记录子.xls", "数据", PickRecordDetailExcelVO.class, datas);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得拣料记录子分页")
+    @PreAuthorize("@ss.hasPermission('wms:pick-record-detail:query')")
+    public CommonResult<PageResult<PickRecordDetailRespVO>> getPickRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<PickRecordDetailDO> pageResult = pickRecordDetailService.getPickRecordDetailSenior(conditions);
+        PageResult<PickRecordDetailRespVO> result = PickRecordDetailConvert.INSTANCE.convertPage(pageResult);
+        for(PickRecordDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRecord/PickRecordMainController.java

@@ -1,34 +1,32 @@
 package com.win.module.wms.controller.pickRecord;
 
+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.pickRecord.vo.*;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-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 com.win.module.wms.convert.pickRecord.PickRecordMainConvert;
+import com.win.module.wms.dal.dataobject.pickRecord.PickRecordMainDO;
+import com.win.module.wms.service.pickRecord.PickRecordMainService;
 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.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+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 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.pickRecord.vo.*;
-import com.win.module.wms.dal.dataobject.pickRecord.PickRecordMainDO;
-import com.win.module.wms.convert.pickRecord.PickRecordMainConvert;
-import com.win.module.wms.service.pickRecord.PickRecordMainService;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 拣料记录主")
 @RestController
@@ -109,4 +107,17 @@ public class PickRecordMainController {
         ExcelUtils.write(response, "拣料记录主.xls", "数据", PickRecordMainExcelVO.class, datas);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得拣料记录主分页")
+    @PreAuthorize("@ss.hasPermission('wms:pick-record-main:query')")
+    public CommonResult<PageResult<PickRecordMainRespVO>> getPickRecordMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<PickRecordMainDO> pageResult = pickRecordMainService.getPickRecordMainSenior(conditions);
+        PageResult<PickRecordMainRespVO> result = PickRecordMainConvert.INSTANCE.convertPage(pageResult);
+        for(PickRecordMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/PickRequestDetailController.java

@@ -1,34 +1,32 @@
 package com.win.module.wms.controller.pickRequest;
 
+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.pickRequest.vo.*;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-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 com.win.module.wms.convert.pickRequest.PickRequestDetailConvert;
+import com.win.module.wms.dal.dataobject.pickRequest.PickRequestDetailDO;
+import com.win.module.wms.service.pickRequest.PickRequestDetailService;
 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.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+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 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.pickRequest.vo.*;
-import com.win.module.wms.dal.dataobject.pickRequest.PickRequestDetailDO;
-import com.win.module.wms.convert.pickRequest.PickRequestDetailConvert;
-import com.win.module.wms.service.pickRequest.PickRequestDetailService;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 拣料申请子")
 @RestController
@@ -109,4 +107,18 @@ public class PickRequestDetailController {
         ExcelUtils.write(response, "拣料申请子.xls", "数据", PickRequestDetailExcelVO.class, datas);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得拣料申请子分页")
+    @PreAuthorize("@ss.hasPermission('wms:pick-request-detail:query')")
+    public CommonResult<PageResult<PickRequestDetailRespVO>> getPickRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<PickRequestDetailDO> pageResult = pickRequestDetailService.getPickRequestDetailSenior(conditions);
+        PageResult<PickRequestDetailRespVO> result = PickRequestDetailConvert.INSTANCE.convertPage(pageResult);
+        for(PickRequestDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/PickRequestMainController.java

@@ -1,34 +1,32 @@
 package com.win.module.wms.controller.pickRequest;
 
+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.pickRequest.vo.*;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-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 com.win.module.wms.convert.pickRequest.PickRequestMainConvert;
+import com.win.module.wms.dal.dataobject.pickRequest.PickRequestMainDO;
+import com.win.module.wms.service.pickRequest.PickRequestMainService;
 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.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+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 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.pickRequest.vo.*;
-import com.win.module.wms.dal.dataobject.pickRequest.PickRequestMainDO;
-import com.win.module.wms.convert.pickRequest.PickRequestMainConvert;
-import com.win.module.wms.service.pickRequest.PickRequestMainService;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 拣料申请主")
 @RestController
@@ -109,4 +107,18 @@ public class PickRequestMainController {
         ExcelUtils.write(response, "拣料申请主.xls", "数据", PickRequestMainExcelVO.class, datas);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得拣料申请主分页")
+    @PreAuthorize("@ss.hasPermission('wms:pick-request-main:query')")
+    public CommonResult<PageResult<PickRequestMainRespVO>> getPickRequestMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<PickRequestMainDO> pageResult = pickRequestMainService.getPickRequestMainSenior(conditions);
+        PageResult<PickRequestMainRespVO> result = PickRequestMainConvert.INSTANCE.convertPage(pageResult);
+        for(PickRequestMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/PreparetoissueDetailController.java

@@ -1,34 +1,32 @@
 package com.win.module.wms.controller.preparetoissue;
 
+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.preparetoissue.vo.*;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-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 com.win.module.wms.convert.preparetoissue.PreparetoissueDetailConvert;
+import com.win.module.wms.dal.dataobject.preparetoissue.PreparetoissueDetailDO;
+import com.win.module.wms.service.preparetoissue.PreparetoissueDetailService;
 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.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+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 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.preparetoissue.vo.*;
-import com.win.module.wms.dal.dataobject.preparetoissue.PreparetoissueDetailDO;
-import com.win.module.wms.convert.preparetoissue.PreparetoissueDetailConvert;
-import com.win.module.wms.service.preparetoissue.PreparetoissueDetailService;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 备料计划子")
 @RestController
@@ -109,4 +107,18 @@ public class PreparetoissueDetailController {
         ExcelUtils.write(response, "备料计划子.xls", "数据", PreparetoissueDetailExcelVO.class, datas);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得备料计划子分页")
+    @PreAuthorize("@ss.hasPermission('wms:preparetoissue-detail:query')")
+    public CommonResult<PageResult<PreparetoissueDetailRespVO>> getPreparetoissueDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<PreparetoissueDetailDO> pageResult = preparetoissueDetailService.getPreparetoissueDetailSenior(conditions);
+        PageResult<PreparetoissueDetailRespVO> result = PreparetoissueDetailConvert.INSTANCE.convertPage(pageResult);
+        for(PreparetoissueDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/PreparetoissueMainController.java

@@ -1,33 +1,32 @@
 package com.win.module.wms.controller.preparetoissue;
 
+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.preparetoissue.vo.*;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-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 com.win.module.wms.convert.preparetoissue.PreparetoissueMainConvert;
+import com.win.module.wms.dal.dataobject.preparetoissue.PreparetoissueMainDO;
+import com.win.module.wms.service.preparetoissue.PreparetoissueMainService;
 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.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+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 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.dal.dataobject.preparetoissue.PreparetoissueMainDO;
-import com.win.module.wms.convert.preparetoissue.PreparetoissueMainConvert;
-import com.win.module.wms.service.preparetoissue.PreparetoissueMainService;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 备料计划主")
 @RestController
@@ -107,4 +106,18 @@ public class PreparetoissueMainController {
         ExcelUtils.write(response, "备料计划主.xls", "数据", PreparetoissueMainExcelVO.class, datas);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得备料计划主分页")
+    @PreAuthorize("@ss.hasPermission('wms:preparetoissue-main:query')")
+    public CommonResult<PageResult<PreparetoissueMainRespVO>> getPreparetoissueMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<PreparetoissueMainDO> pageResult = preparetoissueMainService.getPreparetoissueMainSenior(conditions);
+        PageResult<PreparetoissueMainRespVO> result = PreparetoissueMainConvert.INSTANCE.convertPage(pageResult);
+        for(PreparetoissueMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/process/ProcessController.java

@@ -1,6 +1,7 @@
 package com.win.module.wms.controller.process;
 
 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.dict.core.util.DictFrameworkUtils;
 import com.win.framework.excel.core.util.ExcelUtils;
@@ -145,4 +146,19 @@ public class ProcessController {
             returnMap.put("errorFile", url);
         }
     }
+
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得工序分页")
+    @PreAuthorize("@ss.hasPermission('wms:process:query')")
+    public CommonResult<PageResult<ProcessRespVO>> getProcessSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProcessDO> pageResult = processService.getProcessSenior(conditions);
+        PageResult<ProcessRespVO> result = ProcessConvert.INSTANCE.convertPage(pageResult);
+        for(ProcessRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+    
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/ProductdismantleJobDetailController.java

@@ -1,34 +1,32 @@
 package com.win.module.wms.controller.productdismantleJob;
 
+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.productdismantleJob.vo.*;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-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 com.win.module.wms.convert.productdismantleJob.ProductdismantleJobDetailConvert;
+import com.win.module.wms.dal.dataobject.productdismantleJob.ProductdismantleJobDetailDO;
+import com.win.module.wms.service.productdismantleJob.ProductdismantleJobDetailService;
 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.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+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 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.productdismantleJob.vo.*;
-import com.win.module.wms.dal.dataobject.productdismantleJob.ProductdismantleJobDetailDO;
-import com.win.module.wms.convert.productdismantleJob.ProductdismantleJobDetailConvert;
-import com.win.module.wms.service.productdismantleJob.ProductdismantleJobDetailService;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 制品拆解任务子")
 @RestController
@@ -108,5 +106,20 @@ public class ProductdismantleJobDetailController {
         }
         ExcelUtils.write(response, "制品拆解任务子.xls", "数据", ProductdismantleJobDetailExcelVO.class, datas);
     }
+    
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得制品拆解任务子分页")
+    @PreAuthorize("@ss.hasPermission('wms:productdismantle-job-detail:query')")
+    public CommonResult<PageResult<ProductdismantleJobDetailRespVO>> getProductdismantleJobDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductdismantleJobDetailDO> pageResult = productdismantleJobDetailService.getProductdismantleJobDetailSenior(conditions);
+        PageResult<ProductdismantleJobDetailRespVO> result = ProductdismantleJobDetailConvert.INSTANCE.convertPage(pageResult);
+        for(ProductdismantleJobDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/ProductdismantleJobMainController.java

@@ -1,33 +1,32 @@
 package com.win.module.wms.controller.productdismantleJob;
 
+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.productdismantleJob.vo.*;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-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 com.win.module.wms.convert.productdismantleJob.ProductdismantleJobMainConvert;
+import com.win.module.wms.dal.dataobject.productdismantleJob.ProductdismantleJobMainDO;
+import com.win.module.wms.service.productdismantleJob.ProductdismantleJobMainService;
 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.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+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 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.dal.dataobject.productdismantleJob.ProductdismantleJobMainDO;
-import com.win.module.wms.convert.productdismantleJob.ProductdismantleJobMainConvert;
-import com.win.module.wms.service.productdismantleJob.ProductdismantleJobMainService;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 制品拆解任务主")
 @RestController
@@ -108,4 +107,18 @@ public class ProductdismantleJobMainController {
         ExcelUtils.write(response, "制品拆解任务主.xls", "数据", ProductdismantleJobMainExcelVO.class, datas);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得制品拆解任务主分页")
+    @PreAuthorize("@ss.hasPermission('wms:productdismantle-job-main:query')")
+    public CommonResult<PageResult<ProductdismantleJobMainRespVO>> getProductdismantleJobMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductdismantleJobMainDO> pageResult = productdismantleJobMainService.getProductdismantleJobMainSenior(conditions);
+        PageResult<ProductdismantleJobMainRespVO> result = ProductdismantleJobMainConvert.INSTANCE.convertPage(pageResult);
+        for(ProductdismantleJobMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/ProductdismantleRecordDetailaController.java

@@ -1,34 +1,32 @@
 package com.win.module.wms.controller.productdismantleRecord;
 
+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.productdismantleRecord.vo.*;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-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 com.win.module.wms.convert.productdismantleRecord.ProductdismantleRecordDetailaConvert;
+import com.win.module.wms.dal.dataobject.productdismantleRecord.ProductdismantleRecordDetailaDO;
+import com.win.module.wms.service.productdismantleRecord.ProductdismantleRecordDetailaService;
 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.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+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 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.productdismantleRecord.vo.*;
-import com.win.module.wms.dal.dataobject.productdismantleRecord.ProductdismantleRecordDetailaDO;
-import com.win.module.wms.convert.productdismantleRecord.ProductdismantleRecordDetailaConvert;
-import com.win.module.wms.service.productdismantleRecord.ProductdismantleRecordDetailaService;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 制品拆解记录子")
 @RestController
@@ -109,4 +107,18 @@ public class ProductdismantleRecordDetailaController {
         ExcelUtils.write(response, "制品拆解记录子.xls", "数据", ProductdismantleRecordDetailaExcelVO.class, datas);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得制品拆解记录子分页")
+    @PreAuthorize("@ss.hasPermission('wms:productdismantle-record-detaila:query')")
+    public CommonResult<PageResult<ProductdismantleRecordDetailaRespVO>> getProductdismantleRecordDetailaSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductdismantleRecordDetailaDO> pageResult = productdismantleRecordDetailaService.getProductdismantleRecordDetailaSenior(conditions);
+        PageResult<ProductdismantleRecordDetailaRespVO> result = ProductdismantleRecordDetailaConvert.INSTANCE.convertPage(pageResult);
+        for(ProductdismantleRecordDetailaRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/ProductdismantleRequestDetailaController.java

@@ -1,34 +1,32 @@
 package com.win.module.wms.controller.productdismantleRequest;
 
+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.productdismantleRequest.vo.*;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-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 com.win.module.wms.convert.productdismantleRequest.ProductdismantleRequestDetailaConvert;
+import com.win.module.wms.dal.dataobject.productdismantleRequest.ProductdismantleRequestDetailaDO;
+import com.win.module.wms.service.productdismantleRequest.ProductdismantleRequestDetailaService;
 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.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+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 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.productdismantleRequest.vo.*;
-import com.win.module.wms.dal.dataobject.productdismantleRequest.ProductdismantleRequestDetailaDO;
-import com.win.module.wms.convert.productdismantleRequest.ProductdismantleRequestDetailaConvert;
-import com.win.module.wms.service.productdismantleRequest.ProductdismantleRequestDetailaService;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 制品拆解申请子")
 @RestController
@@ -109,4 +107,18 @@ public class ProductdismantleRequestDetailaController {
         ExcelUtils.write(response, "制品拆解申请子.xls", "数据", ProductdismantleRequestDetailaExcelVO.class, datas);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得制品拆解申请子分页")
+    @PreAuthorize("@ss.hasPermission('wms:productdismantle-request-detaila:query')")
+    public CommonResult<PageResult<ProductdismantleRequestDetailaRespVO>> getProductdismantleRequestDetailaSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductdismantleRequestDetailaDO> pageResult = productdismantleRequestDetailaService.getProductdismantleRequestDetailaSenior(conditions);
+        PageResult<ProductdismantleRequestDetailaRespVO> result = ProductdismantleRequestDetailaConvert.INSTANCE.convertPage(pageResult);
+        for(ProductdismantleRequestDetailaRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/ProductdismantleRequestDetailbController.java

@@ -1,6 +1,7 @@
 package com.win.module.wms.controller.productdismantleRequest;
 
 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;
@@ -106,4 +107,19 @@ public class ProductdismantleRequestDetailbController {
         ExcelUtils.write(response, "制品拆解申请子.xls", "数据", ProductdismantleRequestDetailbExcelVO.class, datas);
     }
 
+
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得制品拆解申请子分页")
+    @PreAuthorize("@ss.hasPermission('wms:dismantle-request-detailb:query')")
+    public CommonResult<PageResult<ProductdismantleRequestDetailbRespVO>> getProductdismantleRequestDetailbSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductdismantleRequestDetailbDO> pageResult = productdismantleRequestDetailbService.getProductdismantleRequestDetailbSenior(conditions);
+        PageResult<ProductdismantleRequestDetailbRespVO> result = ProductdismantleRequestDetailbConvert.INSTANCE.convertPage(pageResult);
+        for(ProductdismantleRequestDetailbRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/ProductdismantleRequestMainController.java

@@ -1,34 +1,32 @@
 package com.win.module.wms.controller.productdismantleRequest;
 
+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.productdismantleRequest.vo.*;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-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 com.win.module.wms.convert.productdismantleRequest.ProductdismantleRequestMainConvert;
+import com.win.module.wms.dal.dataobject.productdismantleRequest.ProductdismantleRequestMainDO;
+import com.win.module.wms.service.productdismantleRequest.ProductdismantleRequestMainService;
 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.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+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 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.productdismantleRequest.vo.*;
-import com.win.module.wms.dal.dataobject.productdismantleRequest.ProductdismantleRequestMainDO;
-import com.win.module.wms.convert.productdismantleRequest.ProductdismantleRequestMainConvert;
-import com.win.module.wms.service.productdismantleRequest.ProductdismantleRequestMainService;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 制品拆解申请主")
 @RestController
@@ -109,4 +107,18 @@ public class ProductdismantleRequestMainController {
         ExcelUtils.write(response, "制品拆解申请主.xls", "数据", ProductdismantleRequestMainExcelVO.class, datas);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得制品拆解申请主分页")
+    @PreAuthorize("@ss.hasPermission('wms:productdismantle-request-main:query')")
+    public CommonResult<PageResult<ProductdismantleRequestMainRespVO>> getProductdismantleRequestMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductdismantleRequestMainDO> pageResult = productdismantleRequestMainService.getProductdismantleRequestMainSenior(conditions);
+        PageResult<ProductdismantleRequestMainRespVO> result = ProductdismantleRequestMainConvert.INSTANCE.convertPage(pageResult);
+        for(ProductdismantleRequestMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/ProductionDetailController.java

@@ -1,34 +1,32 @@
 package com.win.module.wms.controller.production;
 
+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.production.vo.*;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-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 com.win.module.wms.convert.production.ProductionDetailConvert;
+import com.win.module.wms.dal.dataobject.production.ProductionDetailDO;
+import com.win.module.wms.service.production.ProductionDetailService;
 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.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+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 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.production.vo.*;
-import com.win.module.wms.dal.dataobject.production.ProductionDetailDO;
-import com.win.module.wms.convert.production.ProductionDetailConvert;
-import com.win.module.wms.service.production.ProductionDetailService;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 生产计划子")
 @RestController
@@ -109,4 +107,18 @@ public class ProductionDetailController {
         ExcelUtils.write(response, "生产计划子.xls", "数据", ProductionDetailExcelVO.class, datas);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得生产计划子分页")
+    @PreAuthorize("@ss.hasPermission('wms:production-detail:query')")
+    public CommonResult<PageResult<ProductionDetailRespVO>> getProductionDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductionDetailDO> pageResult = productionDetailService.getProductionDetailSenior(conditions);
+        PageResult<ProductionDetailRespVO> result = ProductionDetailConvert.INSTANCE.convertPage(pageResult);
+        for(ProductionDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/ProductionMainController.java

@@ -1,34 +1,32 @@
 package com.win.module.wms.controller.production;
 
+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.production.vo.*;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-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 com.win.module.wms.convert.production.ProductionMainConvert;
+import com.win.module.wms.dal.dataobject.production.ProductionMainDO;
+import com.win.module.wms.service.production.ProductionMainService;
 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.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+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 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.production.vo.*;
-import com.win.module.wms.dal.dataobject.production.ProductionMainDO;
-import com.win.module.wms.convert.production.ProductionMainConvert;
-import com.win.module.wms.service.production.ProductionMainService;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 生产计划主")
 @RestController
@@ -109,4 +107,18 @@ public class ProductionMainController {
         ExcelUtils.write(response, "生产计划主.xls", "数据", ProductionMainExcelVO.class, datas);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得生产计划主分页")
+    @PreAuthorize("@ss.hasPermission('wms:production-main:query')")
+    public CommonResult<PageResult<ProductionMainRespVO>> getProductionMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductionMainDO> pageResult = productionMainService.getProductionMainSenior(conditions);
+        PageResult<ProductionMainRespVO> result = ProductionMainConvert.INSTANCE.convertPage(pageResult);
+        for(ProductionMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionline/ProductionlineController.java

@@ -1,13 +1,13 @@
 package com.win.module.wms.controller.productionline;
 
 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.dict.core.util.DictFrameworkUtils;
 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.productionline.vo.ProductionlineImportExcelVO;
 import com.win.module.wms.controller.productionline.vo.*;
 import com.win.module.wms.convert.productionline.ProductionlineConvert;
 import com.win.module.wms.dal.dataobject.productionline.ProductionlineDO;
@@ -145,4 +145,18 @@ public class ProductionlineController {
             returnMap.put("errorFile", url);
         }
     }
+
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得生产线分页")
+    @PreAuthorize("@ss.hasPermission('wms:productionline:query')")
+    public CommonResult<PageResult<ProductionlineRespVO>> getProductionlineSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductionlineDO> pageResult = productionlineService.getProductionlineSenior(conditions);
+        PageResult<ProductionlineRespVO> result = ProductionlineConvert.INSTANCE.convertPage(pageResult);
+        for(ProductionlineRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/ProductionlineitemController.java

@@ -1,13 +1,13 @@
 package com.win.module.wms.controller.productionlineitem;
 
 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.dict.core.util.DictFrameworkUtils;
 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.productionlineitem.vo.ProductionlineItemImportExcelVO;
 import com.win.module.wms.controller.productionlineitem.vo.*;
 import com.win.module.wms.convert.productionlineitem.ProductionlineitemConvert;
 import com.win.module.wms.dal.dataobject.productionlineitem.ProductionlineitemDO;
@@ -144,4 +144,18 @@ public class ProductionlineitemController {
             returnMap.put("errorFile", url);
         }
     }
+
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得生产线物料关系分页")
+    @PreAuthorize("@ss.hasPermission('wms:productionlineitem:query')")
+    public CommonResult<PageResult<ProductionlineitemRespVO>> getProductionlineitemSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductionlineitemDO> pageResult = productionlineitemService.getProductionlineitemSenior(conditions);
+        PageResult<ProductionlineitemRespVO> result = ProductionlineitemConvert.INSTANCE.convertPage(pageResult);
+        for(ProductionlineitemRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/ProductionreceiptJobDetailController.java

@@ -1,34 +1,32 @@
 package com.win.module.wms.controller.productionreceiptJob;
 
+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.productionreceiptJob.vo.*;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-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 com.win.module.wms.convert.productionreceiptJob.ProductionreceiptJobDetailConvert;
+import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobDetailDO;
+import com.win.module.wms.service.productionreceiptJob.ProductionreceiptJobDetailService;
 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.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+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 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.productionreceiptJob.vo.*;
-import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobDetailDO;
-import com.win.module.wms.convert.productionreceiptJob.ProductionreceiptJobDetailConvert;
-import com.win.module.wms.service.productionreceiptJob.ProductionreceiptJobDetailService;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 生产收料任务子")
 @RestController
@@ -110,4 +108,18 @@ public class ProductionreceiptJobDetailController {
         ExcelUtils.write(response, "生产收料任务子.xls", "数据", ProductionreceiptJobDetailExcelVO.class, datas);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得生产收料任务子分页")
+    @PreAuthorize("@ss.hasPermission('wms:productionreceipt-job-detail:query')")
+    public CommonResult<PageResult<ProductionreceiptJobDetailRespVO>> getProductionreceiptJobDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductionreceiptJobDetailDO> pageResult = productionreceiptJobDetailService.getProductionreceiptJobDetailSenior(conditions);
+        PageResult<ProductionreceiptJobDetailRespVO> result = ProductionreceiptJobDetailConvert.INSTANCE.convertPage(pageResult);
+        for(ProductionreceiptJobDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/ProductionreceiptJobMainController.java

@@ -1,34 +1,32 @@
 package com.win.module.wms.controller.productionreceiptJob;
 
+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.productionreceiptJob.vo.*;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-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 com.win.module.wms.convert.productionreceiptJob.ProductionreceiptJobMainConvert;
+import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobMainDO;
+import com.win.module.wms.service.productionreceiptJob.ProductionreceiptJobMainService;
 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.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+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 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.productionreceiptJob.vo.*;
-import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobMainDO;
-import com.win.module.wms.convert.productionreceiptJob.ProductionreceiptJobMainConvert;
-import com.win.module.wms.service.productionreceiptJob.ProductionreceiptJobMainService;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 生产收料任务主")
 @RestController
@@ -108,4 +106,18 @@ public class ProductionreceiptJobMainController {
         ExcelUtils.write(response, "生产收料任务主.xls", "数据", ProductionreceiptJobMainExcelVO.class, datas);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得生产收料任务主分页")
+    @PreAuthorize("@ss.hasPermission('wms:productionreceipt-job-main:query')")
+    public CommonResult<PageResult<ProductionreceiptJobMainRespVO>> getProductionreceiptJobMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductionreceiptJobMainDO> pageResult = productionreceiptJobMainService.getProductionreceiptJobMainSenior(conditions);
+        PageResult<ProductionreceiptJobMainRespVO> result = ProductionreceiptJobMainConvert.INSTANCE.convertPage(pageResult);
+        for(ProductionreceiptJobMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/ProductionreceiptRecordDetailController.java

@@ -1,34 +1,32 @@
 package com.win.module.wms.controller.productionreceiptRecord;
 
+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.productionreceiptRecord.vo.*;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-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 com.win.module.wms.convert.productionreceiptRecord.ProductionreceiptRecordDetailConvert;
+import com.win.module.wms.dal.dataobject.productionreceiptRecord.ProductionreceiptRecordDetailDO;
+import com.win.module.wms.service.productionreceiptRecord.ProductionreceiptRecordDetailService;
 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.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+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 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.productionreceiptRecord.vo.*;
-import com.win.module.wms.dal.dataobject.productionreceiptRecord.ProductionreceiptRecordDetailDO;
-import com.win.module.wms.convert.productionreceiptRecord.ProductionreceiptRecordDetailConvert;
-import com.win.module.wms.service.productionreceiptRecord.ProductionreceiptRecordDetailService;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 生产收料记录子")
 @RestController
@@ -108,4 +106,18 @@ public class ProductionreceiptRecordDetailController {
         ExcelUtils.write(response, "生产收料记录子.xls", "数据", ProductionreceiptRecordDetailExcelVO.class, datas);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得生产收料记录子分页")
+    @PreAuthorize("@ss.hasPermission('wms:productionreceipt-record-detail:query')")
+    public CommonResult<PageResult<ProductionreceiptRecordDetailRespVO>> getProductionreceiptRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductionreceiptRecordDetailDO> pageResult = productionreceiptRecordDetailService.getProductionreceiptRecordDetailSenior(conditions);
+        PageResult<ProductionreceiptRecordDetailRespVO> result = ProductionreceiptRecordDetailConvert.INSTANCE.convertPage(pageResult);
+        for(ProductionreceiptRecordDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/ProductionreceiptRecordMainController.java

@@ -1,34 +1,32 @@
 package com.win.module.wms.controller.productionreceiptRecord;
 
+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.productionreceiptRecord.vo.*;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-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 com.win.module.wms.convert.productionreceiptRecord.ProductionreceiptRecordMainConvert;
+import com.win.module.wms.dal.dataobject.productionreceiptRecord.ProductionreceiptRecordMainDO;
+import com.win.module.wms.service.productionreceiptRecord.ProductionreceiptRecordMainService;
 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.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+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 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.productionreceiptRecord.vo.*;
-import com.win.module.wms.dal.dataobject.productionreceiptRecord.ProductionreceiptRecordMainDO;
-import com.win.module.wms.convert.productionreceiptRecord.ProductionreceiptRecordMainConvert;
-import com.win.module.wms.service.productionreceiptRecord.ProductionreceiptRecordMainService;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 生产收料记录主")
 @RestController
@@ -109,4 +107,18 @@ public class ProductionreceiptRecordMainController {
         ExcelUtils.write(response, "生产收料记录主.xls", "数据", ProductionreceiptRecordMainExcelVO.class, datas);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得生产收料记录主分页")
+    @PreAuthorize("@ss.hasPermission('wms:productionreceipt-record-main:query')")
+    public CommonResult<PageResult<ProductionreceiptRecordMainRespVO>> getProductionreceiptRecordMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductionreceiptRecordMainDO> pageResult = productionreceiptRecordMainService.getProductionreceiptRecordMainSenior(conditions);
+        PageResult<ProductionreceiptRecordMainRespVO> result = ProductionreceiptRecordMainConvert.INSTANCE.convertPage(pageResult);
+        for(ProductionreceiptRecordMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/ProductionreturnJobDetailController.java

@@ -1,34 +1,32 @@
 package com.win.module.wms.controller.productionreturnJob;
 
+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.productionreturnJob.vo.*;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-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 com.win.module.wms.convert.productionreturnJob.ProductionreturnJobDetailConvert;
+import com.win.module.wms.dal.dataobject.productionreturnJob.ProductionreturnJobDetailDO;
+import com.win.module.wms.service.productionreturnJob.ProductionreturnJobDetailService;
 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.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+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 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.productionreturnJob.vo.*;
-import com.win.module.wms.dal.dataobject.productionreturnJob.ProductionreturnJobDetailDO;
-import com.win.module.wms.convert.productionreturnJob.ProductionreturnJobDetailConvert;
-import com.win.module.wms.service.productionreturnJob.ProductionreturnJobDetailService;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 生产退料任务子")
 @RestController
@@ -109,4 +107,18 @@ public class ProductionreturnJobDetailController {
         ExcelUtils.write(response, "生产退料任务子.xls", "数据", ProductionreturnJobDetailExcelVO.class, datas);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得生产退料任务子分页")
+    @PreAuthorize("@ss.hasPermission('wms:productionreturn-job-detail:query')")
+    public CommonResult<PageResult<ProductionreturnJobDetailRespVO>> getProductionreturnJobDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductionreturnJobDetailDO> pageResult = productionreturnJobDetailService.getProductionreturnJobDetailSenior(conditions);
+        PageResult<ProductionreturnJobDetailRespVO> result = ProductionreturnJobDetailConvert.INSTANCE.convertPage(pageResult);
+        for(ProductionreturnJobDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/ProductionreturnJobMainController.java

@@ -1,34 +1,32 @@
 package com.win.module.wms.controller.productionreturnJob;
 
+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.productionreturnJob.vo.*;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-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 com.win.module.wms.convert.productionreturnJob.ProductionreturnJobMainConvert;
+import com.win.module.wms.dal.dataobject.productionreturnJob.ProductionreturnJobMainDO;
+import com.win.module.wms.service.productionreturnJob.ProductionreturnJobMainService;
 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.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+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 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.productionreturnJob.vo.*;
-import com.win.module.wms.dal.dataobject.productionreturnJob.ProductionreturnJobMainDO;
-import com.win.module.wms.convert.productionreturnJob.ProductionreturnJobMainConvert;
-import com.win.module.wms.service.productionreturnJob.ProductionreturnJobMainService;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 生产退料任务主")
 @RestController
@@ -109,4 +107,18 @@ public class ProductionreturnJobMainController {
         ExcelUtils.write(response, "生产退料任务主.xls", "数据", ProductionreturnJobMainExcelVO.class, datas);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得生产退料任务主分页")
+    @PreAuthorize("@ss.hasPermission('wms:productionreturn-job-main:query')")
+    public CommonResult<PageResult<ProductionreturnJobMainRespVO>> getProductionreturnJobMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductionreturnJobMainDO> pageResult = productionreturnJobMainService.getProductionreturnJobMainSenior(conditions);
+        PageResult<ProductionreturnJobMainRespVO> result = ProductionreturnJobMainConvert.INSTANCE.convertPage(pageResult);
+        for(ProductionreturnJobMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/ProductionreturnRecordDetailController.java

@@ -1,34 +1,32 @@
 package com.win.module.wms.controller.productionreturnRecord;
 
+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.productionreturnRecord.vo.*;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-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 com.win.module.wms.convert.productionreturnRecord.ProductionreturnRecordDetailConvert;
+import com.win.module.wms.dal.dataobject.productionreturnRecord.ProductionreturnRecordDetailDO;
+import com.win.module.wms.service.productionreturnRecord.ProductionreturnRecordDetailService;
 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.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+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 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.productionreturnRecord.vo.*;
-import com.win.module.wms.dal.dataobject.productionreturnRecord.ProductionreturnRecordDetailDO;
-import com.win.module.wms.convert.productionreturnRecord.ProductionreturnRecordDetailConvert;
-import com.win.module.wms.service.productionreturnRecord.ProductionreturnRecordDetailService;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 生产退料记录子")
 @RestController
@@ -109,4 +107,18 @@ public class ProductionreturnRecordDetailController {
         ExcelUtils.write(response, "生产退料记录子.xls", "数据", ProductionreturnRecordDetailExcelVO.class, datas);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得生产退料记录子分页")
+    @PreAuthorize("@ss.hasPermission('wms:productionreturn-record-detail:query')")
+    public CommonResult<PageResult<ProductionreturnRecordDetailRespVO>> getProductionreturnRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductionreturnRecordDetailDO> pageResult = productionreturnRecordDetailService.getProductionreturnRecordDetailSenior(conditions);
+        PageResult<ProductionreturnRecordDetailRespVO> result = ProductionreturnRecordDetailConvert.INSTANCE.convertPage(pageResult);
+        for(ProductionreturnRecordDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/ProductionreturnRecordMainController.java

@@ -1,34 +1,32 @@
 package com.win.module.wms.controller.productionreturnRecord;
 
+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.productionreturnRecord.vo.*;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-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 com.win.module.wms.convert.productionreturnRecord.ProductionreturnRecordMainConvert;
+import com.win.module.wms.dal.dataobject.productionreturnRecord.ProductionreturnRecordMainDO;
+import com.win.module.wms.service.productionreturnRecord.ProductionreturnRecordMainService;
 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.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+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 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.productionreturnRecord.vo.*;
-import com.win.module.wms.dal.dataobject.productionreturnRecord.ProductionreturnRecordMainDO;
-import com.win.module.wms.convert.productionreturnRecord.ProductionreturnRecordMainConvert;
-import com.win.module.wms.service.productionreturnRecord.ProductionreturnRecordMainService;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 生产退料记录主")
 @RestController
@@ -109,4 +107,19 @@ public class ProductionreturnRecordMainController {
         ExcelUtils.write(response, "生产退料记录主.xls", "数据", ProductionreturnRecordMainExcelVO.class, datas);
     }
 
+
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得生产退料记录主分页")
+    @PreAuthorize("@ss.hasPermission('wms:productionreturn-record-main:query')")
+    public CommonResult<PageResult<ProductionreturnRecordMainRespVO>> getProductionreturnRecordMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductionreturnRecordMainDO> pageResult = productionreturnRecordMainService.getProductionreturnRecordMainSenior(conditions);
+        PageResult<ProductionreturnRecordMainRespVO> result = ProductionreturnRecordMainConvert.INSTANCE.convertPage(pageResult);
+        for(ProductionreturnRecordMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/ProductionreturnRequestDetailController.java

@@ -1,34 +1,32 @@
 package com.win.module.wms.controller.productionreturnRequest;
 
+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.productionreturnRequest.vo.*;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-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 com.win.module.wms.convert.productionreturnRequest.ProductionreturnRequestDetailConvert;
+import com.win.module.wms.dal.dataobject.productionreturnRequest.ProductionreturnRequestDetailDO;
+import com.win.module.wms.service.productionreturnRequest.ProductionreturnRequestDetailService;
 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.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+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 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.productionreturnRequest.vo.*;
-import com.win.module.wms.dal.dataobject.productionreturnRequest.ProductionreturnRequestDetailDO;
-import com.win.module.wms.convert.productionreturnRequest.ProductionreturnRequestDetailConvert;
-import com.win.module.wms.service.productionreturnRequest.ProductionreturnRequestDetailService;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 生产退料申请子")
 @RestController
@@ -109,4 +107,18 @@ public class ProductionreturnRequestDetailController {
         ExcelUtils.write(response, "生产退料申请子.xls", "数据", ProductionreturnRequestDetailExcelVO.class, datas);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得生产退料申请子分页")
+    @PreAuthorize("@ss.hasPermission('wms:productionreturn-request-detail:query')")
+    public CommonResult<PageResult<ProductionreturnRequestDetailRespVO>> getProductionreturnRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductionreturnRequestDetailDO> pageResult = productionreturnRequestDetailService.getProductionreturnRequestDetailSenior(conditions);
+        PageResult<ProductionreturnRequestDetailRespVO> result = ProductionreturnRequestDetailConvert.INSTANCE.convertPage(pageResult);
+        for(ProductionreturnRequestDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/ProductionreturnRequestMainController.java

@@ -1,34 +1,32 @@
 package com.win.module.wms.controller.productionreturnRequest;
 
+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.productionreturnRequest.vo.*;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-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 com.win.module.wms.convert.productionreturnRequest.ProductionreturnRequestMainConvert;
+import com.win.module.wms.dal.dataobject.productionreturnRequest.ProductionreturnRequestMainDO;
+import com.win.module.wms.service.productionreturnRequest.ProductionreturnRequestMainService;
 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.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+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 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.productionreturnRequest.vo.*;
-import com.win.module.wms.dal.dataobject.productionreturnRequest.ProductionreturnRequestMainDO;
-import com.win.module.wms.convert.productionreturnRequest.ProductionreturnRequestMainConvert;
-import com.win.module.wms.service.productionreturnRequest.ProductionreturnRequestMainService;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 生产退料申请主")
 @RestController
@@ -109,4 +107,18 @@ public class ProductionreturnRequestMainController {
         ExcelUtils.write(response, "生产退料申请主.xls", "数据", ProductionreturnRequestMainExcelVO.class, datas);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得生产退料申请主分页")
+    @PreAuthorize("@ss.hasPermission('wms:productionreturn-request-main:query')")
+    public CommonResult<PageResult<ProductionreturnRequestMainRespVO>> getProductionreturnRequestMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductionreturnRequestMainDO> pageResult = productionreturnRequestMainService.getProductionreturnRequestMainSenior(conditions);
+        PageResult<ProductionreturnRequestMainRespVO> result = ProductionreturnRequestMainConvert.INSTANCE.convertPage(pageResult);
+        for(ProductionreturnRequestMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/ProductputawayJobDetailController.java

@@ -1,34 +1,32 @@
 package com.win.module.wms.controller.productputawayJob;
 
+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.productputawayJob.vo.*;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-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 com.win.module.wms.convert.productputawayJob.ProductputawayJobDetailConvert;
+import com.win.module.wms.dal.dataobject.productputawayJob.ProductputawayJobDetailDO;
+import com.win.module.wms.service.productputawayJob.ProductputawayJobDetailService;
 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.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+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 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.productputawayJob.vo.*;
-import com.win.module.wms.dal.dataobject.productputawayJob.ProductputawayJobDetailDO;
-import com.win.module.wms.convert.productputawayJob.ProductputawayJobDetailConvert;
-import com.win.module.wms.service.productputawayJob.ProductputawayJobDetailService;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 制品上架任务子")
 @RestController
@@ -108,4 +106,18 @@ public class ProductputawayJobDetailController {
         ExcelUtils.write(response, "制品上架任务子.xls", "数据", ProductputawayJobDetailExcelVO.class, datas);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得制品上架任务子分页")
+    @PreAuthorize("@ss.hasPermission('wms:productputaway-job-detail:query')")
+    public CommonResult<PageResult<ProductputawayJobDetailRespVO>> getProductputawayJobDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductputawayJobDetailDO> pageResult = productputawayJobDetailService.getProductputawayJobDetailSeniorList(conditions);
+        PageResult<ProductputawayJobDetailRespVO> result = ProductputawayJobDetailConvert.INSTANCE.convertPage(pageResult);
+        for(ProductputawayJobDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/ProductputawayJobMainController.java

@@ -1,34 +1,32 @@
 package com.win.module.wms.controller.productputawayJob;
 
+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.productputawayJob.vo.*;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-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 com.win.module.wms.convert.productputawayJob.ProductputawayJobMainConvert;
+import com.win.module.wms.dal.dataobject.productputawayJob.ProductputawayJobMainDO;
+import com.win.module.wms.service.productputawayJob.ProductputawayJobMainService;
 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.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+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 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.productputawayJob.vo.*;
-import com.win.module.wms.dal.dataobject.productputawayJob.ProductputawayJobMainDO;
-import com.win.module.wms.convert.productputawayJob.ProductputawayJobMainConvert;
-import com.win.module.wms.service.productputawayJob.ProductputawayJobMainService;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 制品上架任务主")
 @RestController
@@ -109,4 +107,18 @@ public class ProductputawayJobMainController {
         ExcelUtils.write(response, "制品上架任务主.xls", "数据", ProductputawayJobMainExcelVO.class, datas);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得制品上架任务主分页")
+    @PreAuthorize("@ss.hasPermission('wms:productputaway-job-main:query')")
+    public CommonResult<PageResult<ProductputawayJobMainRespVO>> getProductputawayJobMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductputawayJobMainDO> pageResult = productputawayJobMainService.getProductputawayJobMainSenior(conditions);
+        PageResult<ProductputawayJobMainRespVO> result = ProductputawayJobMainConvert.INSTANCE.convertPage(pageResult);
+        for(ProductputawayJobMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/ProductputawayRecordDetailController.java

@@ -1,34 +1,32 @@
 package com.win.module.wms.controller.productputawayRecord;
 
+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.productputawayRecord.vo.*;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-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 com.win.module.wms.convert.productputawayRecord.ProductputawayRecordDetailConvert;
+import com.win.module.wms.dal.dataobject.productputawayRecord.ProductputawayRecordDetailDO;
+import com.win.module.wms.service.productputawayRecord.ProductputawayRecordDetailService;
 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.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+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 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.productputawayRecord.vo.*;
-import com.win.module.wms.dal.dataobject.productputawayRecord.ProductputawayRecordDetailDO;
-import com.win.module.wms.convert.productputawayRecord.ProductputawayRecordDetailConvert;
-import com.win.module.wms.service.productputawayRecord.ProductputawayRecordDetailService;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 制品上架记录子")
 @RestController
@@ -109,4 +107,18 @@ public class ProductputawayRecordDetailController {
         ExcelUtils.write(response, "制品上架记录子.xls", "数据", ProductputawayRecordDetailExcelVO.class, datas);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得制品上架记录子分页")
+    @PreAuthorize("@ss.hasPermission('wms:productputaway-record-detail:query')")
+    public CommonResult<PageResult<ProductputawayRecordDetailRespVO>> getProductputawayRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductputawayRecordDetailDO> pageResult = productputawayRecordDetailService.getProductputawayRecordDetailSenior(conditions);
+        PageResult<ProductputawayRecordDetailRespVO> result = ProductputawayRecordDetailConvert.INSTANCE.convertPage(pageResult);
+        for(ProductputawayRecordDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/ProductputawayRecordMainController.java

@@ -1,34 +1,32 @@
 package com.win.module.wms.controller.productputawayRecord;
 
+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.productputawayRecord.vo.*;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-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 com.win.module.wms.convert.productputawayRecord.ProductputawayRecordMainConvert;
+import com.win.module.wms.dal.dataobject.productputawayRecord.ProductputawayRecordMainDO;
+import com.win.module.wms.service.productputawayRecord.ProductputawayRecordMainService;
 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.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+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 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.productputawayRecord.vo.*;
-import com.win.module.wms.dal.dataobject.productputawayRecord.ProductputawayRecordMainDO;
-import com.win.module.wms.convert.productputawayRecord.ProductputawayRecordMainConvert;
-import com.win.module.wms.service.productputawayRecord.ProductputawayRecordMainService;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 制品上架记录主")
 @RestController
@@ -109,4 +107,18 @@ public class ProductputawayRecordMainController {
         ExcelUtils.write(response, "制品上架记录主.xls", "数据", ProductputawayRecordMainExcelVO.class, datas);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得制品上架记录主分页")
+    @PreAuthorize("@ss.hasPermission('wms:productputaway-record-main:query')")
+    public CommonResult<PageResult<ProductputawayRecordMainRespVO>> getProductputawayRecordMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductputawayRecordMainDO> pageResult = productputawayRecordMainService.getProductputawayRecordMainSenior(conditions);
+        PageResult<ProductputawayRecordMainRespVO> result = ProductputawayRecordMainConvert.INSTANCE.convertPage(pageResult);
+        for(ProductputawayRecordMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/ProductputawayRequestDetailController.java

@@ -1,34 +1,32 @@
 package com.win.module.wms.controller.productputawayRequest;
 
+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.productputawayRequest.vo.*;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-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 com.win.module.wms.convert.productputawayRequest.ProductputawayRequestDetailConvert;
+import com.win.module.wms.dal.dataobject.productputawayRequest.ProductputawayRequestDetailDO;
+import com.win.module.wms.service.productputawayRequest.ProductputawayRequestDetailService;
 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.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+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 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.productputawayRequest.vo.*;
-import com.win.module.wms.dal.dataobject.productputawayRequest.ProductputawayRequestDetailDO;
-import com.win.module.wms.convert.productputawayRequest.ProductputawayRequestDetailConvert;
-import com.win.module.wms.service.productputawayRequest.ProductputawayRequestDetailService;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 制品上架申请子")
 @RestController
@@ -109,4 +107,18 @@ public class ProductputawayRequestDetailController {
         ExcelUtils.write(response, "制品上架申请子.xls", "数据", ProductputawayRequestDetailExcelVO.class, datas);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得制品上架申请子分页")
+    @PreAuthorize("@ss.hasPermission('wms:productputaway-request-detail:query')")
+    public CommonResult<PageResult<ProductputawayRequestDetailRespVO>> getProductputawayRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductputawayRequestDetailDO> pageResult = productputawayRequestDetailService.getProductputawayRequestDetailSenior(conditions);
+        PageResult<ProductputawayRequestDetailRespVO> result = ProductputawayRequestDetailConvert.INSTANCE.convertPage(pageResult);
+        for(ProductputawayRequestDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/ProductputawayRequestMainController.java

@@ -1,34 +1,32 @@
 package com.win.module.wms.controller.productputawayRequest;
 
+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.productputawayRequest.vo.*;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-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 com.win.module.wms.convert.productputawayRequest.ProductputawayRequestMainConvert;
+import com.win.module.wms.dal.dataobject.productputawayRequest.ProductputawayRequestMainDO;
+import com.win.module.wms.service.productputawayRequest.ProductputawayRequestMainService;
 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.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+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 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.productputawayRequest.vo.*;
-import com.win.module.wms.dal.dataobject.productputawayRequest.ProductputawayRequestMainDO;
-import com.win.module.wms.convert.productputawayRequest.ProductputawayRequestMainConvert;
-import com.win.module.wms.service.productputawayRequest.ProductputawayRequestMainService;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 制品上架申请主")
 @RestController
@@ -108,5 +106,19 @@ public class ProductputawayRequestMainController {
         }
         ExcelUtils.write(response, "制品上架申请主.xls", "数据", ProductputawayRequestMainExcelVO.class, datas);
     }
+    
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得制品上架申请主分页")
+    @PreAuthorize("@ss.hasPermission('wms:productputaway-request-main:query')")
+    public CommonResult<PageResult<ProductputawayRequestMainRespVO>> getProductputawayRequestMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductputawayRequestMainDO> pageResult = productputawayRequestMainService.getProductputawayRequestMainSenior(conditions);
+        PageResult<ProductputawayRequestMainRespVO> result = ProductputawayRequestMainConvert.INSTANCE.convertPage(pageResult);
+        for(ProductputawayRequestMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/ProductreceiptJobDetailController.java

@@ -1,33 +1,32 @@
 package com.win.module.wms.controller.productreceiptJob;
 
+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.productreceiptJob.vo.*;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-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 com.win.module.wms.convert.productreceiptJob.ProductreceiptJobDetailConvert;
+import com.win.module.wms.dal.dataobject.productreceiptJob.ProductreceiptJobDetailDO;
+import com.win.module.wms.service.productreceiptJob.ProductreceiptJobDetailService;
 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.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+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 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.productreceiptJob.vo.*;
-import com.win.module.wms.dal.dataobject.productreceiptJob.ProductreceiptJobDetailDO;
-import com.win.module.wms.convert.productreceiptJob.ProductreceiptJobDetailConvert;
-import com.win.module.wms.service.productreceiptJob.ProductreceiptJobDetailService;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 制品收货任务子")
 @RestController
@@ -103,4 +102,18 @@ public class ProductreceiptJobDetailController {
         ExcelUtils.write(response, "制品收货任务子.xls", "数据", ProductreceiptJobDetailExcelVO.class, datas);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得制品收货任务子分页")
+    @PreAuthorize("@ss.hasPermission('wms:productreceipt-job-detail:query')")
+    public CommonResult<PageResult<ProductreceiptJobDetailRespVO>> getProductreceiptJobDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductreceiptJobDetailDO> pageResult = productreceiptJobDetailService.getProductreceiptJobDetailSenior(conditions);
+        PageResult<ProductreceiptJobDetailRespVO> result = ProductreceiptJobDetailConvert.INSTANCE.convertPage(pageResult);
+        for(ProductreceiptJobDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/ProductreceiptJobMainController.java

@@ -1,34 +1,35 @@
 package com.win.module.wms.controller.productreceiptJob;
 
+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.accountcalendar.vo.ProductreceiptJobMainRespVO;
 import com.win.module.wms.controller.productreceiptJob.vo.*;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-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 com.win.module.wms.convert.accountcalendar.ProductreceiptJobMainConvert;
+import com.win.module.wms.convert.productreceiptJob.ProductreceiptJobMainConvert;
+import com.win.module.wms.dal.dataobject.accountcalendar.ProductreceiptJobMainDO;
+import com.win.module.wms.dal.dataobject.productreceiptJob.ProductreceiptJobMainDO;
+import com.win.module.wms.service.productreceiptJob.ProductreceiptJobMainService;
 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.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+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 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.productreceiptJob.vo.*;
-import com.win.module.wms.dal.dataobject.productreceiptJob.ProductreceiptJobMainDO;
-import com.win.module.wms.convert.productreceiptJob.ProductreceiptJobMainConvert;
-import com.win.module.wms.service.productreceiptJob.ProductreceiptJobMainService;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 制品收货任务主")
 @RestController
@@ -109,4 +110,19 @@ public class ProductreceiptJobMainController {
         ExcelUtils.write(response, "制品收货任务主.xls", "数据", ProductreceiptJobMainExcelVO.class, datas);
     }
 
+
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得制品收货任务主分页")
+    @PreAuthorize("@ss.hasPermission('wms:productreceipt-job-main:query')")
+    public CommonResult<PageResult<ProductreceiptJobMainRespVO>> getProductreceiptJobMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductreceiptJobMainDO> pageResult = productreceiptJobMainService.getProductreceiptJobMainSenior(conditions);
+        PageResult<ProductreceiptJobMainRespVO> result = ProductreceiptJobMainConvert.INSTANCE.convertPage(pageResult);
+        for(ProductreceiptJobMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/BackflushRecordDetailbController.java

@@ -1,13 +1,17 @@
 package com.win.module.wms.controller.productreceiptRecord;
 
 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.accountcalendar.vo.BackflushRecordDetailbRespVO;
 import com.win.module.wms.controller.productreceiptRecord.vo.*;
+import com.win.module.wms.convert.accountcalendar.BackflushRecordDetailbConvert;
 import com.win.module.wms.convert.productreceiptRecord.BackflushRecordDetailbConvert;
+import com.win.module.wms.dal.dataobject.accountcalendar.BackflushRecordDetailbDO;
 import com.win.module.wms.dal.dataobject.productreceiptRecord.BackflushRecordDetailbDO;
 import com.win.module.wms.service.productreceiptRecord.BackflushRecordDetailbService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -105,4 +109,19 @@ public class BackflushRecordDetailbController {
         ExcelUtils.write(response, "制品收货记录子.xls", "数据", BackflushRecordDetailbExcelVO.class, datas);
     }
 
+
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得制品收货记录子分页")
+    @PreAuthorize("@ss.hasPermission('wms:backflush-record-detailb:query')")
+    public CommonResult<PageResult<BackflushRecordDetailbRespVO>> getBackflushRecordDetailbSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<BackflushRecordDetailbDO> pageResult = backflushRecordDetailbService.getBackflushRecordDetailbSenior(conditions);
+        PageResult<BackflushRecordDetailbRespVO> result = BackflushRecordDetailbConvert.INSTANCE.convertPage(pageResult);
+        for(BackflushRecordDetailbRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/ProductreceiptRecordDetailController.java

@@ -1,34 +1,35 @@
 package com.win.module.wms.controller.productreceiptRecord;
 
+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.accountcalendar.vo.ProductreceiptRecordDetailRespVO;
 import com.win.module.wms.controller.productreceiptRecord.vo.*;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-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 com.win.module.wms.convert.accountcalendar.ProductreceiptRecordDetailConvert;
+import com.win.module.wms.convert.productreceiptRecord.ProductreceiptRecordDetailConvert;
+import com.win.module.wms.dal.dataobject.accountcalendar.ProductreceiptRecordDetailDO;
+import com.win.module.wms.dal.dataobject.productreceiptRecord.ProductreceiptRecordDetailDO;
+import com.win.module.wms.service.productreceiptRecord.ProductreceiptRecordDetailService;
 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.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+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 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.productreceiptRecord.vo.*;
-import com.win.module.wms.dal.dataobject.productreceiptRecord.ProductreceiptRecordDetailDO;
-import com.win.module.wms.convert.productreceiptRecord.ProductreceiptRecordDetailConvert;
-import com.win.module.wms.service.productreceiptRecord.ProductreceiptRecordDetailService;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 制品收货记录子")
 @RestController
@@ -109,4 +110,18 @@ public class ProductreceiptRecordDetailController {
         ExcelUtils.write(response, "制品收货记录子.xls", "数据", ProductreceiptRecordDetailExcelVO.class, datas);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得制品收货记录子分页")
+    @PreAuthorize("@ss.hasPermission('wms:productreceipt-record-detail:query')")
+    public CommonResult<PageResult<ProductreceiptRecordDetailRespVO>> getProductreceiptRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductreceiptRecordDetailDO> pageResult = productreceiptRecordDetailService.getProductreceiptRecordDetailSenior(conditions);
+        PageResult<ProductreceiptRecordDetailRespVO> result = ProductreceiptRecordDetailConvert.INSTANCE.convertPage(pageResult);
+        for(ProductreceiptRecordDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/ProductreceiptRecordMainController.java

@@ -1,34 +1,35 @@
 package com.win.module.wms.controller.productreceiptRecord;
 
+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.accountcalendar.vo.ProductreceiptRecordMainRespVO;
 import com.win.module.wms.controller.productreceiptRecord.vo.*;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-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 com.win.module.wms.convert.accountcalendar.ProductreceiptRecordMainConvert;
+import com.win.module.wms.convert.productreceiptRecord.ProductreceiptRecordMainConvert;
+import com.win.module.wms.dal.dataobject.accountcalendar.ProductreceiptRecordMainDO;
+import com.win.module.wms.dal.dataobject.productreceiptRecord.ProductreceiptRecordMainDO;
+import com.win.module.wms.service.productreceiptRecord.ProductreceiptRecordMainService;
 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.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+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 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.productreceiptRecord.vo.*;
-import com.win.module.wms.dal.dataobject.productreceiptRecord.ProductreceiptRecordMainDO;
-import com.win.module.wms.convert.productreceiptRecord.ProductreceiptRecordMainConvert;
-import com.win.module.wms.service.productreceiptRecord.ProductreceiptRecordMainService;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 制品收货记录主")
 @RestController
@@ -109,4 +110,18 @@ public class ProductreceiptRecordMainController {
         ExcelUtils.write(response, "制品收货记录主.xls", "数据", ProductreceiptRecordMainExcelVO.class, datas);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得制品收货记录主分页")
+    @PreAuthorize("@ss.hasPermission('wms:productreceipt-record-main:query')")
+    public CommonResult<PageResult<ProductreceiptRecordMainRespVO>> getProductreceiptRecordMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductreceiptRecordMainDO> pageResult = productreceiptRecordMainService.getProductreceiptRecordMainSenior(conditions);
+        PageResult<ProductreceiptRecordMainRespVO> result = ProductreceiptRecordMainConvert.INSTANCE.convertPage(pageResult);
+        for(ProductreceiptRecordMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+    
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/ProductreceiptRequestDetailController.java

@@ -1,34 +1,35 @@
 package com.win.module.wms.controller.productreceiptRequest;
 
+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.accountcalendar.vo.ProductreceiptRequestDetailRespVO;
 import com.win.module.wms.controller.productreceiptRequest.vo.*;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-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 com.win.module.wms.convert.accountcalendar.ProductreceiptRequestDetailConvert;
+import com.win.module.wms.convert.productreceiptRequest.ProductreceiptRequestDetailConvert;
+import com.win.module.wms.dal.dataobject.accountcalendar.ProductreceiptRequestDetailDO;
+import com.win.module.wms.dal.dataobject.productreceiptRequest.ProductreceiptRequestDetailDO;
+import com.win.module.wms.service.productreceiptRequest.ProductreceiptRequestDetailService;
 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.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+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 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.productreceiptRequest.vo.*;
-import com.win.module.wms.dal.dataobject.productreceiptRequest.ProductreceiptRequestDetailDO;
-import com.win.module.wms.convert.productreceiptRequest.ProductreceiptRequestDetailConvert;
-import com.win.module.wms.service.productreceiptRequest.ProductreceiptRequestDetailService;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 制品收货申请子")
 @RestController
@@ -109,4 +110,17 @@ public class ProductreceiptRequestDetailController {
         ExcelUtils.write(response, "制品收货申请子.xls", "数据", ProductreceiptRequestDetailExcelVO.class, datas);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得制品收货申请子分页")
+    @PreAuthorize("@ss.hasPermission('wms:productreceipt-request-detail:query')")
+    public CommonResult<PageResult<ProductreceiptRequestDetailRespVO>> getProductreceiptRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductreceiptRequestDetailDO> pageResult = productreceiptRequestDetailService.getProductreceiptRequestDetailSenior(conditions);
+        PageResult<ProductreceiptRequestDetailRespVO> result = ProductreceiptRequestDetailConvert.INSTANCE.convertPage(pageResult);
+        for(ProductreceiptRequestDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/ProductreceiptRequestMainController.java

@@ -1,33 +1,35 @@
 package com.win.module.wms.controller.productreceiptRequest;
 
+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.accountcalendar.vo.ProductreceiptRequestMainRespVO;
 import com.win.module.wms.controller.productreceiptRequest.vo.*;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-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 com.win.module.wms.convert.accountcalendar.ProductreceiptRequestMainConvert;
+import com.win.module.wms.convert.productreceiptRequest.ProductreceiptRequestMainConvert;
+import com.win.module.wms.dal.dataobject.accountcalendar.ProductreceiptRequestMainDO;
+import com.win.module.wms.dal.dataobject.productreceiptRequest.ProductreceiptRequestMainDO;
+import com.win.module.wms.service.productreceiptRequest.ProductreceiptRequestMainService;
 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.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+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 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.dal.dataobject.productreceiptRequest.ProductreceiptRequestMainDO;
-import com.win.module.wms.convert.productreceiptRequest.ProductreceiptRequestMainConvert;
-import com.win.module.wms.service.productreceiptRequest.ProductreceiptRequestMainService;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 制品收货申请主")
 @RestController
@@ -108,4 +110,18 @@ public class ProductreceiptRequestMainController {
         ExcelUtils.write(response, "制品收货申请主.xls", "数据", ProductreceiptRequestMainExcelVO.class, datas);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得账期日历分页")
+    @PreAuthorize("@ss.hasPermission('wms:productreceipt-request-main:query')")
+    public CommonResult<PageResult<ProductreceiptRequestMainRespVO>> getProductreceiptRequestMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductreceiptRequestMainDO> pageResult = productreceiptRequestMainService.getProductreceiptRequestMainSenior(conditions);
+        PageResult<ProductreceiptRequestMainRespVO> result = ProductreceiptRequestMainConvert.INSTANCE.convertPage(pageResult);
+        for(ProductreceiptRequestMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
 }

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

@@ -1,6 +1,7 @@
 package com.win.module.wms.controller.productrepairRecord;
 
 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;
@@ -106,4 +107,17 @@ public class ConsumeRecordDetailbController {
         ExcelUtils.write(response, "制品返修记录子.xls", "数据", ConsumeRecordDetailbExcelVO.class, datas);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得制品返修记录子分页")
+    @PreAuthorize("@ss.hasPermission('wms:consume-record-detailb:query')")
+    public CommonResult<PageResult<ConsumeRecordDetailbRespVO>> getConsumeRecordDetailbSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ConsumeRecordDetailbDO> pageResult = consumeRecordDetailbService.getConsumeRecordDetailbSenior(conditions);
+        PageResult<ConsumeRecordDetailbRespVO> result = ConsumeRecordDetailbConvert.INSTANCE.convertPage(pageResult);
+        for(ConsumeRecordDetailbRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
 }

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

@@ -1,34 +1,35 @@
 package com.win.module.wms.controller.productrepairRecord;
 
+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.accountcalendar.vo.ProductrepairRecordDetailRespVO;
 import com.win.module.wms.controller.productrepairRecord.vo.*;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-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 com.win.module.wms.convert.accountcalendar.ProductrepairRecordDetailConvert;
+import com.win.module.wms.convert.productrepairRecord.ProductrepairRecordDetailConvert;
+import com.win.module.wms.dal.dataobject.accountcalendar.ProductrepairRecordDetailDO;
+import com.win.module.wms.dal.dataobject.productrepairRecord.ProductrepairRecordDetailDO;
+import com.win.module.wms.service.productrepairRecord.ProductrepairRecordDetailService;
 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.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+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 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.productrepairRecord.vo.*;
-import com.win.module.wms.dal.dataobject.productrepairRecord.ProductrepairRecordDetailDO;
-import com.win.module.wms.convert.productrepairRecord.ProductrepairRecordDetailConvert;
-import com.win.module.wms.service.productrepairRecord.ProductrepairRecordDetailService;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 制品返修记录子")
 @RestController
@@ -110,4 +111,18 @@ public class ProductrepairRecordDetailController {
         ExcelUtils.write(response, "制品返修记录子.xls", "数据", ProductrepairRecordDetailExcelVO.class, datas);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得制品返修记录子分页")
+    @PreAuthorize("@ss.hasPermission('wms:productrepair-record-detail:query')")
+    public CommonResult<PageResult<ProductrepairRecordDetailRespVO>> getProductrepairRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductrepairRecordDetailDO> pageResult = productrepairRecordDetailService.getProductrepairRecordDetailSenior(conditions);
+        PageResult<ProductrepairRecordDetailRespVO> result = ProductrepairRecordDetailConvert.INSTANCE.convertPage(pageResult);
+        for(ProductrepairRecordDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
 }

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

@@ -1,34 +1,32 @@
 package com.win.module.wms.controller.productrepairRecord;
 
+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.productrepairRecord.vo.*;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-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 com.win.module.wms.convert.productrepairRecord.ProductrepairRecordMainConvert;
+import com.win.module.wms.dal.dataobject.productrepairRecord.ProductrepairRecordMainDO;
+import com.win.module.wms.service.productrepairRecord.ProductrepairRecordMainService;
 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.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+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 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.productrepairRecord.vo.*;
-import com.win.module.wms.dal.dataobject.productrepairRecord.ProductrepairRecordMainDO;
-import com.win.module.wms.convert.productrepairRecord.ProductrepairRecordMainConvert;
-import com.win.module.wms.service.productrepairRecord.ProductrepairRecordMainService;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 制品返修记录主")
 @RestController
@@ -107,5 +105,18 @@ public class ProductrepairRecordMainController {
         }
         ExcelUtils.write(response, "制品返修记录主.xls", "数据", ProductrepairRecordMainExcelVO.class, datas);
     }
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得制品返修记录主分页")
+    @PreAuthorize("@ss.hasPermission('wms:productrepair-record-main:query')")
+    public CommonResult<PageResult<ProductrepairRecordMainRespVO>> getProductrepairRecordMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductrepairRecordMainDO> pageResult = productrepairRecordMainService.getProductrepairRecordMainSenior(conditions);
+        PageResult<ProductrepairRecordMainRespVO> result = ProductrepairRecordMainConvert.INSTANCE.convertPage(pageResult);
+        for(ProductrepairRecordMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestDetailaController.java

@@ -1,34 +1,32 @@
 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.productrepairRequest.vo.*;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-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 com.win.module.wms.convert.productrepairRequest.ProductrepairRequestDetailaConvert;
+import com.win.module.wms.dal.dataobject.productrepairRequest.ProductrepairRequestDetailaDO;
+import com.win.module.wms.service.productrepairRequest.ProductrepairRequestDetailaService;
 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.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+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 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.productrepairRequest.vo.*;
-import com.win.module.wms.dal.dataobject.productrepairRequest.ProductrepairRequestDetailaDO;
-import com.win.module.wms.convert.productrepairRequest.ProductrepairRequestDetailaConvert;
-import com.win.module.wms.service.productrepairRequest.ProductrepairRequestDetailaService;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 制品返修申请子")
 @RestController
@@ -109,4 +107,18 @@ public class ProductrepairRequestDetailaController {
         ExcelUtils.write(response, "制品返修申请子.xls", "数据", ProductrepairRequestDetailaExcelVO.class, datas);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得账期日历分页")
+    @PreAuthorize("@ss.hasPermission('wms:accountcalendar:query')")
+    public CommonResult<PageResult<ProductrepairRequestDetailaRespVO>> getProductrepairRequestDetailaSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductrepairRequestDetailaDO> pageResult = productrepairRequestDetailaService.getProductrepairRequestDetailaSenior(conditions);
+        PageResult<ProductrepairRequestDetailaRespVO> result = ProductrepairRequestDetailaConvert.INSTANCE.convertPage(pageResult);
+        for(ProductrepairRequestDetailaRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestDetailbController.java

@@ -119,4 +119,18 @@ public class ProductrepairRequestDetailbController {
         ExcelUtils.write(response, "制品返修申请子.xls", "数据", ProductrepairRequestDetailbExcelVO.class, datas);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得制品返修申请子分页")
+    @PreAuthorize("@ss.hasPermission('wms:consumere-request-detailb:query')")
+    public CommonResult<PageResult<ProductrepairRequestDetailbRespVO>> getProductrepairRequestDetailbSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductrepairRequestDetailbDO> pageResult = productrepairRequestDetailbService.getProductrepairRequestDetailbSenior(conditions);
+        PageResult<ProductrepairRequestDetailbRespVO> result = ProductrepairRequestDetailbConvert.INSTANCE.convertPage(pageResult);
+        for(ProductrepairRequestDetailbRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestMainController.java

@@ -1,34 +1,35 @@
 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.accountcalendar.vo.ProductrepairRequestMainRespVO;
 import com.win.module.wms.controller.productrepairRequest.vo.*;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-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 com.win.module.wms.convert.accountcalendar.ProductrepairRequestMainConvert;
+import com.win.module.wms.convert.productrepairRequest.ProductrepairRequestMainConvert;
+import com.win.module.wms.dal.dataobject.accountcalendar.ProductrepairRequestMainDO;
+import com.win.module.wms.dal.dataobject.productrepairRequest.ProductrepairRequestMainDO;
+import com.win.module.wms.service.productrepairRequest.ProductrepairRequestMainService;
 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.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+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 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.productrepairRequest.vo.*;
-import com.win.module.wms.dal.dataobject.productrepairRequest.ProductrepairRequestMainDO;
-import com.win.module.wms.convert.productrepairRequest.ProductrepairRequestMainConvert;
-import com.win.module.wms.service.productrepairRequest.ProductrepairRequestMainService;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 制品返修申请主")
 @RestController
@@ -109,4 +110,18 @@ public class ProductrepairRequestMainController {
         ExcelUtils.write(response, "制品返修申请主.xls", "数据", ProductrepairRequestMainExcelVO.class, datas);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得制品返修申请主分页")
+    @PreAuthorize("@ss.hasPermission('wms:productrepair-request-main:query')")
+    public CommonResult<PageResult<ProductrepairRequestMainRespVO>> getProductrepairRequestMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductrepairRequestMainDO> pageResult = productrepairRequestMainService.getProductrepairRequestMainSenior(conditions);
+        PageResult<ProductrepairRequestMainRespVO> result = ProductrepairRequestMainConvert.INSTANCE.convertPage(pageResult);
+        for(ProductrepairRequestMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packageMassage/PackageMapper.java

@@ -1,15 +1,17 @@
 package com.win.module.wms.dal.mysql.packageMassage;
 
-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.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.packageMassage.vo.PackageExportReqVO;
 import com.win.module.wms.controller.packageMassage.vo.PackagePageReqVO;
 import com.win.module.wms.dal.dataobject.packageMassage.PackageDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 包装 Mapper
  *
@@ -64,6 +66,10 @@ public interface PackageMapper extends BaseMapperX<PackageDO> {
                 .orderByDesc(PackageDO::getId));
     }
 
+    default PageResult<PackageDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<PackageDO> selectList(PackageExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<PackageDO>()
                 .eqIfPresent(PackageDO::getNumber, reqVO.getNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/paramsetting/ParamsettingMapper.java

@@ -1,15 +1,17 @@
 package com.win.module.wms.dal.mysql.paramsetting;
 
-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.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.paramsetting.vo.ParamsettingExportReqVO;
 import com.win.module.wms.controller.paramsetting.vo.ParamsettingPageReqVO;
 import com.win.module.wms.dal.dataobject.paramsetting.ParamsettingDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 参数设置 Mapper
  *
@@ -32,6 +34,10 @@ public interface ParamsettingMapper extends BaseMapperX<ParamsettingDO> {
                 .orderByDesc(ParamsettingDO::getId));
     }
 
+    default PageResult<ParamsettingDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<ParamsettingDO> selectList(ParamsettingExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ParamsettingDO>()
                 .eqIfPresent(ParamsettingDO::getStrategyType, reqVO.getStrategyType())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickJob/PickJobDetailMapper.java

@@ -1,15 +1,17 @@
 package com.win.module.wms.dal.mysql.pickJob;
 
-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.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.pickJob.vo.PickJobDetailExportReqVO;
 import com.win.module.wms.controller.pickJob.vo.PickJobDetailPageReqVO;
 import com.win.module.wms.dal.dataobject.pickJob.PickJobDetailDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 拣料任务子 Mapper
  *
@@ -42,6 +44,10 @@ public interface PickJobDetailMapper extends BaseMapperX<PickJobDetailDO> {
                 .orderByDesc(PickJobDetailDO::getId));
     }
 
+    default PageResult<PickJobDetailDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<PickJobDetailDO> selectList(PickJobDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<PickJobDetailDO>()
                 .eqIfPresent(PickJobDetailDO::getPackingNumber, reqVO.getPackingNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickJob/PickJobMainMapper.java

@@ -1,15 +1,17 @@
 package com.win.module.wms.dal.mysql.pickJob;
 
-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.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.pickJob.vo.PickJobMainExportReqVO;
 import com.win.module.wms.controller.pickJob.vo.PickJobMainPageReqVO;
 import com.win.module.wms.dal.dataobject.pickJob.PickJobMainDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 拣料任务主 Mapper
  *
@@ -59,6 +61,10 @@ public interface PickJobMainMapper extends BaseMapperX<PickJobMainDO> {
                 .orderByDesc(PickJobMainDO::getId));
     }
 
+    default PageResult<PickJobMainDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<PickJobMainDO> selectList(PickJobMainExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<PickJobMainDO>()
                 .eqIfPresent(PickJobMainDO::getRequestNumber, reqVO.getRequestNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickRecord/PickRecordDetailMapper.java

@@ -1,15 +1,17 @@
 package com.win.module.wms.dal.mysql.pickRecord;
 
-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.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.pickRecord.vo.PickRecordDetailExportReqVO;
 import com.win.module.wms.controller.pickRecord.vo.PickRecordDetailPageReqVO;
 import com.win.module.wms.dal.dataobject.pickRecord.PickRecordDetailDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 拣料记录子 Mapper
  *
@@ -51,6 +53,9 @@ public interface PickRecordDetailMapper extends BaseMapperX<PickRecordDetailDO>
                 .eqIfPresent(PickRecordDetailDO::getToBatch, reqVO.getToBatch())
                 .orderByDesc(PickRecordDetailDO::getId));
     }
+    default PageResult<PickRecordDetailDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
 
     default List<PickRecordDetailDO> selectList(PickRecordDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<PickRecordDetailDO>()

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickRecord/PickRecordMainMapper.java

@@ -1,15 +1,17 @@
 package com.win.module.wms.dal.mysql.pickRecord;
 
-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.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.pickRecord.vo.PickRecordMainExportReqVO;
 import com.win.module.wms.controller.pickRecord.vo.PickRecordMainPageReqVO;
 import com.win.module.wms.dal.dataobject.pickRecord.PickRecordMainDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 拣料记录主 Mapper
  *
@@ -46,6 +48,10 @@ public interface PickRecordMainMapper extends BaseMapperX<PickRecordMainDO> {
                 .orderByDesc(PickRecordMainDO::getId));
     }
 
+    default PageResult<PickRecordMainDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<PickRecordMainDO> selectList(PickRecordMainExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<PickRecordMainDO>()
                 .eqIfPresent(PickRecordMainDO::getRequestNumber, reqVO.getRequestNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickRequest/PickRequestDetailMapper.java

@@ -2,11 +2,14 @@ package com.win.module.wms.dal.mysql.pickRequest;
 
 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.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.pickRequest.vo.PickRequestDetailExportReqVO;
 import com.win.module.wms.controller.pickRequest.vo.PickRequestDetailPageReqVO;
+import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO;
 import com.win.module.wms.dal.dataobject.pickRequest.PickRequestDetailDO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -39,6 +42,9 @@ public interface PickRequestDetailMapper extends BaseMapperX<PickRequestDetailDO
                 .eqIfPresent(PickRequestDetailDO::getToOwnerCode, reqVO.getToOwnerCode())
                 .orderByDesc(PickRequestDetailDO::getId));
     }
+    default PageResult<PickRequestDetailDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
 
     default List<PickRequestDetailDO> selectList(PickRequestDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<PickRequestDetailDO>()

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickRequest/PickRequestMainMapper.java

@@ -2,11 +2,14 @@ package com.win.module.wms.dal.mysql.pickRequest;
 
 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.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.pickRequest.vo.PickRequestMainExportReqVO;
 import com.win.module.wms.controller.pickRequest.vo.PickRequestMainPageReqVO;
+import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO;
 import com.win.module.wms.dal.dataobject.pickRequest.PickRequestMainDO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -44,6 +47,10 @@ public interface PickRequestMainMapper extends BaseMapperX<PickRequestMainDO> {
                 .orderByDesc(PickRequestMainDO::getId));
     }
 
+    default PageResult<PickRequestMainDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<PickRequestMainDO> selectList(PickRequestMainExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<PickRequestMainDO>()
                 .eqIfPresent(PickRequestMainDO::getFromWarehouseCode, reqVO.getFromWarehouseCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/preparetoissue/PreparetoissueDetailMapper.java

@@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.preparetoissue;
 
 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.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.preparetoissue.vo.PreparetoissueDetailExportReqVO;
 import com.win.module.wms.controller.preparetoissue.vo.PreparetoissueDetailPageReqVO;
 import com.win.module.wms.dal.dataobject.preparetoissue.PreparetoissueDetailDO;
@@ -36,6 +38,10 @@ public interface PreparetoissueDetailMapper extends BaseMapperX<PreparetoissueDe
                 .orderByDesc(PreparetoissueDetailDO::getId));
     }
 
+    default PageResult<PreparetoissueDetailDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<PreparetoissueDetailDO> selectList(PreparetoissueDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<PreparetoissueDetailDO>()
                 .eqIfPresent(PreparetoissueDetailDO::getToLocationCode, reqVO.getToLocationCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/preparetoissue/PreparetoissueMainMapper.java

@@ -1,15 +1,17 @@
 package com.win.module.wms.dal.mysql.preparetoissue;
 
-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.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.preparetoissue.vo.PreparetoissueMainExportReqVO;
 import com.win.module.wms.controller.preparetoissue.vo.PreparetoissueMainPageReqVO;
 import com.win.module.wms.dal.dataobject.preparetoissue.PreparetoissueMainDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 备料计划主 Mapper
  *
@@ -40,6 +42,10 @@ public interface PreparetoissueMainMapper extends BaseMapperX<PreparetoissueMain
                 .orderByDesc(PreparetoissueMainDO::getId));
     }
 
+    default PageResult<PreparetoissueMainDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<PreparetoissueMainDO> selectList(PreparetoissueMainExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<PreparetoissueMainDO>()
                 .eqIfPresent(PreparetoissueMainDO::getProductionPlanNumber, reqVO.getProductionPlanNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/process/ProcessMapper.java

@@ -1,10 +1,13 @@
 package com.win.module.wms.dal.mysql.process;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.mybatis.core.mapper.BaseMapperX;
 import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.process.vo.ProcessExportReqVO;
 import com.win.module.wms.controller.process.vo.ProcessPageReqVO;
+import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO;
 import com.win.module.wms.dal.dataobject.process.ProcessDO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -35,6 +38,10 @@ public interface ProcessMapper extends BaseMapperX<ProcessDO> {
                 .orderByDesc(ProcessDO::getId));
     }
 
+    default PageResult<ProcessDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<ProcessDO> selectList(ProcessExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProcessDO>()
                 .eqIfPresent(ProcessDO::getCode, reqVO.getCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleJob/ProductdismantleJobDetailMapper.java

@@ -1,15 +1,17 @@
 package com.win.module.wms.dal.mysql.productdismantleJob;
 
-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.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobDetailExportReqVO;
 import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobDetailPageReqVO;
 import com.win.module.wms.dal.dataobject.productdismantleJob.ProductdismantleJobDetailDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 制品拆解任务子 Mapper
  *
@@ -48,6 +50,10 @@ public interface ProductdismantleJobDetailMapper extends BaseMapperX<Productdism
                 .orderByDesc(ProductdismantleJobDetailDO::getId));
     }
 
+    default PageResult<ProductdismantleJobDetailDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<ProductdismantleJobDetailDO> selectList(ProductdismantleJobDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductdismantleJobDetailDO>()
                 .eqIfPresent(ProductdismantleJobDetailDO::getProductionLineCode, reqVO.getProductionLineCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleJob/ProductdismantleJobMainMapper.java

@@ -1,15 +1,17 @@
 package com.win.module.wms.dal.mysql.productdismantleJob;
 
-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.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobMainExportReqVO;
 import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobMainPageReqVO;
 import com.win.module.wms.dal.dataobject.productdismantleJob.ProductdismantleJobMainDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 制品拆解任务主 Mapper
  *
@@ -60,6 +62,10 @@ public interface ProductdismantleJobMainMapper extends BaseMapperX<Productdisman
                 .orderByDesc(ProductdismantleJobMainDO::getId));
     }
 
+    default PageResult<ProductdismantleJobMainDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<ProductdismantleJobMainDO> selectList(ProductdismantleJobMainExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductdismantleJobMainDO>()
                 .eqIfPresent(ProductdismantleJobMainDO::getRequestNumber, reqVO.getRequestNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRecord/ProductdismantleRecordDetailaMapper.java

@@ -1,15 +1,17 @@
 package com.win.module.wms.dal.mysql.productdismantleRecord;
 
-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.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordDetailaExportReqVO;
 import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordDetailaPageReqVO;
 import com.win.module.wms.dal.dataobject.productdismantleRecord.ProductdismantleRecordDetailaDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 制品拆解记录子 Mapper
  *
@@ -50,6 +52,10 @@ public interface ProductdismantleRecordDetailaMapper extends BaseMapperX<Product
                 .orderByDesc(ProductdismantleRecordDetailaDO::getId));
     }
 
+    default PageResult<ProductdismantleRecordDetailaDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<ProductdismantleRecordDetailaDO> selectList(ProductdismantleRecordDetailaExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductdismantleRecordDetailaDO>()
                 .eqIfPresent(ProductdismantleRecordDetailaDO::getFromOwnerCode, reqVO.getFromOwnerCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRecord/ProductdismantleRecordDetailbMapper.java

@@ -48,6 +48,7 @@ public interface ProductdismantleRecordDetailbMapper extends BaseMapperX<Product
     default PageResult<ProductdismantleRecordDetailbDO> selectSenior(CustomConditions conditions) {
         return selectPage(conditions, QueryWrapperUtils.structure(conditions));
     }
+
     default List<ProductdismantleRecordDetailbDO> selectList(ProductdismantleRecordDetailbExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductdismantleRecordDetailbDO>()
                 .eqIfPresent(ProductdismantleRecordDetailbDO::getProcessCode, reqVO.getProcessCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRequest/ProductdismantleRequestDetailaMapper.java

@@ -1,15 +1,17 @@
 package com.win.module.wms.dal.mysql.productdismantleRequest;
 
-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.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailaExportReqVO;
 import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailaPageReqVO;
 import com.win.module.wms.dal.dataobject.productdismantleRequest.ProductdismantleRequestDetailaDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 制品拆解申请子 Mapper
  *
@@ -49,6 +51,10 @@ public interface ProductdismantleRequestDetailaMapper extends BaseMapperX<Produc
                 .orderByDesc(ProductdismantleRequestDetailaDO::getId));
     }
 
+    default PageResult<ProductdismantleRequestDetailaDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<ProductdismantleRequestDetailaDO> selectList(ProductdismantleRequestDetailaExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductdismantleRequestDetailaDO>()
                 .eqIfPresent(ProductdismantleRequestDetailaDO::getProductionLineCode, reqVO.getProductionLineCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRequest/ProductdismantleRequestDetailbMapper.java

@@ -1,8 +1,10 @@
 package com.win.module.wms.dal.mysql.productdismantleRequest;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.mybatis.core.mapper.BaseMapperX;
 import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailbExportReqVO;
 import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailbPageReqVO;
 import com.win.module.wms.dal.dataobject.productdismantleRequest.ProductdismantleRequestDetailbDO;
@@ -39,6 +41,10 @@ public interface ProductdismantleRequestDetailbMapper extends BaseMapperX<Produc
                 .orderByDesc(ProductdismantleRequestDetailbDO::getId));
     }
 
+    default PageResult<ProductdismantleRequestDetailbDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<ProductdismantleRequestDetailbDO> selectList(ProductdismantleRequestDetailbExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductdismantleRequestDetailbDO>()
                 .eqIfPresent(ProductdismantleRequestDetailbDO::getProcessCode, reqVO.getProcessCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRequest/ProductdismantleRequestMainMapper.java

@@ -1,15 +1,17 @@
 package com.win.module.wms.dal.mysql.productdismantleRequest;
 
-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.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestMainExportReqVO;
 import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestMainPageReqVO;
 import com.win.module.wms.dal.dataobject.productdismantleRequest.ProductdismantleRequestMainDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 制品拆解申请主 Mapper
  *
@@ -44,6 +46,10 @@ public interface ProductdismantleRequestMainMapper extends BaseMapperX<Productdi
                 .orderByDesc(ProductdismantleRequestMainDO::getId));
     }
 
+    default PageResult<ProductdismantleRequestMainDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<ProductdismantleRequestMainDO> selectList(ProductdismantleRequestMainExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductdismantleRequestMainDO>()
                 .eqIfPresent(ProductdismantleRequestMainDO::getWorkshopCode, reqVO.getWorkshopCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/production/ProductionDetailMapper.java

@@ -1,15 +1,17 @@
 package com.win.module.wms.dal.mysql.production;
 
-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.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.production.vo.ProductionDetailExportReqVO;
 import com.win.module.wms.controller.production.vo.ProductionDetailPageReqVO;
 import com.win.module.wms.dal.dataobject.production.ProductionDetailDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 生产计划子 Mapper
  *
@@ -36,6 +38,10 @@ public interface ProductionDetailMapper extends BaseMapperX<ProductionDetailDO>
                 .orderByDesc(ProductionDetailDO::getId));
     }
 
+    default PageResult<ProductionDetailDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<ProductionDetailDO> selectList(ProductionDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductionDetailDO>()
                 .eqIfPresent(ProductionDetailDO::getBomVersion, reqVO.getBomVersion())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/production/ProductionMainMapper.java

@@ -1,16 +1,17 @@
 package com.win.module.wms.dal.mysql.production;
 
-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.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.production.vo.ProductionMainExportReqVO;
 import com.win.module.wms.controller.production.vo.ProductionMainPageReqVO;
-import com.win.module.wms.dal.dataobject.production.ProductionDetailDO;
 import com.win.module.wms.dal.dataobject.production.ProductionMainDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 生产计划主 Mapper
  *
@@ -43,6 +44,10 @@ public interface ProductionMainMapper extends BaseMapperX<ProductionMainDO> {
                 .orderByDesc(ProductionMainDO::getId));
     }
 
+    default PageResult<ProductionMainDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<ProductionMainDO> selectList(ProductionMainExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductionMainDO>()
                 .eqIfPresent(ProductionMainDO::getDisplayOrder, reqVO.getDisplayOrder())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionline/ProductionlineMapper.java

@@ -1,8 +1,10 @@
 package com.win.module.wms.dal.mysql.productionline;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.mybatis.core.mapper.BaseMapperX;
 import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.productionline.vo.ProductionlineExportReqVO;
 import com.win.module.wms.controller.productionline.vo.ProductionlinePageReqVO;
 import com.win.module.wms.dal.dataobject.productionline.ProductionlineDO;
@@ -36,6 +38,10 @@ public interface ProductionlineMapper extends BaseMapperX<ProductionlineDO> {
                 .orderByDesc(ProductionlineDO::getId));
     }
 
+    default PageResult<ProductionlineDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<ProductionlineDO> selectList(ProductionlineExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductionlineDO>()
                 .eqIfPresent(ProductionlineDO::getCode, reqVO.getCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionlineitem/ProductionlineitemMapper.java

@@ -1,15 +1,17 @@
 package com.win.module.wms.dal.mysql.productionlineitem;
 
-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.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.productionlineitem.vo.ProductionlineitemExportReqVO;
 import com.win.module.wms.controller.productionlineitem.vo.ProductionlineitemPageReqVO;
 import com.win.module.wms.dal.dataobject.productionlineitem.ProductionlineitemDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 生产线物料关系 Mapper
  *
@@ -31,7 +33,9 @@ public interface ProductionlineitemMapper extends BaseMapperX<Productionlineitem
                 .eqIfPresent(ProductionlineitemDO::getCreator, reqVO.getCreator())
                 .orderByDesc(ProductionlineitemDO::getId));
     }
-
+    default PageResult<ProductionlineitemDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<ProductionlineitemDO> selectList(ProductionlineitemExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductionlineitemDO>()
                 .eqIfPresent(ProductionlineitemDO::getFgLocationCode, reqVO.getFgLocationCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptJob/ProductionreceiptJobDetailMapper.java

@@ -1,15 +1,17 @@
 package com.win.module.wms.dal.mysql.productionreceiptJob;
 
-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.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobDetailExportReqVO;
 import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobDetailPageReqVO;
 import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobDetailDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 生产收料任务子 Mapper
  *
@@ -45,6 +47,10 @@ public interface ProductionreceiptJobDetailMapper extends BaseMapperX<Production
                 .orderByDesc(ProductionreceiptJobDetailDO::getId));
     }
 
+    default PageResult<ProductionreceiptJobDetailDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<ProductionreceiptJobDetailDO> selectList(ProductionreceiptJobDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductionreceiptJobDetailDO>()
                 .eqIfPresent(ProductionreceiptJobDetailDO::getProductionLineCode, reqVO.getProductionLineCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptJob/ProductionreceiptJobMainMapper.java

@@ -1,15 +1,17 @@
 package com.win.module.wms.dal.mysql.productionreceiptJob;
 
-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.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobMainExportReqVO;
 import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobMainPageReqVO;
 import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobMainDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 生产收料任务主 Mapper
  *
@@ -61,6 +63,10 @@ public interface ProductionreceiptJobMainMapper extends BaseMapperX<Productionre
                 .orderByDesc(ProductionreceiptJobMainDO::getId));
     }
 
+    default PageResult<ProductionreceiptJobMainDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<ProductionreceiptJobMainDO> selectList(ProductionreceiptJobMainExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductionreceiptJobMainDO>()
                 .eqIfPresent(ProductionreceiptJobMainDO::getIssueJobNumber, reqVO.getIssueJobNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptRecord/ProductionreceiptRecordDetailMapper.java

@@ -1,15 +1,17 @@
 package com.win.module.wms.dal.mysql.productionreceiptRecord;
 
-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.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.productionreceiptRecord.vo.ProductionreceiptRecordDetailExportReqVO;
 import com.win.module.wms.controller.productionreceiptRecord.vo.ProductionreceiptRecordDetailPageReqVO;
 import com.win.module.wms.dal.dataobject.productionreceiptRecord.ProductionreceiptRecordDetailDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 生产收料记录子 Mapper
  *
@@ -55,6 +57,10 @@ public interface ProductionreceiptRecordDetailMapper extends BaseMapperX<Product
                 .orderByDesc(ProductionreceiptRecordDetailDO::getId));
     }
 
+    default PageResult<ProductionreceiptRecordDetailDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<ProductionreceiptRecordDetailDO> selectList(ProductionreceiptRecordDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductionreceiptRecordDetailDO>()
                 .eqIfPresent(ProductionreceiptRecordDetailDO::getProductionLineCode, reqVO.getProductionLineCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptRecord/ProductionreceiptRecordMainMapper.java

@@ -1,15 +1,17 @@
 package com.win.module.wms.dal.mysql.productionreceiptRecord;
 
-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.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.productionreceiptRecord.vo.ProductionreceiptRecordMainExportReqVO;
 import com.win.module.wms.controller.productionreceiptRecord.vo.ProductionreceiptRecordMainPageReqVO;
 import com.win.module.wms.dal.dataobject.productionreceiptRecord.ProductionreceiptRecordMainDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 生产收料记录主 Mapper
  *
@@ -48,6 +50,10 @@ public interface ProductionreceiptRecordMainMapper extends BaseMapperX<Productio
                 .orderByDesc(ProductionreceiptRecordMainDO::getId));
     }
 
+    default PageResult<ProductionreceiptRecordMainDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<ProductionreceiptRecordMainDO> selectList(ProductionreceiptRecordMainExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductionreceiptRecordMainDO>()
                 .eqIfPresent(ProductionreceiptRecordMainDO::getIssueJobNumber, reqVO.getIssueJobNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnJob/ProductionreturnJobDetailMapper.java

@@ -1,15 +1,17 @@
 package com.win.module.wms.dal.mysql.productionreturnJob;
 
-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.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobDetailExportReqVO;
 import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobDetailPageReqVO;
 import com.win.module.wms.dal.dataobject.productionreturnJob.ProductionreturnJobDetailDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 生产退料任务子 Mapper
  *
@@ -44,6 +46,10 @@ public interface ProductionreturnJobDetailMapper extends BaseMapperX<Productionr
                 .orderByDesc(ProductionreturnJobDetailDO::getId));
     }
 
+    default PageResult<ProductionreturnJobDetailDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<ProductionreturnJobDetailDO> selectList(ProductionreturnJobDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductionreturnJobDetailDO>()
                 .eqIfPresent(ProductionreturnJobDetailDO::getProductionLineCode, reqVO.getProductionLineCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnJob/ProductionreturnJobMainMapper.java

@@ -1,15 +1,17 @@
 package com.win.module.wms.dal.mysql.productionreturnJob;
 
-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.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobMainExportReqVO;
 import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobMainPageReqVO;
 import com.win.module.wms.dal.dataobject.productionreturnJob.ProductionreturnJobMainDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 生产退料任务主 Mapper
  *
@@ -61,6 +63,10 @@ public interface ProductionreturnJobMainMapper extends BaseMapperX<Productionret
                 .orderByDesc(ProductionreturnJobMainDO::getId));
     }
 
+    default PageResult<ProductionreturnJobMainDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<ProductionreturnJobMainDO> selectList(ProductionreturnJobMainExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductionreturnJobMainDO>()
                 .eqIfPresent(ProductionreturnJobMainDO::getRequestNumber, reqVO.getRequestNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnRecord/ProductionreturnRecordDetailMapper.java

@@ -1,15 +1,17 @@
 package com.win.module.wms.dal.mysql.productionreturnRecord;
 
-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.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordDetailExportReqVO;
 import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordDetailPageReqVO;
 import com.win.module.wms.dal.dataobject.productionreturnRecord.ProductionreturnRecordDetailDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 生产退料记录子 Mapper
  *
@@ -54,6 +56,9 @@ public interface ProductionreturnRecordDetailMapper extends BaseMapperX<Producti
                 .orderByDesc(ProductionreturnRecordDetailDO::getId));
     }
 
+    default PageResult<ProductionreturnRecordDetailDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<ProductionreturnRecordDetailDO> selectList(ProductionreturnRecordDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductionreturnRecordDetailDO>()
                 .eqIfPresent(ProductionreturnRecordDetailDO::getProductionLineCode, reqVO.getProductionLineCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnRecord/ProductionreturnRecordMainMapper.java

@@ -1,15 +1,17 @@
 package com.win.module.wms.dal.mysql.productionreturnRecord;
 
-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.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordMainExportReqVO;
 import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordMainPageReqVO;
 import com.win.module.wms.dal.dataobject.productionreturnRecord.ProductionreturnRecordMainDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 生产退料记录主 Mapper
  *
@@ -47,6 +49,10 @@ public interface ProductionreturnRecordMainMapper extends BaseMapperX<Production
                 .orderByDesc(ProductionreturnRecordMainDO::getId));
     }
 
+    default PageResult<ProductionreturnRecordMainDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<ProductionreturnRecordMainDO> selectList(ProductionreturnRecordMainExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductionreturnRecordMainDO>()
                 .eqIfPresent(ProductionreturnRecordMainDO::getRequestNumber, reqVO.getRequestNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnRequest/ProductionreturnRequestDetailMapper.java

@@ -1,15 +1,17 @@
 package com.win.module.wms.dal.mysql.productionreturnRequest;
 
-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.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestDetailExportReqVO;
 import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestDetailPageReqVO;
 import com.win.module.wms.dal.dataobject.productionreturnRequest.ProductionreturnRequestDetailDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 生产退料申请子 Mapper
  *
@@ -45,6 +47,10 @@ public interface ProductionreturnRequestDetailMapper extends BaseMapperX<Product
                 .orderByDesc(ProductionreturnRequestDetailDO::getId));
     }
 
+    default PageResult<ProductionreturnRequestDetailDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<ProductionreturnRequestDetailDO> selectList(ProductionreturnRequestDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductionreturnRequestDetailDO>()
                 .eqIfPresent(ProductionreturnRequestDetailDO::getProductionLineCode, reqVO.getProductionLineCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnRequest/ProductionreturnRequestMainMapper.java

@@ -1,15 +1,17 @@
 package com.win.module.wms.dal.mysql.productionreturnRequest;
 
-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.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestMainExportReqVO;
 import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestMainPageReqVO;
 import com.win.module.wms.dal.dataobject.productionreturnRequest.ProductionreturnRequestMainDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 生产退料申请主 Mapper
  *
@@ -44,7 +46,9 @@ public interface ProductionreturnRequestMainMapper extends BaseMapperX<Productio
                 .eqIfPresent(ProductionreturnRequestMainDO::getDirectCreateRecord, reqVO.getDirectCreateRecord())
                 .orderByDesc(ProductionreturnRequestMainDO::getId));
     }
-
+    default PageResult<ProductionreturnRequestMainDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<ProductionreturnRequestMainDO> selectList(ProductionreturnRequestMainExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductionreturnRequestMainDO>()
                 .eqIfPresent(ProductionreturnRequestMainDO::getWorkshopCode, reqVO.getWorkshopCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayJob/ProductputawayJobDetailMapper.java

@@ -1,15 +1,17 @@
 package com.win.module.wms.dal.mysql.productputawayJob;
 
-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.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobDetailExportReqVO;
 import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobDetailPageReqVO;
 import com.win.module.wms.dal.dataobject.productputawayJob.ProductputawayJobDetailDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 制品上架任务子 Mapper
  *
@@ -44,6 +46,10 @@ public interface ProductputawayJobDetailMapper extends BaseMapperX<Productputawa
                 .orderByDesc(ProductputawayJobDetailDO::getId));
     }
 
+    default PageResult<ProductputawayJobDetailDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<ProductputawayJobDetailDO> selectList(ProductputawayJobDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductputawayJobDetailDO>()
                 .eqIfPresent(ProductputawayJobDetailDO::getPackingNumber, reqVO.getPackingNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayJob/ProductputawayJobMainMapper.java

@@ -1,15 +1,17 @@
 package com.win.module.wms.dal.mysql.productputawayJob;
 
-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.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobMainExportReqVO;
 import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobMainPageReqVO;
 import com.win.module.wms.dal.dataobject.productputawayJob.ProductputawayJobMainDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 制品上架任务主 Mapper
  *
@@ -60,6 +62,10 @@ public interface ProductputawayJobMainMapper extends BaseMapperX<ProductputawayJ
                 .orderByDesc(ProductputawayJobMainDO::getId));
     }
 
+    default PageResult<ProductputawayJobMainDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<ProductputawayJobMainDO> selectList(ProductputawayJobMainExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductputawayJobMainDO>()
                 .eqIfPresent(ProductputawayJobMainDO::getRequestNumber, reqVO.getRequestNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRecord/ProductputawayRecordDetailMapper.java

@@ -1,15 +1,17 @@
 package com.win.module.wms.dal.mysql.productputawayRecord;
 
-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.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordDetailExportReqVO;
 import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordDetailPageReqVO;
 import com.win.module.wms.dal.dataobject.productputawayRecord.ProductputawayRecordDetailDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 制品上架记录子 Mapper
  *
@@ -54,6 +56,10 @@ public interface ProductputawayRecordDetailMapper extends BaseMapperX<Productput
                 .orderByDesc(ProductputawayRecordDetailDO::getId));
     }
 
+    default PageResult<ProductputawayRecordDetailDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<ProductputawayRecordDetailDO> selectList(ProductputawayRecordDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductputawayRecordDetailDO>()
                 .eqIfPresent(ProductputawayRecordDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRecord/ProductputawayRecordMainMapper.java

@@ -1,15 +1,17 @@
 package com.win.module.wms.dal.mysql.productputawayRecord;
 
-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.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordMainExportReqVO;
 import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordMainPageReqVO;
 import com.win.module.wms.dal.dataobject.productputawayRecord.ProductputawayRecordMainDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 制品上架记录主 Mapper
  *
@@ -48,6 +50,10 @@ public interface ProductputawayRecordMainMapper extends BaseMapperX<Productputaw
                 .orderByDesc(ProductputawayRecordMainDO::getId));
     }
 
+    default PageResult<ProductputawayRecordMainDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<ProductputawayRecordMainDO> selectList(ProductputawayRecordMainExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductputawayRecordMainDO>()
                 .eqIfPresent(ProductputawayRecordMainDO::getRequestNumber, reqVO.getRequestNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRequest/ProductputawayRequestDetailMapper.java

@@ -1,15 +1,17 @@
 package com.win.module.wms.dal.mysql.productputawayRequest;
 
-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.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestDetailExportReqVO;
 import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestDetailPageReqVO;
 import com.win.module.wms.dal.dataobject.productputawayRequest.ProductputawayRequestDetailDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 制品上架申请子 Mapper
  *
@@ -45,6 +47,10 @@ public interface ProductputawayRequestDetailMapper extends BaseMapperX<Productpu
                 .orderByDesc(ProductputawayRequestDetailDO::getId));
     }
 
+    default PageResult<ProductputawayRequestDetailDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<ProductputawayRequestDetailDO> selectList(ProductputawayRequestDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductputawayRequestDetailDO>()
                 .eqIfPresent(ProductputawayRequestDetailDO::getPackingNumber, reqVO.getPackingNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRequest/ProductputawayRequestMainMapper.java

@@ -1,15 +1,17 @@
 package com.win.module.wms.dal.mysql.productputawayRequest;
 
-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.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestMainExportReqVO;
 import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestMainPageReqVO;
 import com.win.module.wms.dal.dataobject.productputawayRequest.ProductputawayRequestMainDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 制品上架申请主 Mapper
  *
@@ -45,6 +47,10 @@ public interface ProductputawayRequestMainMapper extends BaseMapperX<Productputa
                 .orderByDesc(ProductputawayRequestMainDO::getId));
     }
 
+    default PageResult<ProductputawayRequestMainDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<ProductputawayRequestMainDO> selectList(ProductputawayRequestMainExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductputawayRequestMainDO>()
                 .eqIfPresent(ProductputawayRequestMainDO::getSupplierCode, reqVO.getSupplierCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptJob/ProductreceiptJobDetailMapper.java

@@ -1,15 +1,17 @@
 package com.win.module.wms.dal.mysql.productreceiptJob;
 
-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.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobDetailExportReqVO;
 import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobDetailPageReqVO;
 import com.win.module.wms.dal.dataobject.productreceiptJob.ProductreceiptJobDetailDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 制品收货任务子 Mapper
  *
@@ -49,6 +51,10 @@ public interface ProductreceiptJobDetailMapper extends BaseMapperX<Productreceip
                 .orderByDesc(ProductreceiptJobDetailDO::getId));
     }
 
+    default PageResult<ProductreceiptJobDetailDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<ProductreceiptJobDetailDO> selectList(ProductreceiptJobDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductreceiptJobDetailDO>()
                 .eqIfPresent(ProductreceiptJobDetailDO::getProductionLineCode, reqVO.getProductionLineCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptJob/ProductreceiptJobMainMapper.java

@@ -1,15 +1,17 @@
 package com.win.module.wms.dal.mysql.productreceiptJob;
 
-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.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobMainExportReqVO;
 import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobMainPageReqVO;
 import com.win.module.wms.dal.dataobject.productreceiptJob.ProductreceiptJobMainDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 制品收货任务主 Mapper
  *
@@ -62,6 +64,10 @@ public interface ProductreceiptJobMainMapper extends BaseMapperX<ProductreceiptJ
                 .orderByDesc(ProductreceiptJobMainDO::getId));
     }
 
+    default PageResult<ProductreceiptJobMainDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<ProductreceiptJobMainDO> selectList(ProductreceiptJobMainExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductreceiptJobMainDO>()
                 .eqIfPresent(ProductreceiptJobMainDO::getRequestNumber, reqVO.getRequestNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRecord/BackflushRecordDetailbMapper.java

@@ -1,8 +1,10 @@
 package com.win.module.wms.dal.mysql.productreceiptRecord;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.mybatis.core.mapper.BaseMapperX;
 import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.productreceiptRecord.vo.BackflushRecordDetailbExportReqVO;
 import com.win.module.wms.controller.productreceiptRecord.vo.BackflushRecordDetailbPageReqVO;
 import com.win.module.wms.dal.dataobject.productreceiptRecord.BackflushRecordDetailbDO;
@@ -44,6 +46,10 @@ public interface BackflushRecordDetailbMapper extends BaseMapperX<BackflushRecor
                 .orderByDesc(BackflushRecordDetailbDO::getId));
     }
 
+    default PageResult<BackflushRecordDetailbDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<BackflushRecordDetailbDO> selectList(BackflushRecordDetailbExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<BackflushRecordDetailbDO>()
                 .eqIfPresent(BackflushRecordDetailbDO::getProcessCode, reqVO.getProcessCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRecord/ProductreceiptRecordDetailMapper.java

@@ -1,15 +1,17 @@
 package com.win.module.wms.dal.mysql.productreceiptRecord;
 
-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.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.productreceiptRecord.vo.ProductreceiptRecordDetailExportReqVO;
 import com.win.module.wms.controller.productreceiptRecord.vo.ProductreceiptRecordDetailPageReqVO;
 import com.win.module.wms.dal.dataobject.productreceiptRecord.ProductreceiptRecordDetailDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 制品收货记录子 Mapper
  *
@@ -54,6 +56,10 @@ public interface ProductreceiptRecordDetailMapper extends BaseMapperX<Productrec
                 .orderByDesc(ProductreceiptRecordDetailDO::getId));
     }
 
+    default PageResult<ProductreceiptRecordDetailDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<ProductreceiptRecordDetailDO> selectList(ProductreceiptRecordDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductreceiptRecordDetailDO>()
                 .eqIfPresent(ProductreceiptRecordDetailDO::getProductionlineCode, reqVO.getProductionlineCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRecord/ProductreceiptRecordMainMapper.java

@@ -1,15 +1,17 @@
 package com.win.module.wms.dal.mysql.productreceiptRecord;
 
-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.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.productreceiptRecord.vo.ProductreceiptRecordMainExportReqVO;
 import com.win.module.wms.controller.productreceiptRecord.vo.ProductreceiptRecordMainPageReqVO;
 import com.win.module.wms.dal.dataobject.productreceiptRecord.ProductreceiptRecordMainDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 制品收货记录主 Mapper
  *
@@ -47,6 +49,10 @@ public interface ProductreceiptRecordMainMapper extends BaseMapperX<Productrecei
                 .orderByDesc(ProductreceiptRecordMainDO::getId));
     }
 
+    default PageResult<ProductreceiptRecordMainDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<ProductreceiptRecordMainDO> selectList(ProductreceiptRecordMainExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductreceiptRecordMainDO>()
                 .eqIfPresent(ProductreceiptRecordMainDO::getRequestNumber, reqVO.getRequestNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRequest/ProductreceiptRequestDetailMapper.java

@@ -1,15 +1,17 @@
 package com.win.module.wms.dal.mysql.productreceiptRequest;
 
-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.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestDetailExportReqVO;
 import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestDetailPageReqVO;
 import com.win.module.wms.dal.dataobject.productreceiptRequest.ProductreceiptRequestDetailDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 制品收货申请子 Mapper
  *
@@ -50,6 +52,10 @@ public interface ProductreceiptRequestDetailMapper extends BaseMapperX<Productre
                 .orderByDesc(ProductreceiptRequestDetailDO::getId));
     }
 
+    default PageResult<ProductreceiptRequestDetailDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<ProductreceiptRequestDetailDO> selectList(ProductreceiptRequestDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductreceiptRequestDetailDO>()
                 .eqIfPresent(ProductreceiptRequestDetailDO::getProductionLineCode, reqVO.getProductionLineCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRequest/ProductreceiptRequestMainMapper.java

@@ -1,15 +1,17 @@
 package com.win.module.wms.dal.mysql.productreceiptRequest;
 
-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.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestMainExportReqVO;
 import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestMainPageReqVO;
 import com.win.module.wms.dal.dataobject.productreceiptRequest.ProductreceiptRequestMainDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 制品收货申请主 Mapper
  *
@@ -45,6 +47,10 @@ public interface ProductreceiptRequestMainMapper extends BaseMapperX<Productrece
                 .orderByDesc(ProductreceiptRequestMainDO::getId));
     }
 
+    default PageResult<ProductreceiptRequestMainDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<ProductreceiptRequestMainDO> selectList(ProductreceiptRequestMainExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductreceiptRequestMainDO>()
                 .eqIfPresent(ProductreceiptRequestMainDO::getProductionPlanNumber, reqVO.getProductionPlanNumber())

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

@@ -1,8 +1,10 @@
 package com.win.module.wms.dal.mysql.productrepairRecord;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.mybatis.core.mapper.BaseMapperX;
 import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 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.productrepairRecord.ConsumeRecordDetailbDO;
@@ -41,6 +43,10 @@ public interface ConsumeRecordDetailbMapper extends BaseMapperX<ConsumeRecordDet
                 .orderByDesc(ConsumeRecordDetailbDO::getId));
     }
 
+    default PageResult<ConsumeRecordDetailbDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<ConsumeRecordDetailbDO> selectList(ConsumeRecordDetailbExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ConsumeRecordDetailbDO>()
                 .eqIfPresent(ConsumeRecordDetailbDO::getBatch, reqVO.getBatch())

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

@@ -1,15 +1,17 @@
 package com.win.module.wms.dal.mysql.productrepairRecord;
 
-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.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.productrepairRecord.vo.ProductrepairRecordDetailExportReqVO;
 import com.win.module.wms.controller.productrepairRecord.vo.ProductrepairRecordDetailPageReqVO;
 import com.win.module.wms.dal.dataobject.productrepairRecord.ProductrepairRecordDetailDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 制品返修记录子 Mapper
  *
@@ -50,6 +52,10 @@ public interface ProductrepairRecordDetailMapper extends BaseMapperX<Productrepa
                 .orderByDesc(ProductrepairRecordDetailDO::getId));
     }
 
+    default PageResult<ProductrepairRecordDetailDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<ProductrepairRecordDetailDO> selectList(ProductrepairRecordDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductrepairRecordDetailDO>()
                 .eqIfPresent(ProductrepairRecordDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode())