高级搜索代码编写

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dock/DockController.java

@@ -1,6 +1,6 @@
 package com.win.module.wms.controller.dock;
-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.dict.core.util.DictFrameworkUtils;
 import com.win.framework.excel.core.util.ExcelUtils;
@@ -29,10 +29,8 @@ import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.*;
 
-import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.win.framework.common.pojo.CommonResult.success;
 import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
-import static com.win.module.wms.enums.ErrorCodeConstants.*;
 
 @Tag(name = "管理后台 - 月台")
 @RestController
@@ -98,6 +96,19 @@ public class DockController {
         return success(DockConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得月台分页")
+    @PreAuthorize("@ss.hasPermission('wms:dock:query')")
+    public CommonResult<PageResult<DockRespVO>> getDockSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<DockDO> pageResult = dockService.getDockSenior(conditions);
+        PageResult<DockRespVO> result = DockConvert.INSTANCE.convertPage(pageResult);
+        for(DockRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/export-excel")
     @Operation(summary = "导出月台 Excel")
     @PreAuthorize("@ss.hasPermission('wms:dock:export')")
@@ -112,7 +123,12 @@ public class DockController {
             //后端创建个字段作为前端展示的虚拟字段
             vo.setCreator(user.getNickname());
         }
-        ExcelUtils.write(response, "月台.xls", "数据", DockExcelVO.class, datas);
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.DOCK_TYPE);
+        mapDropDown.put(5, type);
+        String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
+        mapDropDown.put(10, available);;
+        ExcelUtils.write(response, "月台.xls", "数据", DockExcelVO.class, datas,mapDropDown);
     }
 
     @GetMapping("/get-import-template")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentSwitch/SwitchController.java

@@ -1,6 +1,8 @@
 package com.win.module.wms.controller.documentSwitch;
 
-import com.win.module.wms.controller.documentSwitch.vo.*;
+import com.win.framework.common.pojo.CustomConditions;
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -37,6 +39,9 @@ public class SwitchController {
     @Resource
     private SwitchService switchService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建单据开关")
     @PreAuthorize("@ss.hasPermission('wms:switch:create')")
@@ -79,6 +84,20 @@ public class SwitchController {
         return success(SwitchConvert.INSTANCE.convertList(list));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得单据开关分页")
+    @PreAuthorize("@ss.hasPermission('wms:switch:query')")
+    public CommonResult<PageResult<SwitchRespVO>> getSwitchSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<SwitchDO> pageResult = switchService.getSwitchSenior(conditions);
+        PageResult<SwitchRespVO> result = SwitchConvert.INSTANCE.convertPage(pageResult);
+        for(SwitchRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+    
     @GetMapping("/page")
     @Operation(summary = "获得单据开关分页")
     @PreAuthorize("@ss.hasPermission('wms:switch:query')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentSwitch/vo/SwitchRespVO.java

@@ -3,6 +3,8 @@ package com.win.module.wms.controller.documentSwitch.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
+import java.time.LocalDateTime;
+
 @Schema(description = "管理后台 - 单据开关 Response VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -12,4 +14,9 @@ public class SwitchRespVO extends SwitchBaseVO {
     @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "17760")
     private Long id;
 
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    private LocalDateTime createTime;
+
+    @Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String creator;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentsetting/DocumentsettingController.java

@@ -1,6 +1,7 @@
 package com.win.module.wms.controller.documentsetting;
 
 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;
@@ -94,6 +95,20 @@ public class DocumentsettingController {
         return success(DocumentsettingConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得单据设置分页")
+    @PreAuthorize("@ss.hasPermission('wms:documentsetting:query')")
+    public CommonResult<PageResult<DocumentsettingRespVO>> getDocumentsettingSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<DocumentsettingDO> pageResult = documentsettingService.getDocumentsettingSenior(conditions);
+        PageResult<DocumentsettingRespVO> result = DocumentsettingConvert.INSTANCE.convertPage(pageResult);
+        for(DocumentsettingRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+    
     @GetMapping("/export-excel")
     @Operation(summary = "导出单据设置 Excel")
     @PreAuthorize("@ss.hasPermission('wms:documentsetting:export')")
@@ -108,7 +123,12 @@ public class DocumentsettingController {
             //后端创建个字段作为前端展示的虚拟字段
             vo.setCreator(user.getNickname());
         }
-        ExcelUtils.write(response, "单据设置.xls", "数据", DocumentsettingExcelVO.class, datas);
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.DOCUMENT_TYPE);
+        mapDropDown.put(3, type);
+        String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PACK_UNIT);
+        mapDropDown.put(10, available);;
+        ExcelUtils.write(response, "单据设置.xls", "数据", DocumentsettingExcelVO.class, datas,mapDropDown);
     }
     @GetMapping("/get-import-template")
     @Operation(summary = "获得导入单据设置模板")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/ExpectinController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.expectin;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.expectin.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -92,6 +92,20 @@ public class ExpectinController {
         return success(ExpectinConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得预计入库存分页")
+    @PreAuthorize("@ss.hasPermission('wms:expectin:query')")
+    public CommonResult<PageResult<ExpectinRespVO>> getExpectinSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ExpectinDO> pageResult = expectinService.getExpectinSenior(conditions);
+        PageResult<ExpectinRespVO> result = ExpectinConvert.INSTANCE.convertPage(pageResult);
+        for(ExpectinRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+    
     @GetMapping("/export-excel")
     @Operation(summary = "导出预计入库存 Excel")
     @PreAuthorize("@ss.hasPermission('wms:expectin:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/vo/ExpectinRespVO.java

@@ -3,10 +3,18 @@ package com.win.module.wms.controller.expectin.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
+import java.time.LocalDateTime;
+
 @Schema(description = "管理后台 - 预计入库存 Response VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class ExpectinRespVO extends ExpectinBaseVO {
 
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    private LocalDateTime createTime;
+
+    @Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String creator;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectout/ExpectoutController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.expectout;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.expectout.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -92,6 +92,20 @@ public class ExpectoutController {
         return success(ExpectoutConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得账期日历分页")
+    @PreAuthorize("@ss.hasPermission('wms:expectout:query')")
+    public CommonResult<PageResult<ExpectoutRespVO>> getExpectoutSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ExpectoutDO> pageResult = expectoutService.getExpectoutSenior(conditions);
+        PageResult<ExpectoutRespVO> result = ExpectoutConvert.INSTANCE.convertPage(pageResult);
+        for(ExpectoutRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+    
     @GetMapping("/export-excel")
     @Operation(summary = "导出预计出库存 Excel")
     @PreAuthorize("@ss.hasPermission('wms:expectout:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectout/vo/ExpectoutRespVO.java

@@ -3,10 +3,18 @@ package com.win.module.wms.controller.expectout.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
+import java.time.LocalDateTime;
+
 @Schema(description = "管理后台 - 预计出库存 Response VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class ExpectoutRespVO extends ExpectoutBaseVO {
 
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    private LocalDateTime createTime;
+
+    @Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String creator;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobDetailController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.inspectJob;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.inspectJob.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -92,6 +92,19 @@ public class InspectJobDetailController {
         return success(InspectJobDetailConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得检验任务子分页")
+    @PreAuthorize("@ss.hasPermission('wms:inspect-job-detail:query')")
+    public CommonResult<PageResult<InspectJobDetailRespVO>> getInspectJobDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<InspectJobDetailDO> pageResult = inspectJobDetailService.getInspectJobDetailSenior(conditions);
+        PageResult<InspectJobDetailRespVO> result = InspectJobDetailConvert.INSTANCE.convertPage(pageResult);
+        for(InspectJobDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/export-excel")
     @Operation(summary = "导出检验任务子 Excel")
     @PreAuthorize("@ss.hasPermission('wms:inspect-job-detail:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.inspectJob;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.inspectJob.vo.*;
@@ -91,6 +92,19 @@ public class InspectJobMainController {
         return success(InspectJobMainConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得检验任务主分页")
+    @PreAuthorize("@ss.hasPermission('wms:inspect-job-main:query')")
+    public CommonResult<PageResult<InspectJobMainRespVO>> getInspectJobMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<InspectJobMainDO> pageResult = inspectJobMainService.getInspectJobMainSenior(conditions);
+        PageResult<InspectJobMainRespVO> result = InspectJobMainConvert.INSTANCE.convertPage(pageResult);
+        for(InspectJobMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/export-excel")
     @Operation(summary = "导出检验任务主 Excel")
     @PreAuthorize("@ss.hasPermission('wms:inspect-job-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordDetailController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.inspectRecord;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.inspectRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -92,6 +92,20 @@ public class InspectRecordDetailController {
         return success(InspectRecordDetailConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得检验记录子分页")
+    @PreAuthorize("@ss.hasPermission('wms:inspect-record-detail:query')")
+    public CommonResult<PageResult<InspectRecordDetailRespVO>> getInspectRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<InspectRecordDetailDO> pageResult = inspectRecordDetailService.getInspectRecordDetailSenior(conditions);
+        PageResult<InspectRecordDetailRespVO> result = InspectRecordDetailConvert.INSTANCE.convertPage(pageResult);
+        for(InspectRecordDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+    
     @GetMapping("/export-excel")
     @Operation(summary = "导出检验记录子 Excel")
     @PreAuthorize("@ss.hasPermission('wms:inspect-record-detail:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordMainController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.inspectRecord;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.inspectRecord.vo.*;
@@ -91,6 +92,19 @@ public class InspectRecordMainController {
         return success(InspectRecordMainConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得检验记录主分页")
+    @PreAuthorize("@ss.hasPermission('wms:inspect-record-main:query')")
+    public CommonResult<PageResult<InspectRecordMainRespVO>> getInspectRecordMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<InspectRecordMainDO> pageResult = inspectRecordMainService.getInspectRecordMainSenior(conditions);
+        PageResult<InspectRecordMainRespVO> result = InspectRecordMainConvert.INSTANCE.convertPage(pageResult);
+        for(InspectRecordMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/export-excel")
     @Operation(summary = "导出检验记录主 Excel")
     @PreAuthorize("@ss.hasPermission('wms:inspect-record-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestDetailController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.inspectRequest;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.inspectRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -92,6 +92,20 @@ public class InspectRequestDetailController {
         return success(InspectRequestDetailConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得检验申请子分页")
+    @PreAuthorize("@ss.hasPermission('wms:inspect-request-detail:query')")
+    public CommonResult<PageResult<InspectRequestDetailRespVO>> getInspectRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<InspectRequestDetailDO> pageResult = inspectRequestDetailService.getInspectRequestDetailSenior(conditions);
+        PageResult<InspectRequestDetailRespVO> result = InspectRequestDetailConvert.INSTANCE.convertPage(pageResult);
+        for(InspectRequestDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+    
     @GetMapping("/export-excel")
     @Operation(summary = "导出检验申请子 Excel")
     @PreAuthorize("@ss.hasPermission('wms:inspect-request-detail:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestMainController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.inspectRequest;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.inspectRequest.vo.*;
@@ -89,7 +90,19 @@ public class InspectRequestMainController {
         PageResult<InspectRequestMainDO> pageResult = inspectRequestMainService.getInspectRequestMainPage(pageVO);
         return success(InspectRequestMainConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得检验申请主分页")
+    @PreAuthorize("@ss.hasPermission('wms:inspect-request-main:query')")
+    public CommonResult<PageResult<InspectRequestMainRespVO>> getInspectRequestMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<InspectRequestMainDO> pageResult = inspectRequestMainService.getInspectRequestMainSenior(conditions);
+        PageResult<InspectRequestMainRespVO> result = InspectRequestMainConvert.INSTANCE.convertPage(pageResult);
+        for(InspectRequestMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/export-excel")
     @Operation(summary = "导出检验申请主 Excel")
     @PreAuthorize("@ss.hasPermission('wms:inspect-request-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailRespVO.java

@@ -3,10 +3,18 @@ package com.win.module.wms.controller.inspectRequest.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
+import java.time.LocalDateTime;
+
 @Schema(description = "管理后台 - 检验申请子 Response VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class InspectRequestDetailRespVO extends InspectRequestDetailBaseVO {
 
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    private LocalDateTime createTime;
+
+    @Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String creator;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/InventorychangeRecordDetailController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.inventorychangeRecord;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.inventorychangeRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -92,6 +92,19 @@ public class InventorychangeRecordDetailController {
         return success(InventorychangeRecordDetailConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得库存修改记录子分页")
+    @PreAuthorize("@ss.hasPermission('wms:accountcalendar:query')")
+    public CommonResult<PageResult<InventorychangeRecordDetailRespVO>> getInventorychangeRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<InventorychangeRecordDetailDO> pageResult = inventorychangeRecordDetailService.getInventorychangeRecordDetailSenior(conditions);
+        PageResult<InventorychangeRecordDetailRespVO> result = InventorychangeRecordDetailConvert.INSTANCE.convertPage(pageResult);
+        for(InventorychangeRecordDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/export-excel")
     @Operation(summary = "导出库存修改记录子 Excel")
     @PreAuthorize("@ss.hasPermission('wms:inventorychange-record-detail:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/InventorychangeRecordMainController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.inventorychangeRecord;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.inventorychangeRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -92,6 +92,19 @@ public class InventorychangeRecordMainController {
         return success(InventorychangeRecordMainConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得库存修改记录主分页")
+    @PreAuthorize("@ss.hasPermission('wms:inventorychange-record-main:query')")
+    public CommonResult<PageResult<InventorychangeRecordMainRespVO>> getInventorychangeRecordMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<InventorychangeRecordMainDO> pageResult = inventorychangeRecordMainService.getInventorychangeRecordMainSenior(conditions);
+        PageResult<InventorychangeRecordMainRespVO> result = InventorychangeRecordMainConvert.INSTANCE.convertPage(pageResult);
+        for(InventorychangeRecordMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/export-excel")
     @Operation(summary = "导出库存修改记录主 Excel")
     @PreAuthorize("@ss.hasPermission('wms:inventorychange-record-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/InventorychangeRequestDetailController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.inventorychangeRequest;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.inventorychangeRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -91,7 +91,19 @@ public class InventorychangeRequestDetailController {
         PageResult<InventorychangeRequestDetailDO> pageResult = inventorychangeRequestDetailService.getInventorychangeRequestDetailPage(pageVO);
         return success(InventorychangeRequestDetailConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得库存修改申请子分页")
+    @PreAuthorize("@ss.hasPermission('wms:inventorychange-request-detail:query')")
+    public CommonResult<PageResult<InventorychangeRequestDetailRespVO>> getInventorychangeRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<InventorychangeRequestDetailDO> pageResult = inventorychangeRequestDetailService.getInventorychangeRequestDetailSenior(conditions);
+        PageResult<InventorychangeRequestDetailRespVO> result = InventorychangeRequestDetailConvert.INSTANCE.convertPage(pageResult);
+        for(InventorychangeRequestDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/export-excel")
     @Operation(summary = "导出库存修改申请子 Excel")
     @PreAuthorize("@ss.hasPermission('wms:inventorychange-request-detail:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/InventorychangeRequestMainController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.inventorychangeRequest;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.inventorychangeRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -91,7 +91,19 @@ public class InventorychangeRequestMainController {
         PageResult<InventorychangeRequestMainDO> pageResult = inventorychangeRequestMainService.getInventorychangeRequestMainPage(pageVO);
         return success(InventorychangeRequestMainConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得库存修改申请主分页")
+    @PreAuthorize("@ss.hasPermission('wms:inventorychange-request-main:query')")
+    public CommonResult<PageResult<InventorychangeRequestMainRespVO>> getInventorychangeRequestMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<InventorychangeRequestMainDO> pageResult = inventorychangeRequestMainService.getInventorychangeRequestMainSenior(conditions);
+        PageResult<InventorychangeRequestMainRespVO> result = InventorychangeRequestMainConvert.INSTANCE.convertPage(pageResult);
+        for(InventorychangeRequestMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/export-excel")
     @Operation(summary = "导出库存修改申请主 Excel")
     @PreAuthorize("@ss.hasPermission('wms:inventorychange-request-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/InventoryinitRecordDetailController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.inventoryinitRecord;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.inventoryinitRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -92,6 +92,19 @@ public class InventoryinitRecordDetailController {
         return success(InventoryinitRecordDetailConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得库存初始化记录子分页")
+    @PreAuthorize("@ss.hasPermission('wms:inventoryinit-record-detail:query')")
+    public CommonResult<PageResult<InventoryinitRecordDetailRespVO>> getInventoryinitRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<InventoryinitRecordDetailDO> pageResult = inventoryinitRecordDetailService.getInventoryinitRecordDetailSenior(conditions);
+        PageResult<InventoryinitRecordDetailRespVO> result = InventoryinitRecordDetailConvert.INSTANCE.convertPage(pageResult);
+        for(InventoryinitRecordDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/export-excel")
     @Operation(summary = "导出库存初始化记录子 Excel")
     @PreAuthorize("@ss.hasPermission('wms:inventoryinit-record-detail:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/InventoryinitRecordMainController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.inventoryinitRecord;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.inventoryinitRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -91,7 +91,19 @@ public class InventoryinitRecordMainController {
         PageResult<InventoryinitRecordMainDO> pageResult = inventoryinitRecordMainService.getInventoryinitRecordMainPage(pageVO);
         return success(InventoryinitRecordMainConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得库存初始化记录主分页")
+    @PreAuthorize("@ss.hasPermission('wms:inventoryinit-record-main:query')")
+    public CommonResult<PageResult<InventoryinitRecordMainRespVO>> getInventoryinitRecordMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<InventoryinitRecordMainDO> pageResult = inventoryinitRecordMainService.getInventoryinitRecordMainSenior(conditions);
+        PageResult<InventoryinitRecordMainRespVO> result = InventoryinitRecordMainConvert.INSTANCE.convertPage(pageResult);
+        for(InventoryinitRecordMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/export-excel")
     @Operation(summary = "导出库存初始化记录主 Excel")
     @PreAuthorize("@ss.hasPermission('wms:inventoryinit-record-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/InventoryinitRequestDetailController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.inventoryinitRequest;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.inventoryinitRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -92,6 +92,20 @@ public class InventoryinitRequestDetailController {
         return success(InventoryinitRequestDetailConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得库存初始化申请子分页")
+    @PreAuthorize("@ss.hasPermission('wms:inventoryinit-request-detail:query')")
+    public CommonResult<PageResult<InventoryinitRequestDetailRespVO>> getInventoryinitRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<InventoryinitRequestDetailDO> pageResult = inventoryinitRequestDetailService.getInventoryinitRequestDetailSenior(conditions);
+        PageResult<InventoryinitRequestDetailRespVO> result = InventoryinitRequestDetailConvert.INSTANCE.convertPage(pageResult);
+        for(InventoryinitRequestDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+    
     @GetMapping("/export-excel")
     @Operation(summary = "导出库存初始化申请子 Excel")
     @PreAuthorize("@ss.hasPermission('wms:inventoryinit-request-detail:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/InventoryinitRequestMainController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.inventoryinitRequest;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.inventoryinitRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -91,7 +91,19 @@ public class InventoryinitRequestMainController {
         PageResult<InventoryinitRequestMainDO> pageResult = inventoryinitRequestMainService.getInventoryinitRequestMainPage(pageVO);
         return success(InventoryinitRequestMainConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得库存初始化申请主分页")
+    @PreAuthorize("@ss.hasPermission('wms:accountcalendar:query')")
+    public CommonResult<PageResult<InventoryinitRequestMainRespVO>> getInventoryinitRequestMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<InventoryinitRequestMainDO> pageResult = inventoryinitRequestMainService.getInventoryinitRequestMainSenior(conditions);
+        PageResult<InventoryinitRequestMainRespVO> result = InventoryinitRequestMainConvert.INSTANCE.convertPage(pageResult);
+        for(InventoryinitRequestMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/export-excel")
     @Operation(summary = "导出库存初始化申请主 Excel")
     @PreAuthorize("@ss.hasPermission('wms:inventoryinit-request-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobDetailController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.inventorymoveJob;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.inventorymoveJob.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -90,7 +90,19 @@ public class InventorymoveJobDetailController {
         PageResult<InventorymoveJobDetailDO> pageResult = inventorymoveJobDetailService.getInventorymoveJobDetailPage(pageVO);
         return success(InventorymoveJobDetailConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得库存转移任务子分页")
+    @PreAuthorize("@ss.hasPermission('wms:inventorymove-job-detail:query')")
+    public CommonResult<PageResult<InventorymoveJobDetailRespVO>> getInventorymoveJobDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<InventorymoveJobDetailDO> pageResult = inventorymoveJobDetailService.getInventorymoveJobDetailSenior(conditions);
+        PageResult<InventorymoveJobDetailRespVO> result = InventorymoveJobDetailConvert.INSTANCE.convertPage(pageResult);
+        for(InventorymoveJobDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/export-excel")
     @Operation(summary = "导出库存转移任务子 Excel")
     @PreAuthorize("@ss.hasPermission('wms:inventorymove-job-detail:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobMainController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.inventorymoveJob;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.inventorymoveJob.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -92,6 +92,20 @@ public class InventorymoveJobMainController {
         return success(InventorymoveJobMainConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得库存转移任务主分页")
+    @PreAuthorize("@ss.hasPermission('wms:inventorymove-job-main:query')")
+    public CommonResult<PageResult<InventorymoveJobMainRespVO>> getInventorymoveJobMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<InventorymoveJobMainDO> pageResult = inventorymoveJobMainService.getInventorymoveJobMainSenior(conditions);
+        PageResult<InventorymoveJobMainRespVO> result = InventorymoveJobMainConvert.INSTANCE.convertPage(pageResult);
+        for(InventorymoveJobMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+    
     @GetMapping("/export-excel")
     @Operation(summary = "导出库存转移任务主 Excel")
     @PreAuthorize("@ss.hasPermission('wms:inventorymove-job-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordDetailController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.inventorymoveRecord;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.inventorymoveRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -94,6 +94,20 @@ public class InventorymoveRecordDetailController {
         return success(InventorymoveRecordDetailConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得库存转移记录子分页")
+    @PreAuthorize("@ss.hasPermission('wms:inventorymove-record-detail:query')")
+    public CommonResult<PageResult<InventorymoveRecordDetailRespVO>> getInventorymoveRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<InventorymoveRecordDetailDO> pageResult = inventorymoveRecordDetailService.getInventorymoveRecordDetailSenior(conditions);
+        PageResult<InventorymoveRecordDetailRespVO> result = InventorymoveRecordDetailConvert.INSTANCE.convertPage(pageResult);
+        for(InventorymoveRecordDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出库存转移记录子 Excel")
     @PreAuthorize("@ss.hasPermission('wms:inventorymove-record-detail:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordMainController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.inventorymoveRecord;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.inventorymoveRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -91,7 +91,20 @@ public class InventorymoveRecordMainController {
         PageResult<InventorymoveRecordMainDO> pageResult = inventorymoveRecordMainService.getInventorymoveRecordMainPage(pageVO);
         return success(InventorymoveRecordMainConvert.INSTANCE.convertPage(pageResult));
     }
-
+    
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得库存转移记录主分页")
+    @PreAuthorize("@ss.hasPermission('wms:inventorymove-record-main:query')")
+    public CommonResult<PageResult<InventorymoveRecordMainRespVO>> getInventorymoveRecordMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<InventorymoveRecordMainDO> pageResult = inventorymoveRecordMainService.getInventorymoveRecordMainSenior(conditions);
+        PageResult<InventorymoveRecordMainRespVO> result = InventorymoveRecordMainConvert.INSTANCE.convertPage(pageResult);
+        for(InventorymoveRecordMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/export-excel")
     @Operation(summary = "导出库存转移记录主 Excel")
     @PreAuthorize("@ss.hasPermission('wms:inventorymove-record-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/InventorymoveRequestDetailController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.inventorymoveRequest;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.inventorymoveRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -90,7 +90,20 @@ public class InventorymoveRequestDetailController {
         PageResult<InventorymoveRequestDetailDO> pageResult = inventorymoveRequestDetailService.getInventorymoveRequestDetailPage(pageVO);
         return success(InventorymoveRequestDetailConvert.INSTANCE.convertPage(pageResult));
     }
-
+    
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得库存转移申请子分页")
+    @PreAuthorize("@ss.hasPermission('wms:inventorymove-request-detail:query')")
+    public CommonResult<PageResult<InventorymoveRequestDetailRespVO>> getInventorymoveRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<InventorymoveRequestDetailDO> pageResult = inventorymoveRequestDetailService.getInventorymoveRequestDetailSenior(conditions);
+        PageResult<InventorymoveRequestDetailRespVO> result = InventorymoveRequestDetailConvert.INSTANCE.convertPage(pageResult);
+        for(InventorymoveRequestDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/export-excel")
     @Operation(summary = "导出库存转移申请子 Excel")
     @PreAuthorize("@ss.hasPermission('wms:inventorymove-request-detail:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/InventorymoveRequestMainController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.inventorymoveRequest;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.inventorymoveRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -91,7 +91,20 @@ public class InventorymoveRequestMainController {
         PageResult<InventorymoveRequestMainDO> pageResult = inventorymoveRequestMainService.getInventorymoveRequestMainPage(pageVO);
         return success(InventorymoveRequestMainConvert.INSTANCE.convertPage(pageResult));
     }
-
+    
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得库存转移申请主分页")
+    @PreAuthorize("@ss.hasPermission('wms:inventorymove-request-main:query')")
+    public CommonResult<PageResult<InventorymoveRequestMainRespVO>> getInventorymoveRequestMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<InventorymoveRequestMainDO> pageResult = inventorymoveRequestMainService.getInventorymoveRequestMainSenior(conditions);
+        PageResult<InventorymoveRequestMainRespVO> result = InventorymoveRequestMainConvert.INSTANCE.convertPage(pageResult);
+        for(InventorymoveRequestMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/export-excel")
     @Operation(summary = "导出库存转移申请主 Excel")
     @PreAuthorize("@ss.hasPermission('wms:inventorymove-request-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobDetailController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.issueJob;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.issueJob.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -90,7 +90,20 @@ public class IssueJobDetailController {
         PageResult<IssueJobDetailDO> pageResult = issueJobDetailService.getIssueJobDetailPage(pageVO);
         return success(IssueJobDetailConvert.INSTANCE.convertPage(pageResult));
     }
-
+    
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得发料任务子分页")
+    @PreAuthorize("@ss.hasPermission('wms:issue-job-detail:query')")
+    public CommonResult<PageResult<IssueJobDetailRespVO>> getIssueJobDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<IssueJobDetailDO> pageResult = issueJobDetailService.getIssueJobDetailSenior(conditions);
+        PageResult<IssueJobDetailRespVO> result = IssueJobDetailConvert.INSTANCE.convertPage(pageResult);
+        for(IssueJobDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/export-excel")
     @Operation(summary = "导出发料任务子 Excel")
     @PreAuthorize("@ss.hasPermission('wms:issue-job-detail:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobMainController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.issueJob;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.issueJob.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -92,6 +92,19 @@ public class IssueJobMainController {
         return success(IssueJobMainConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得发料任务主分页分页")
+    @PreAuthorize("@ss.hasPermission('wms:accountcalendar:query')")
+    public CommonResult<PageResult<IssueJobMainRespVO>> getIssueJobMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<IssueJobMainDO> pageResult = issueJobMainService.getIssueJobMainSenior(conditions);
+        PageResult<IssueJobMainRespVO> result = IssueJobMainConvert.INSTANCE.convertPage(pageResult);
+        for(IssueJobMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/export-excel")
     @Operation(summary = "导出发料任务主 Excel")
     @PreAuthorize("@ss.hasPermission('wms:issue-job-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/IssueRecordDetailController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.issueRecord;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.issueRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -90,7 +90,19 @@ public class IssueRecordDetailController {
         PageResult<IssueRecordDetailDO> pageResult = issueRecordDetailService.getIssueRecordDetailPage(pageVO);
         return success(IssueRecordDetailConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得发料记录子分页")
+    @PreAuthorize("@ss.hasPermission('wms:issue-record-detail:query')")
+    public CommonResult<PageResult<IssueRecordDetailRespVO>> getIssueRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<IssueRecordDetailDO> pageResult = issueRecordDetailService.getIssueRecordDetailSenior(conditions);
+        PageResult<IssueRecordDetailRespVO> result = IssueRecordDetailConvert.INSTANCE.convertPage(pageResult);
+        for(IssueRecordDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/export-excel")
     @Operation(summary = "导出发料记录子 Excel")
     @PreAuthorize("@ss.hasPermission('wms:issue-record-detail:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/IssueRecordMainController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.issueRecord;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.issueRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -92,6 +92,19 @@ public class IssueRecordMainController {
         return success(IssueRecordMainConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得发料记录主分页")
+    @PreAuthorize("@ss.hasPermission('wms:issue-record-main:query')")
+    public CommonResult<PageResult<IssueRecordMainRespVO>> getIssueRecordMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<IssueRecordMainDO> pageResult = issueRecordMainService.getIssueRecordMainSenior(conditions);
+        PageResult<IssueRecordMainRespVO> result = IssueRecordMainConvert.INSTANCE.convertPage(pageResult);
+        for(IssueRecordMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/export-excel")
     @Operation(summary = "导出发料记录主 Excel")
     @PreAuthorize("@ss.hasPermission('wms:issue-record-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/IssueRequestDetailController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.issueRequest;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.issueRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -92,6 +92,20 @@ public class IssueRequestDetailController {
         return success(IssueRequestDetailConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得发料申请子分页")
+    @PreAuthorize("@ss.hasPermission('wms:issue-request-detail:query')")
+    public CommonResult<PageResult<IssueRequestDetailRespVO>> getIssueRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<IssueRequestDetailDO> pageResult = issueRequestDetailService.getIssueRequestDetailSenior(conditions);
+        PageResult<IssueRequestDetailRespVO> result = IssueRequestDetailConvert.INSTANCE.convertPage(pageResult);
+        for(IssueRequestDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+    
     @GetMapping("/export-excel")
     @Operation(summary = "导出发料申请子 Excel")
     @PreAuthorize("@ss.hasPermission('wms:issue-request-detail:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/IssueRequestMainController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.issueRequest;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.issueRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -91,7 +91,21 @@ public class IssueRequestMainController {
         PageResult<IssueRequestMainDO> pageResult = issueRequestMainService.getIssueRequestMainPage(pageVO);
         return success(IssueRequestMainConvert.INSTANCE.convertPage(pageResult));
     }
-
+    
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得发料申请主分页")
+    @PreAuthorize("@ss.hasPermission('wms:issue-request-main:query')")
+    public CommonResult<PageResult<IssueRequestMainRespVO>> getIssueRequestMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<IssueRequestMainDO> pageResult = issueRequestMainService.getIssueRequestMainSenior(conditions);
+        PageResult<IssueRequestMainRespVO> result = IssueRequestMainConvert.INSTANCE.convertPage(pageResult);
+        for(IssueRequestMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+    
     @GetMapping("/export-excel")
     @Operation(summary = "导出发料申请主 Excel")
     @PreAuthorize("@ss.hasPermission('wms:issue-request-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/ItempackagingController.java

@@ -1,6 +1,7 @@
 package com.win.module.wms.controller.itempackaging;
 
 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;
@@ -86,13 +87,26 @@ public class ItempackagingController {
     }
 
     @GetMapping("/page")
-    @Operation(summary = "获得物品包装信息 分页")
+    @Operation(summary = "获得物品包装信息分页")
     @PreAuthorize("@ss.hasPermission('wms:itempackaging:query')")
     public CommonResult<PageResult<ItempackagingRespVO>> getItempackagingPage(@Valid ItempackagingPageReqVO pageVO) {
         PageResult<ItempackagingDO> pageResult = itempackagingService.getItempackagingPage(pageVO);
         return success(ItempackagingConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品包装信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:itempackaging:query')")
+    public CommonResult<PageResult<ItempackagingRespVO>> getItempackagingSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ItempackagingDO> pageResult = itempackagingService.getItempackagingSenior(conditions);
+        PageResult<ItempackagingRespVO> result = ItempackagingConvert.INSTANCE.convertPage(pageResult);
+        for(ItempackagingRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/export-excel")
     @Operation(summary = "导出物品包装信息  Excel")
     @PreAuthorize("@ss.hasPermission('wms:itempackaging:export')")
@@ -107,7 +121,22 @@ public class ItempackagingController {
             //后端创建个字段作为前端展示的虚拟字段
             vo.setCreator(user.getNickname());
         }
-        ExcelUtils.write(response, "物品包装信息 .xls", "数据", ItempackagingExcelVO.class, datas);
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
+        mapDropDown.put(1, uom);
+        String[] description = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
+        mapDropDown.put(2, description);;
+        String[] altPackUnit1 = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
+        mapDropDown.put(5, altPackUnit1);;
+        String[] altPackUnit2 = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
+        mapDropDown.put(7, altPackUnit2);;
+        String[] altPackUnit3 = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
+        mapDropDown.put(9, altPackUnit3);;
+        String[] altPackUnit4 = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
+        mapDropDown.put(11, altPackUnit4);;
+        String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
+        mapDropDown.put(13, available);;
+        ExcelUtils.write(response, "物品包装信息 .xls", "数据", ItempackagingExcelVO.class, datas,mapDropDown);
     }
 
     @GetMapping("/get-import-template")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/jobsetting/JobsettingController.java

@@ -1,6 +1,7 @@
 package com.win.module.wms.controller.jobsetting;
 
 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;
@@ -111,6 +112,20 @@ public class JobsettingController {
         ExcelUtils.write(response, "任务设置.xls", "数据", JobsettingExcelVO.class, datas);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得任务设置分页")
+    @PreAuthorize("@ss.hasPermission('wms:jobsetting:query')")
+    public CommonResult<PageResult<JobsettingRespVO>> getJobsettingSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<JobsettingDO> pageResult = jobsettingService.getJobsettingSenior(conditions);
+        PageResult<JobsettingRespVO> result = JobsettingConvert.INSTANCE.convertPage(pageResult);
+        for(JobsettingRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+    
     @GetMapping("/get-import-template")
     @Operation(summary = "获得导入任务设置模板")
     public void importTemplate(HttpServletResponse response) throws IOException {

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labeltype/LabeltypeController.java

@@ -1,6 +1,7 @@
 package com.win.module.wms.controller.labeltype;
 
 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;
@@ -88,7 +89,19 @@ public class LabeltypeController {
         PageResult<LabeltypeDO> pageResult = labeltypeService.getLabeltypePage(pageVO);
         return success(LabeltypeConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得标签定义分页")
+    @PreAuthorize("@ss.hasPermission('wms:labeltypeService:query')")
+    public CommonResult<PageResult<LabeltypeRespVO>> getLabeltypeSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<LabeltypeDO> pageResult = labeltypeService.getLabeltypeSenior(conditions);
+        PageResult<LabeltypeRespVO> result = LabeltypeConvert.INSTANCE.convertPage(pageResult);
+        for(LabeltypeRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/export-excel")
     @Operation(summary = "导出标签定义 Excel")
     @PreAuthorize("@ss.hasPermission('wms:labeltypeService:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labeltype/vo/LabeltypeRespVO.java

@@ -3,6 +3,8 @@ package com.win.module.wms.controller.labeltype.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
+import java.time.LocalDateTime;
+
 @Schema(description = "管理后台 - 标签定义 Response VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -12,4 +14,9 @@ public class LabeltypeRespVO extends LabeltypeBaseVO {
     @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "5848")
     private Long id;
 
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    private LocalDateTime createTime;
+
+    @Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String creator;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/LocationController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.location;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.win.framework.common.exception.ErrorCode;
 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;
@@ -10,10 +10,7 @@ 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.location.vo.*;
-import com.win.module.wms.controller.rule.vo.RuleRespVO;
 import com.win.module.wms.convert.location.LocationConvert;
-import com.win.module.wms.dal.dataobject.balance.BalanceDO;
-import com.win.module.wms.dal.dataobject.expectout.ExpectoutDO;
 import com.win.module.wms.dal.dataobject.location.LocationDO;
 import com.win.module.wms.dal.mysql.balance.BalanceMapper;
 import com.win.module.wms.dal.mysql.expectout.ExpectoutMapper;
@@ -114,6 +111,20 @@ public class LocationController {
         return success(LocationConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得账期日历分页")
+    @PreAuthorize("@ss.hasPermission('wms:accountcalendar:query')")
+    public CommonResult<PageResult<LocationRespVO>> getLocationSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<LocationDO> pageResult = locationService.getLocationSenior(conditions);
+        PageResult<LocationRespVO> result = LocationConvert.INSTANCE.convertPage(pageResult);
+        for(LocationRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+    
     @GetMapping("/export-excel")
     @Operation(summary = "导出库位 Excel")
     @PreAuthorize("@ss.hasPermission('wms:location:export')")
@@ -128,7 +139,18 @@ public class LocationController {
             //后端创建个字段作为前端展示的虚拟字段
             vo.setCreator(user.getNickname());
         }
-        ExcelUtils.write(response, "库位.xls", "数据", LocationExcelVO.class, datas);
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        String[] warehouseCode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.WAREHOUSE_TYPE);
+        mapDropDown.put(3, warehouseCode);
+        String[] areaCode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.AREA_TYPE);
+        mapDropDown.put(4, areaCode);
+        String[] erpLocationCode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.ERP_LOCATION);
+        mapDropDown.put(6, erpLocationCode);
+        String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LOCATION_TYPE);
+        mapDropDown.put(7, type);
+        String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
+        mapDropDown.put(18, available);;
+        ExcelUtils.write(response, "库位.xls", "数据", LocationExcelVO.class, datas,mapDropDown);
     }
     @GetMapping("/get-import-template")
     @Operation(summary = "获得导入库位模板")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationcapacity/LocationcapacityController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.locationcapacity;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.locationcapacity.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -92,6 +92,19 @@ public class LocationcapacityController {
         return success(LocationcapacityConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得库位容量分页")
+    @PreAuthorize("@ss.hasPermission('wms:locationcapacity:query')")
+    public CommonResult<PageResult<LocationcapacityRespVO>> getLocationcapacitySenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<LocationcapacityDO> pageResult = locationcapacityService.getLocationcapacitySenior(conditions);
+        PageResult<LocationcapacityRespVO> result = LocationcapacityConvert.INSTANCE.convertPage(pageResult);
+        for(LocationcapacityRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/export-excel")
     @Operation(summary = "导出库位容量 Excel")
     @PreAuthorize("@ss.hasPermission('wms:locationcapacity:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationcapacity/vo/LocationcapacityRespVO.java

@@ -3,10 +3,17 @@ package com.win.module.wms.controller.locationcapacity.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
+import java.time.LocalDateTime;
+
 @Schema(description = "管理后台 - 库位容量 Response VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class LocationcapacityRespVO extends LocationcapacityBaseVO {
 
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    private LocalDateTime createTime;
+
+    @Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String creator;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationgroup/LocationgroupController.java

@@ -1,6 +1,7 @@
 package com.win.module.wms.controller.locationgroup;
 
 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;
@@ -92,6 +93,19 @@ public class LocationgroupController {
         return success(LocationgroupConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得库位组分页")
+    @PreAuthorize("@ss.hasPermission('wms:locationgroup:query')")
+    public CommonResult<PageResult<LocationgroupRespVO>> getLocationgroupSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<LocationgroupDO> pageResult = locationgroupService.getLocationgroupSenior(conditions);
+        PageResult<LocationgroupRespVO> result = LocationgroupConvert.INSTANCE.convertPage(pageResult);
+        for(LocationgroupRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/export-excel")
     @Operation(summary = "导出库位组 Excel")
     @PreAuthorize("@ss.hasPermission('wms:locationgroup:export')")
@@ -106,7 +120,14 @@ public class LocationgroupController {
             //后端创建个字段作为前端展示的虚拟字段
             vo.setCreator(user.getNickname());
         }
-        ExcelUtils.write(response, "库位组.xls", "数据", LocationgroupExcelVO.class, datas);
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        String[] warehouseCode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.WAREHOUSE_TYPE);
+        mapDropDown.put(3, warehouseCode);
+        String[] areaCode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.AREA_TYPE);
+        mapDropDown.put(4, areaCode);
+        String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PACK_UNIT);
+        mapDropDown.put(5, available);;
+        ExcelUtils.write(response, "库位组.xls", "数据", LocationgroupExcelVO.class, datas,mapDropDown);
     }
     @GetMapping("/get-import-template")
     @Operation(summary = "获得导入库位组模板")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/OfflinesettlementRecordDetailController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.offlinesettlementRecord;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.offlinesettlementRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -91,6 +91,19 @@ public class OfflinesettlementRecordDetailController {
         return success(OfflinesettlementRecordDetailConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得下线结算记录子分页")
+    @PreAuthorize("@ss.hasPermission('wms:offlinesettlement-record-detail:query')")
+    public CommonResult<PageResult<OfflinesettlementRecordDetailRespVO>> getOfflinesettlementRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<OfflinesettlementRecordDetailDO> pageResult = offlinesettlementRecordDetailService.getOfflinesettlementRecordDetailSenior(conditions);
+        PageResult<OfflinesettlementRecordDetailRespVO> result = OfflinesettlementRecordDetailConvert.INSTANCE.convertPage(pageResult);
+        for(OfflinesettlementRecordDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/export-excel")
     @Operation(summary = "导出下线结算记录子 Excel")
     @PreAuthorize("@ss.hasPermission('wms:offlinesettlement-record-detail:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/OfflinesettlementRecordMainController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.offlinesettlementRecord;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.offlinesettlementRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -92,6 +92,19 @@ public class OfflinesettlementRecordMainController {
         return success(OfflinesettlementRecordMainConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得下线结算记录主分页")
+    @PreAuthorize("@ss.hasPermission('wms:offlinesettlement-record-main:query')")
+    public CommonResult<PageResult<OfflinesettlementRecordMainRespVO>> getOfflinesettlementRecordMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<OfflinesettlementRecordMainDO> pageResult = offlinesettlementRecordMainService.getOfflinesettlementRecordMainSenior(conditions);
+        PageResult<OfflinesettlementRecordMainRespVO> result = OfflinesettlementRecordMainConvert.INSTANCE.convertPage(pageResult);
+        for(OfflinesettlementRecordMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/export-excel")
     @Operation(summary = "导出下线结算记录主 Excel")
     @PreAuthorize("@ss.hasPermission('wms:offlinesettlement-record-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRequest/OfflinesettlementRequestDetailController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.offlinesettlementRequest;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.offlinesettlementRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -92,6 +92,19 @@ public class OfflinesettlementRequestDetailController {
         return success(OfflinesettlementRequestDetailConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得下线结算申请子分页")
+    @PreAuthorize("@ss.hasPermission('wms:offlinesettlement-request-detail:query')")
+    public CommonResult<PageResult<OfflinesettlementRequestDetailRespVO>> getOfflinesettlementRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<OfflinesettlementRequestDetailDO> pageResult = offlinesettlementRequestDetailService.getOfflinesettlementRequestDetailSenior(conditions);
+        PageResult<OfflinesettlementRequestDetailRespVO> result = OfflinesettlementRequestDetailConvert.INSTANCE.convertPage(pageResult);
+        for(OfflinesettlementRequestDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/export-excel")
     @Operation(summary = "导出下线结算申请子 Excel")
     @PreAuthorize("@ss.hasPermission('wms:offlinesettlement-request-detail:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRequest/OfflinesettlementRequestMainController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.offlinesettlementRequest;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.offlinesettlementRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -92,6 +92,19 @@ public class OfflinesettlementRequestMainController {
         return success(OfflinesettlementRequestMainConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得下线结算申请主分页")
+    @PreAuthorize("@ss.hasPermission('wms:offlinesettlement-request-main:query')")
+    public CommonResult<PageResult<OfflinesettlementRequestMainRespVO>> getOfflinesettlementRequestMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<OfflinesettlementRequestMainDO> pageResult = offlinesettlementRequestMainService.getOfflinesettlementRequestMainSenior(conditions);
+        PageResult<OfflinesettlementRequestMainRespVO> result = OfflinesettlementRequestMainConvert.INSTANCE.convertPage(pageResult);
+        for(OfflinesettlementRequestMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/export-excel")
     @Operation(summary = "导出下线结算申请主 Excel")
     @PreAuthorize("@ss.hasPermission('wms:offlinesettlement-request-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/OnlinesettlementRecordDetailController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.onlinesettlementRecord;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.onlinesettlementRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -92,6 +92,19 @@ public class OnlinesettlementRecordDetailController {
         return success(OnlinesettlementRecordDetailConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得上线结算记录子分页")
+    @PreAuthorize("@ss.hasPermission('wms:onlinesettlement-record-detail:query')")
+    public CommonResult<PageResult<OnlinesettlementRecordDetailRespVO>> getOnlinesettlementRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<OnlinesettlementRecordDetailDO> pageResult = onlinesettlementRecordDetailService.getOnlinesettlementRecordDetailSenior(conditions);
+        PageResult<OnlinesettlementRecordDetailRespVO> result = OnlinesettlementRecordDetailConvert.INSTANCE.convertPage(pageResult);
+        for(OnlinesettlementRecordDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/export-excel")
     @Operation(summary = "导出上线结算记录子 Excel")
     @PreAuthorize("@ss.hasPermission('wms:onlinesettlement-record-detail:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/OnlinesettlementRecordMainController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.onlinesettlementRecord;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.onlinesettlementRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -92,6 +92,20 @@ public class OnlinesettlementRecordMainController {
         return success(OnlinesettlementRecordMainConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得上线结算记录主分页")
+    @PreAuthorize("@ss.hasPermission('wms:onlinesettlement-record-main:query')")
+    public CommonResult<PageResult<OnlinesettlementRecordMainRespVO>> getOnlinesettlementRecordMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<OnlinesettlementRecordMainDO> pageResult = onlinesettlementRecordMainService.getOnlinesettlementRecordMainSenior(conditions);
+        PageResult<OnlinesettlementRecordMainRespVO> result = OnlinesettlementRecordMainConvert.INSTANCE.convertPage(pageResult);
+        for(OnlinesettlementRecordMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+    
     @GetMapping("/export-excel")
     @Operation(summary = "导出上线结算记录主 Excel")
     @PreAuthorize("@ss.hasPermission('wms:onlinesettlement-record-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRequest/OnlinesettlementRequestDetailController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.onlinesettlementRequest;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.onlinesettlementRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -92,6 +92,20 @@ public class OnlinesettlementRequestDetailController {
         return success(OnlinesettlementRequestDetailConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得上线结算申请子分页")
+    @PreAuthorize("@ss.hasPermission('wms:onlinesettlement-request-detail:query')")
+    public CommonResult<PageResult<OnlinesettlementRequestDetailRespVO>> getOnlinesettlementRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<OnlinesettlementRequestDetailDO> pageResult = onlinesettlementRequestDetailService.getOnlinesettlementRequestDetailSenior(conditions);
+        PageResult<OnlinesettlementRequestDetailRespVO> result = OnlinesettlementRequestDetailConvert.INSTANCE.convertPage(pageResult);
+        for(OnlinesettlementRequestDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+    
     @GetMapping("/export-excel")
     @Operation(summary = "导出上线结算申请子 Excel")
     @PreAuthorize("@ss.hasPermission('wms:onlinesettlement-request-detail:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRequest/OnlinesettlementRequestMainController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.onlinesettlementRequest;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.onlinesettlementRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -92,6 +92,19 @@ public class OnlinesettlementRequestMainController {
         return success(OnlinesettlementRequestMainConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得上线结算申请主分页")
+    @PreAuthorize("@ss.hasPermission('wms:onlinesettlement-request-main:query')")
+    public CommonResult<PageResult<OnlinesettlementRequestMainRespVO>> getOnlinesettlementRequestMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<OnlinesettlementRequestMainDO> pageResult = onlinesettlementRequestMainService.getOnlinesettlementRequestMainSenior(conditions);
+        PageResult<OnlinesettlementRequestMainRespVO> result = OnlinesettlementRequestMainConvert.INSTANCE.convertPage(pageResult);
+        for(OnlinesettlementRequestMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/export-excel")
     @Operation(summary = "导出上线结算申请主 Excel")
     @PreAuthorize("@ss.hasPermission('wms:onlinesettlement-request-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/owner/OwnerController.java

@@ -1,6 +1,7 @@
 package com.win.module.wms.controller.owner;
 
 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;
@@ -94,6 +95,19 @@ public class OwnerController {
         return success(OwnerConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得货主分页")
+    @PreAuthorize("@ss.hasPermission('wms:owner:query')")
+    public CommonResult<PageResult<OwnerRespVO>> getOwnerSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<OwnerDO> pageResult = ownerService.getOwnerSenior(conditions);
+        PageResult<OwnerRespVO> result = OwnerConvert.INSTANCE.convertPage(pageResult);
+        for(OwnerRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/export-excel")
     @Operation(summary = "导出货主 Excel")
     @PreAuthorize("@ss.hasPermission('wms:owner:export')")
@@ -108,7 +122,14 @@ public class OwnerController {
             //后端创建个字段作为前端展示的虚拟字段
             vo.setCreator(user.getNickname());
         }
-        ExcelUtils.write(response, "货主.xls", "数据", OwnerExcelVO.class, datas);
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY);
+        mapDropDown.put(11, currency);
+        String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.OWNER_TYPE);
+        mapDropDown.put(13, type);;
+        String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
+        mapDropDown.put(14, available);;
+        ExcelUtils.write(response, "货主.xls", "数据", OwnerExcelVO.class, datas,mapDropDown);
     }
     @GetMapping("/get-import-template")
     @Operation(summary = "获得导入货主模板")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/dock/DockMapper.java

@@ -1,8 +1,10 @@
 package com.win.module.wms.dal.mysql.dock;
 
+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.dock.vo.DockExportReqVO;
 import com.win.module.wms.controller.dock.vo.DockPageReqVO;
 import com.win.module.wms.dal.dataobject.dock.DockDO;
@@ -38,7 +40,9 @@ public interface DockMapper extends BaseMapperX<DockDO> {
                 .eqIfPresent(DockDO::getCreator, reqVO.getCreator())
                 .orderByDesc(DockDO::getId));
     }
-
+    default PageResult<DockDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<DockDO> selectList(DockExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<DockDO>()
                 .eqIfPresent(DockDO::getCode, reqVO.getCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/documentSwitch/SwitchMapper.java

@@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.documentSwitch;
 
 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.documentSwitch.vo.SwitchExportReqVO;
 import com.win.module.wms.controller.documentSwitch.vo.SwitchPageReqVO;
 import com.win.module.wms.dal.dataobject.documentSwitch.SwitchDO;
@@ -27,6 +29,10 @@ public interface SwitchMapper extends BaseMapperX<SwitchDO> {
                 .orderByDesc(SwitchDO::getId));
     }
 
+    default PageResult<SwitchDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<SwitchDO> selectList(SwitchExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<SwitchDO>()
                 .eqIfPresent(SwitchDO::getCode, reqVO.getCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/documentsetting/DocumentsettingMapper.java

@@ -1,8 +1,10 @@
 package com.win.module.wms.dal.mysql.documentsetting;
 
+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.documentsetting.vo.DocumentsettingExportReqVO;
 import com.win.module.wms.controller.documentsetting.vo.DocumentsettingPageReqVO;
 import com.win.module.wms.dal.dataobject.documentsetting.DocumentsettingDO;
@@ -39,7 +41,9 @@ public interface DocumentsettingMapper extends BaseMapperX<DocumentsettingDO> {
                 .eqIfPresent(DocumentsettingDO::getIsSoftDeleted, reqVO.getIsSoftDeleted())
                 .orderByDesc(DocumentsettingDO::getId));
     }
-
+    default PageResult<DocumentsettingDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<DocumentsettingDO> selectList(DocumentsettingExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<DocumentsettingDO>()
                 .eqIfPresent(DocumentsettingDO::getCode, reqVO.getCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/expectin/ExpectinMapper.java

@@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.expectin;
 
 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.expectin.vo.ExpectinExportReqVO;
 import com.win.module.wms.controller.expectin.vo.ExpectinPageReqVO;
 import com.win.module.wms.dal.dataobject.expectin.ExpectinDO;
@@ -32,7 +34,9 @@ public interface ExpectinMapper extends BaseMapperX<ExpectinDO> {
                 .eqIfPresent(ExpectinDO::getOwnerCode, reqVO.getOwnerCode())
                 .orderByDesc(ExpectinDO::getId));
     }
-
+    default PageResult<ExpectinDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<ExpectinDO> selectList(ExpectinExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ExpectinDO>()
                 .eqIfPresent(ExpectinDO::getJobNumber, reqVO.getJobNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/expectout/ExpectoutMapper.java

@@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.expectout;
 
 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.expectout.vo.ExpectoutExportReqVO;
 import com.win.module.wms.controller.expectout.vo.ExpectoutPageReqVO;
 import com.win.module.wms.dal.dataobject.expectout.ExpectoutDO;
@@ -33,7 +35,9 @@ public interface ExpectoutMapper extends BaseMapperX<ExpectoutDO> {
                 .eqIfPresent(ExpectoutDO::getOwnerCode, reqVO.getOwnerCode())
                 .orderByDesc(ExpectoutDO::getId));
     }
-
+    default PageResult<ExpectoutDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<ExpectoutDO> selectList(ExpectoutExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ExpectoutDO>()
                 .eqIfPresent(ExpectoutDO::getJobNumber, reqVO.getJobNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectJob/InspectJobDetailMapper.java

@@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inspectJob;
 
 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.inspectJob.vo.InspectJobDetailExportReqVO;
 import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailPageReqVO;
 import com.win.module.wms.dal.dataobject.inspectJob.InspectJobDetailDO;
@@ -37,7 +39,9 @@ public interface InspectJobDetailMapper extends BaseMapperX<InspectJobDetailDO>
                 .eqIfPresent(InspectJobDetailDO::getUom, reqVO.getUom())
                 .orderByDesc(InspectJobDetailDO::getId));
     }
-
+    default PageResult<InspectJobDetailDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<InspectJobDetailDO> selectList(InspectJobDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<InspectJobDetailDO>()
                 .eqIfPresent(InspectJobDetailDO::getPackingNumber, reqVO.getPackingNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectJob/InspectJobMainMapper.java

@@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inspectJob;
 
 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.inspectJob.vo.InspectJobMainExportReqVO;
 import com.win.module.wms.controller.inspectJob.vo.InspectJobMainPageReqVO;
 import com.win.module.wms.dal.dataobject.inspectJob.InspectJobMainDO;
@@ -69,6 +71,10 @@ public interface InspectJobMainMapper extends BaseMapperX<InspectJobMainDO> {
                 .orderByDesc(InspectJobMainDO::getId));
     }
 
+    default PageResult<InspectJobMainDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<InspectJobMainDO> selectList(InspectJobMainExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<InspectJobMainDO>()
                 .eqIfPresent(InspectJobMainDO::getRequestNumber, reqVO.getRequestNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRecord/InspectRecordDetailMapper.java

@@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inspectRecord;
 
 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.inspectRecord.vo.InspectRecordDetailExportReqVO;
 import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailPageReqVO;
 import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordDetailDO;
@@ -53,7 +55,9 @@ public interface InspectRecordDetailMapper extends BaseMapperX<InspectRecordDeta
                 .eqIfPresent(InspectRecordDetailDO::getJobDetailId, reqVO.getJobDetailId())
                 .orderByDesc(InspectRecordDetailDO::getId));
     }
-
+    default PageResult<InspectRecordDetailDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<InspectRecordDetailDO> selectList(InspectRecordDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<InspectRecordDetailDO>()
                 .eqIfPresent(InspectRecordDetailDO::getPackingNumber, reqVO.getPackingNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRecord/InspectRecordMainMapper.java

@@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inspectRecord;
 
 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.inspectRecord.vo.InspectRecordMainExportReqVO;
 import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainPageReqVO;
 import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordMainDO;
@@ -60,6 +62,10 @@ public interface InspectRecordMainMapper extends BaseMapperX<InspectRecordMainDO
                 .orderByDesc(InspectRecordMainDO::getId));
     }
 
+    default PageResult<InspectRecordMainDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<InspectRecordMainDO> selectList(InspectRecordMainExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<InspectRecordMainDO>()
                 .eqIfPresent(InspectRecordMainDO::getRequestNumber, reqVO.getRequestNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRequest/InspectRequestDetailMapper.java

@@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inspectRequest;
 
 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.inspectRequest.vo.InspectRequestDetailExportReqVO;
 import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailPageReqVO;
 import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestDetailDO;
@@ -36,6 +38,10 @@ public interface InspectRequestDetailMapper extends BaseMapperX<InspectRequestDe
                 .orderByDesc(InspectRequestDetailDO::getId));
     }
 
+    default PageResult<InspectRequestDetailDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
+
     default List<InspectRequestDetailDO> selectList(InspectRequestDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<InspectRequestDetailDO>()
                 .eqIfPresent(InspectRequestDetailDO::getPackingNumber, reqVO.getPackingNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRequest/InspectRequestMainMapper.java

@@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inspectRequest;
 
 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.inspectRequest.vo.InspectRequestMainExportReqVO;
 import com.win.module.wms.controller.inspectRequest.vo.InspectRequestMainPageReqVO;
 import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestMainDO;
@@ -53,7 +55,9 @@ public interface InspectRequestMainMapper extends BaseMapperX<InspectRequestMain
                 .eqIfPresent(InspectRequestMainDO::getDirectCreateRecord, reqVO.getDirectCreateRecord())
                 .orderByDesc(InspectRequestMainDO::getId));
     }
-
+    default PageResult<InspectRequestMainDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<InspectRequestMainDO> selectList(InspectRequestMainExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<InspectRequestMainDO>()
                 .eqIfPresent(InspectRequestMainDO::getPurchaseReceiptRecordNumber, reqVO.getPurchaseReceiptRecordNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorychangeRecord/InventorychangeRecordDetailMapper.java

@@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inventorychangeRecord;
 
 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.inventorychangeRecord.vo.InventorychangeRecordDetailExportReqVO;
 import com.win.module.wms.controller.inventorychangeRecord.vo.InventorychangeRecordDetailPageReqVO;
 import com.win.module.wms.dal.dataobject.inventorychangeRecord.InventorychangeRecordDetailDO;
@@ -59,7 +61,9 @@ public interface InventorychangeRecordDetailMapper extends BaseMapperX<Inventory
                 .eqIfPresent(InventorychangeRecordDetailDO::getJobDetailId, reqVO.getJobDetailId())
                 .orderByDesc(InventorychangeRecordDetailDO::getId));
     }
-
+    default PageResult<InventorychangeRecordDetailDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<InventorychangeRecordDetailDO> selectList(InventorychangeRecordDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<InventorychangeRecordDetailDO>()
                 .eqIfPresent(InventorychangeRecordDetailDO::getLocationCode, reqVO.getLocationCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorychangeRecord/InventorychangeRecordMainMapper.java

@@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inventorychangeRecord;
 
 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.inventorychangeRecord.vo.InventorychangeRecordMainExportReqVO;
 import com.win.module.wms.controller.inventorychangeRecord.vo.InventorychangeRecordMainPageReqVO;
 import com.win.module.wms.dal.dataobject.inventorychangeRecord.InventorychangeRecordMainDO;
@@ -39,7 +41,9 @@ public interface InventorychangeRecordMainMapper extends BaseMapperX<Inventorych
                 .eqIfPresent(InventorychangeRecordMainDO::getAvailable, reqVO.getAvailable())
                 .orderByDesc(InventorychangeRecordMainDO::getId));
     }
-
+    default PageResult<InventorychangeRecordMainDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<InventorychangeRecordMainDO> selectList(InventorychangeRecordMainExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<InventorychangeRecordMainDO>()
                 .eqIfPresent(InventorychangeRecordMainDO::getRequestNumber, reqVO.getRequestNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorychangeRequest/InventorychangeRequestDetailMapper.java

@@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inventorychangeRequest;
 
 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.inventorychangeRequest.vo.InventorychangeRequestDetailExportReqVO;
 import com.win.module.wms.controller.inventorychangeRequest.vo.InventorychangeRequestDetailPageReqVO;
 import com.win.module.wms.dal.dataobject.inventorychangeRequest.InventorychangeRequestDetailDO;
@@ -58,7 +60,9 @@ public interface InventorychangeRequestDetailMapper extends BaseMapperX<Inventor
                 .eqIfPresent(InventorychangeRequestDetailDO::getItemCode, reqVO.getItemCode())
                 .orderByDesc(InventorychangeRequestDetailDO::getId));
     }
-
+    default PageResult<InventorychangeRequestDetailDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<InventorychangeRequestDetailDO> selectList(InventorychangeRequestDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<InventorychangeRequestDetailDO>()
                 .eqIfPresent(InventorychangeRequestDetailDO::getLocationGroupCode, reqVO.getLocationGroupCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorychangeRequest/InventorychangeRequestMainMapper.java

@@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inventorychangeRequest;
 
 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.inventorychangeRequest.vo.InventorychangeRequestMainExportReqVO;
 import com.win.module.wms.controller.inventorychangeRequest.vo.InventorychangeRequestMainPageReqVO;
 import com.win.module.wms.dal.dataobject.inventorychangeRequest.InventorychangeRequestMainDO;
@@ -38,7 +40,9 @@ public interface InventorychangeRequestMainMapper extends BaseMapperX<Inventoryc
                 .eqIfPresent(InventorychangeRequestMainDO::getDirectCreateRecord, reqVO.getDirectCreateRecord())
                 .orderByDesc(InventorychangeRequestMainDO::getId));
     }
-
+    default PageResult<InventorychangeRequestMainDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<InventorychangeRequestMainDO> selectList(InventorychangeRequestMainExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<InventorychangeRequestMainDO>()
                 .eqIfPresent(InventorychangeRequestMainDO::getWarehouseCode, reqVO.getWarehouseCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventoryinitRecord/InventoryinitRecordDetailMapper.java

@@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inventoryinitRecord;
 
 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.inventoryinitRecord.vo.InventoryinitRecordDetailExportReqVO;
 import com.win.module.wms.controller.inventoryinitRecord.vo.InventoryinitRecordDetailPageReqVO;
 import com.win.module.wms.dal.dataobject.inventoryinitRecord.InventoryinitRecordDetailDO;
@@ -52,7 +54,9 @@ public interface InventoryinitRecordDetailMapper extends BaseMapperX<Inventoryin
                 .eqIfPresent(InventoryinitRecordDetailDO::getJobDetailId, reqVO.getJobDetailId())
                 .orderByDesc(InventoryinitRecordDetailDO::getId));
     }
-
+    default PageResult<InventoryinitRecordDetailDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<InventoryinitRecordDetailDO> selectList(InventoryinitRecordDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<InventoryinitRecordDetailDO>()
                 .eqIfPresent(InventoryinitRecordDetailDO::getOwnerCode, reqVO.getOwnerCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventoryinitRecord/InventoryinitRecordMainMapper.java

@@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inventoryinitRecord;
 
 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.inventoryinitRecord.vo.InventoryinitRecordMainExportReqVO;
 import com.win.module.wms.controller.inventoryinitRecord.vo.InventoryinitRecordMainPageReqVO;
 import com.win.module.wms.dal.dataobject.inventoryinitRecord.InventoryinitRecordMainDO;
@@ -39,7 +41,9 @@ public interface InventoryinitRecordMainMapper extends BaseMapperX<Inventoryinit
                 .eqIfPresent(InventoryinitRecordMainDO::getAvailable, reqVO.getAvailable())
                 .orderByDesc(InventoryinitRecordMainDO::getId));
     }
-
+    default PageResult<InventoryinitRecordMainDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<InventoryinitRecordMainDO> selectList(InventoryinitRecordMainExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<InventoryinitRecordMainDO>()
                 .eqIfPresent(InventoryinitRecordMainDO::getRequestNumber, reqVO.getRequestNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventoryinitRequest/InventoryinitRequestDetailMapper.java

@@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inventoryinitRequest;
 
 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.inventoryinitRequest.vo.InventoryinitRequestDetailExportReqVO;
 import com.win.module.wms.controller.inventoryinitRequest.vo.InventoryinitRequestDetailPageReqVO;
 import com.win.module.wms.dal.dataobject.inventoryinitRequest.InventoryinitRequestDetailDO;
@@ -49,7 +51,9 @@ public interface InventoryinitRequestDetailMapper extends BaseMapperX<Inventoryi
                 .eqIfPresent(InventoryinitRequestDetailDO::getItemCode, reqVO.getItemCode())
                 .orderByDesc(InventoryinitRequestDetailDO::getId));
     }
-
+    default PageResult<InventoryinitRequestDetailDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<InventoryinitRequestDetailDO> selectList(InventoryinitRequestDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<InventoryinitRequestDetailDO>()
                 .eqIfPresent(InventoryinitRequestDetailDO::getOwnerCode, reqVO.getOwnerCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventoryinitRequest/InventoryinitRequestMainMapper.java

@@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inventoryinitRequest;
 
 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.inventoryinitRequest.vo.InventoryinitRequestMainExportReqVO;
 import com.win.module.wms.controller.inventoryinitRequest.vo.InventoryinitRequestMainPageReqVO;
 import com.win.module.wms.dal.dataobject.inventoryinitRequest.InventoryinitRequestMainDO;
@@ -38,7 +40,9 @@ public interface InventoryinitRequestMainMapper extends BaseMapperX<Inventoryini
                 .eqIfPresent(InventoryinitRequestMainDO::getDirectCreateRecord, reqVO.getDirectCreateRecord())
                 .orderByDesc(InventoryinitRequestMainDO::getId));
     }
-
+    default PageResult<InventoryinitRequestMainDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<InventoryinitRequestMainDO> selectList(InventoryinitRequestMainExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<InventoryinitRequestMainDO>()
                 .eqIfPresent(InventoryinitRequestMainDO::getWarehouseCode, reqVO.getWarehouseCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveJob/InventorymoveJobDetailMapper.java

@@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inventorymoveJob;
 
 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.inventorymoveJob.vo.InventorymoveJobDetailExportReqVO;
 import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobDetailPageReqVO;
 import com.win.module.wms.dal.dataobject.inventorymoveJob.InventorymoveJobDetailDO;
@@ -43,7 +45,9 @@ public interface InventorymoveJobDetailMapper extends BaseMapperX<InventorymoveJ
                 .eqIfPresent(InventorymoveJobDetailDO::getToOwnerCode, reqVO.getToOwnerCode())
                 .orderByDesc(InventorymoveJobDetailDO::getId));
     }
-
+    default PageResult<InventorymoveJobDetailDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<InventorymoveJobDetailDO> selectList(InventorymoveJobDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<InventorymoveJobDetailDO>()
                 .eqIfPresent(InventorymoveJobDetailDO::getItemCode, reqVO.getItemCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveJob/InventorymoveJobMainMapper.java

@@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inventorymoveJob;
 
 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.inventorymoveJob.vo.InventorymoveJobMainExportReqVO;
 import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobMainPageReqVO;
 import com.win.module.wms.dal.dataobject.inventorymoveJob.InventorymoveJobMainDO;
@@ -60,7 +62,9 @@ public interface InventorymoveJobMainMapper extends BaseMapperX<InventorymoveJob
                 .eqIfPresent(InventorymoveJobMainDO::getAllowModifyPackingNumber, reqVO.getAllowModifyPackingNumber())
                 .orderByDesc(InventorymoveJobMainDO::getId));
     }
-
+    default PageResult<InventorymoveJobMainDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<InventorymoveJobMainDO> selectList(InventorymoveJobMainExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<InventorymoveJobMainDO>()
                 .eqIfPresent(InventorymoveJobMainDO::getRequestNumber, reqVO.getRequestNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRecord/InventorymoveRecordDetailMapper.java

@@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inventorymoveRecord;
 
 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.inventorymoveRecord.vo.InventorymoveRecordDetailExportReqVO;
 import com.win.module.wms.controller.inventorymoveRecord.vo.InventorymoveRecordDetailPageReqVO;
 import com.win.module.wms.dal.dataobject.inventorymoveRecord.InventorymoveRecordDetailDO;
@@ -53,7 +55,9 @@ public interface InventorymoveRecordDetailMapper extends BaseMapperX<Inventorymo
                 .eqIfPresent(InventorymoveRecordDetailDO::getJobDetailId, reqVO.getJobDetailId())
                 .orderByDesc(InventorymoveRecordDetailDO::getId));
     }
-
+    default PageResult<InventorymoveRecordDetailDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<InventorymoveRecordDetailDO> selectList(InventorymoveRecordDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<InventorymoveRecordDetailDO>()
                 .eqIfPresent(InventorymoveRecordDetailDO::getOnTheWayLocationCode, reqVO.getOnTheWayLocationCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRecord/InventorymoveRecordMainMapper.java

@@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inventorymoveRecord;
 
 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.inventorymoveRecord.vo.InventorymoveRecordMainExportReqVO;
 import com.win.module.wms.controller.inventorymoveRecord.vo.InventorymoveRecordMainPageReqVO;
 import com.win.module.wms.dal.dataobject.inventorymoveRecord.InventorymoveRecordMainDO;
@@ -46,7 +48,9 @@ public interface InventorymoveRecordMainMapper extends BaseMapperX<Inventorymove
                 .eqIfPresent(InventorymoveRecordMainDO::getAvailable, reqVO.getAvailable())
                 .orderByDesc(InventorymoveRecordMainDO::getId));
     }
-
+    default PageResult<InventorymoveRecordMainDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<InventorymoveRecordMainDO> selectList(InventorymoveRecordMainExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<InventorymoveRecordMainDO>()
                 .eqIfPresent(InventorymoveRecordMainDO::getRequestNumber, reqVO.getRequestNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRequest/InventorymoveRequestDetailMapper.java

@@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inventorymoveRequest;
 
 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.inventorymoveRequest.vo.InventorymoveRequestDetailExportReqVO;
 import com.win.module.wms.controller.inventorymoveRequest.vo.InventorymoveRequestDetailPageReqVO;
 import com.win.module.wms.dal.dataobject.inventorymoveRequest.InventorymoveRequestDetailDO;
@@ -47,7 +49,9 @@ public interface InventorymoveRequestDetailMapper extends BaseMapperX<Inventorym
                 .eqIfPresent(InventorymoveRequestDetailDO::getItemCode, reqVO.getItemCode())
                 .orderByDesc(InventorymoveRequestDetailDO::getId));
     }
-
+    default PageResult<InventorymoveRequestDetailDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<InventorymoveRequestDetailDO> selectList(InventorymoveRequestDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<InventorymoveRequestDetailDO>()
                 .eqIfPresent(InventorymoveRequestDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRequest/InventorymoveRequestMainMapper.java

@@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inventorymoveRequest;
 
 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.inventorymoveRequest.vo.InventorymoveRequestMainExportReqVO;
 import com.win.module.wms.controller.inventorymoveRequest.vo.InventorymoveRequestMainPageReqVO;
 import com.win.module.wms.dal.dataobject.inventorymoveRequest.InventorymoveRequestMainDO;
@@ -44,7 +46,9 @@ public interface InventorymoveRequestMainMapper extends BaseMapperX<Inventorymov
                 .eqIfPresent(InventorymoveRequestMainDO::getDirectCreateRecord, reqVO.getDirectCreateRecord())
                 .orderByDesc(InventorymoveRequestMainDO::getId));
     }
-
+    default PageResult<InventorymoveRequestMainDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<InventorymoveRequestMainDO> selectList(InventorymoveRequestMainExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<InventorymoveRequestMainDO>()
                 .eqIfPresent(InventorymoveRequestMainDO::getNumber, reqVO.getNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueJob/IssueJobDetailMapper.java

@@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.issueJob;
 
 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.issueJob.vo.IssueJobDetailExportReqVO;
 import com.win.module.wms.controller.issueJob.vo.IssueJobDetailPageReqVO;
 import com.win.module.wms.dal.dataobject.issueJob.IssueJobDetailDO;
@@ -49,6 +51,9 @@ public interface IssueJobDetailMapper extends BaseMapperX<IssueJobDetailDO> {
                 .orderByDesc(IssueJobDetailDO::getId));
     }
 
+    default PageResult<IssueJobDetailDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<IssueJobDetailDO> selectList(IssueJobDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<IssueJobDetailDO>()
                 .eqIfPresent(IssueJobDetailDO::getProductionLineCode, reqVO.getProductionLineCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueJob/IssueJobMainMapper.java

@@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.issueJob;
 
 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.issueJob.vo.IssueJobMainExportReqVO;
 import com.win.module.wms.controller.issueJob.vo.IssueJobMainPageReqVO;
 import com.win.module.wms.dal.dataobject.issueJob.IssueJobMainDO;
@@ -60,7 +62,9 @@ public interface IssueJobMainMapper extends BaseMapperX<IssueJobMainDO> {
                 .eqIfPresent(IssueJobMainDO::getAllowModifyBatch, reqVO.getAllowModifyBatch())
                 .orderByDesc(IssueJobMainDO::getId));
     }
-
+    default PageResult<IssueJobMainDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<IssueJobMainDO> selectList(IssueJobMainExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<IssueJobMainDO>()
                 .eqIfPresent(IssueJobMainDO::getRequestNumber, reqVO.getRequestNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRecord/IssueRecordDetailMapper.java

@@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.issueRecord;
 
 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.issueRecord.vo.IssueRecordDetailExportReqVO;
 import com.win.module.wms.controller.issueRecord.vo.IssueRecordDetailPageReqVO;
 import com.win.module.wms.dal.dataobject.issueRecord.IssueRecordDetailDO;
@@ -54,7 +56,9 @@ public interface IssueRecordDetailMapper extends BaseMapperX<IssueRecordDetailDO
                 .eqIfPresent(IssueRecordDetailDO::getJobDetailId, reqVO.getJobDetailId())
                 .orderByDesc(IssueRecordDetailDO::getId));
     }
-
+    default PageResult<IssueRecordDetailDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<IssueRecordDetailDO> selectList(IssueRecordDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<IssueRecordDetailDO>()
                 .eqIfPresent(IssueRecordDetailDO::getProductionLineCode, reqVO.getProductionLineCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRecord/IssueRecordMainMapper.java

@@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.issueRecord;
 
 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.issueRecord.vo.IssueRecordMainExportReqVO;
 import com.win.module.wms.controller.issueRecord.vo.IssueRecordMainPageReqVO;
 import com.win.module.wms.dal.dataobject.issueRecord.IssueRecordMainDO;
@@ -47,7 +49,9 @@ public interface IssueRecordMainMapper extends BaseMapperX<IssueRecordMainDO> {
                 .eqIfPresent(IssueRecordMainDO::getAvailable, reqVO.getAvailable())
                 .orderByDesc(IssueRecordMainDO::getId));
     }
-
+    default PageResult<IssueRecordMainDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<IssueRecordMainDO> selectList(IssueRecordMainExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<IssueRecordMainDO>()
                 .eqIfPresent(IssueRecordMainDO::getRequestNumber, reqVO.getRequestNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRequest/IssueRequestDetailMapper.java

@@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.issueRequest;
 
 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.issueRequest.vo.IssueRequestDetailExportReqVO;
 import com.win.module.wms.controller.issueRequest.vo.IssueRequestDetailPageReqVO;
 import com.win.module.wms.dal.dataobject.issueRequest.IssueRequestDetailDO;
@@ -44,7 +46,9 @@ public interface IssueRequestDetailMapper extends BaseMapperX<IssueRequestDetail
                 .eqIfPresent(IssueRequestDetailDO::getToOwnerCode, reqVO.getToOwnerCode())
                 .orderByDesc(IssueRequestDetailDO::getId));
     }
-
+    default PageResult<IssueRequestDetailDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<IssueRequestDetailDO> selectList(IssueRequestDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<IssueRequestDetailDO>()
                 .eqIfPresent(IssueRequestDetailDO::getProductionLineCode, reqVO.getProductionLineCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRequest/IssueRequestMainMapper.java

@@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.issueRequest;
 
 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.issueRequest.vo.IssueRequestMainExportReqVO;
 import com.win.module.wms.controller.issueRequest.vo.IssueRequestMainPageReqVO;
 import com.win.module.wms.dal.dataobject.issueRequest.IssueRequestMainDO;
@@ -45,7 +47,9 @@ public interface IssueRequestMainMapper extends BaseMapperX<IssueRequestMainDO>
                 .eqIfPresent(IssueRequestMainDO::getDirectCreateRecord, reqVO.getDirectCreateRecord())
                 .orderByDesc(IssueRequestMainDO::getId));
     }
-
+    default PageResult<IssueRequestMainDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<IssueRequestMainDO> selectList(IssueRequestMainExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<IssueRequestMainDO>()
                 .eqIfPresent(IssueRequestMainDO::getWorkshopCode, reqVO.getWorkshopCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/itempackaging/ItempackagingMapper.java

@@ -1,8 +1,10 @@
 package com.win.module.wms.dal.mysql.itempackaging;
 
+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.itempackaging.vo.ItempackagingExportReqVO;
 import com.win.module.wms.controller.itempackaging.vo.ItempackagingPageReqVO;
 import com.win.module.wms.dal.dataobject.itempackaging.ItempackagingDO;
@@ -40,7 +42,9 @@ public interface ItempackagingMapper extends BaseMapperX<ItempackagingDO> {
                 .eqIfPresent(ItempackagingDO::getCreator, reqVO.getCreator())
                 .orderByDesc(ItempackagingDO::getId));
     }
-
+    default PageResult<ItempackagingDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<ItempackagingDO> selectList(ItempackagingExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ItempackagingDO>()
                 .eqIfPresent(ItempackagingDO::getItemCode, reqVO.getItemCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/jobsetting/JobsettingMapper.java

@@ -1,8 +1,10 @@
 package com.win.module.wms.dal.mysql.jobsetting;
 
+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.jobsetting.vo.JobsettingExportReqVO;
 import com.win.module.wms.controller.jobsetting.vo.JobsettingPageReqVO;
 import com.win.module.wms.dal.dataobject.jobsetting.JobsettingDO;
@@ -41,7 +43,9 @@ public interface JobsettingMapper extends BaseMapperX<JobsettingDO> {
                 .eqIfPresent(JobsettingDO::getIsSoftDeleted, reqVO.getIsSoftDeleted())
                 .orderByDesc(JobsettingDO::getId));
     }
-
+    default PageResult<JobsettingDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<JobsettingDO> selectList(JobsettingExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<JobsettingDO>()
                 .eqIfPresent(JobsettingDO::getCode, reqVO.getCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/labeltype/LabeltypeMapper.java

@@ -1,8 +1,10 @@
 package com.win.module.wms.dal.mysql.labeltype;
 
+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.labeltype.vo.LabeltypeExportReqVO;
 import com.win.module.wms.controller.labeltype.vo.LabeltypePageReqVO;
 import com.win.module.wms.dal.dataobject.labeltype.LabeltypeDO;
@@ -39,7 +41,9 @@ public interface LabeltypeMapper extends BaseMapperX<LabeltypeDO> {
                 .eqIfPresent(LabeltypeDO::getIsCompress, reqVO.getIsCompress())
                 .orderByDesc(LabeltypeDO::getId));
     }
-
+    default PageResult<LabeltypeDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<LabeltypeDO> selectList(LabeltypeExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<LabeltypeDO>()
                 .eqIfPresent(LabeltypeDO::getLabelType, reqVO.getLabelType())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/location/LocationMapper.java

@@ -1,8 +1,10 @@
 package com.win.module.wms.dal.mysql.location;
 
+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.location.vo.LocationExportReqVO;
 import com.win.module.wms.controller.location.vo.LocationPageReqVO;
 import com.win.module.wms.dal.dataobject.location.LocationDO;
@@ -45,7 +47,9 @@ public interface LocationMapper extends BaseMapperX<LocationDO> {
                 .eqIfPresent(LocationDO::getCreator, reqVO.getCreator())
                 .orderByDesc(LocationDO::getId));
     }
-
+    default PageResult<LocationDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<LocationDO> selectList(LocationExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<LocationDO>()
                 .eqIfPresent(LocationDO::getCode, reqVO.getCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/locationcapacity/LocationcapacityMapper.java

@@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.locationcapacity;
 
 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.locationcapacity.vo.LocationcapacityExportReqVO;
 import com.win.module.wms.controller.locationcapacity.vo.LocationcapacityPageReqVO;
 import com.win.module.wms.dal.dataobject.locationcapacity.LocationcapacityDO;
@@ -28,7 +30,9 @@ public interface LocationcapacityMapper extends BaseMapperX<LocationcapacityDO>
                 .eqIfPresent(LocationcapacityDO::getIsInfinity, reqVO.getIsInfinity())
                 .orderByDesc(LocationcapacityDO::getId));
     }
-
+    default PageResult<LocationcapacityDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<LocationcapacityDO> selectList(LocationcapacityExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<LocationcapacityDO>()
                 .eqIfPresent(LocationcapacityDO::getLocationCode, reqVO.getLocationCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/locationgroup/LocationgroupMapper.java

@@ -1,8 +1,10 @@
 package com.win.module.wms.dal.mysql.locationgroup;
 
+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.locationgroup.vo.LocationgroupExportReqVO;
 import com.win.module.wms.controller.locationgroup.vo.LocationgroupPageReqVO;
 import com.win.module.wms.dal.dataobject.locationgroup.LocationgroupDO;
@@ -33,7 +35,9 @@ public interface LocationgroupMapper extends BaseMapperX<LocationgroupDO> {
                 .eqIfPresent(LocationgroupDO::getCreator, reqVO.getCreator())
                 .orderByDesc(LocationgroupDO::getId));
     }
-
+    default PageResult<LocationgroupDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<LocationgroupDO> selectList(LocationgroupExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<LocationgroupDO>()
                 .eqIfPresent(LocationgroupDO::getCode, reqVO.getCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/offlinesettlementRecord/OfflinesettlementRecordDetailMapper.java

@@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.offlinesettlementRecord;
 
 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.offlinesettlementRecord.vo.OfflinesettlementRecordDetailExportReqVO;
 import com.win.module.wms.controller.offlinesettlementRecord.vo.OfflinesettlementRecordDetailPageReqVO;
 import com.win.module.wms.dal.dataobject.offlinesettlementRecord.OfflinesettlementRecordDetailDO;
@@ -41,7 +43,9 @@ public interface OfflinesettlementRecordDetailMapper extends BaseMapperX<Offline
                 .eqIfPresent(OfflinesettlementRecordDetailDO::getJobDetailId, reqVO.getJobDetailId())
                 .orderByDesc(OfflinesettlementRecordDetailDO::getId));
     }
-
+    default PageResult<OfflinesettlementRecordDetailDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<OfflinesettlementRecordDetailDO> selectList(OfflinesettlementRecordDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<OfflinesettlementRecordDetailDO>()
                 .eqIfPresent(OfflinesettlementRecordDetailDO::getPackingNumber, reqVO.getPackingNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/offlinesettlementRecord/OfflinesettlementRecordMainMapper.java

@@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.offlinesettlementRecord;
 
 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.offlinesettlementRecord.vo.OfflinesettlementRecordMainExportReqVO;
 import com.win.module.wms.controller.offlinesettlementRecord.vo.OfflinesettlementRecordMainPageReqVO;
 import com.win.module.wms.dal.dataobject.offlinesettlementRecord.OfflinesettlementRecordMainDO;
@@ -39,7 +41,9 @@ public interface OfflinesettlementRecordMainMapper extends BaseMapperX<Offlinese
                 .eqIfPresent(OfflinesettlementRecordMainDO::getAvailable, reqVO.getAvailable())
                 .orderByDesc(OfflinesettlementRecordMainDO::getId));
     }
-
+    default PageResult<OfflinesettlementRecordMainDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<OfflinesettlementRecordMainDO> selectList(OfflinesettlementRecordMainExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<OfflinesettlementRecordMainDO>()
                 .eqIfPresent(OfflinesettlementRecordMainDO::getRequestNumber, reqVO.getRequestNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/offlinesettlementRequest/OfflinesettlementRequestDetailMapper.java

@@ -2,11 +2,14 @@ package com.win.module.wms.dal.mysql.offlinesettlementRequest;
 
 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.offlinesettlementRequest.vo.OfflinesettlementRequestDetailExportReqVO;
 import com.win.module.wms.controller.offlinesettlementRequest.vo.OfflinesettlementRequestDetailPageReqVO;
+import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO;
 import com.win.module.wms.dal.dataobject.offlinesettlementRequest.OfflinesettlementRequestDetailDO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -40,7 +43,9 @@ public interface OfflinesettlementRequestDetailMapper extends BaseMapperX<Offlin
                 .eqIfPresent(OfflinesettlementRequestDetailDO::getCreator, reqVO.getCreator())
                 .orderByDesc(OfflinesettlementRequestDetailDO::getId));
     }
-
+    default PageResult<OfflinesettlementRequestDetailDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<OfflinesettlementRequestDetailDO> selectList(OfflinesettlementRequestDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<OfflinesettlementRequestDetailDO>()
                 .eqIfPresent(OfflinesettlementRequestDetailDO::getPackingNumber, reqVO.getPackingNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/offlinesettlementRequest/OfflinesettlementRequestMainMapper.java

@@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.offlinesettlementRequest;
 
 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.offlinesettlementRequest.vo.OfflinesettlementRequestMainExportReqVO;
 import com.win.module.wms.controller.offlinesettlementRequest.vo.OfflinesettlementRequestMainPageReqVO;
 import com.win.module.wms.dal.dataobject.offlinesettlementRequest.OfflinesettlementRequestMainDO;
@@ -40,7 +42,9 @@ public interface OfflinesettlementRequestMainMapper extends BaseMapperX<Offlines
                 .eqIfPresent(OfflinesettlementRequestMainDO::getDirectCreateRecord, reqVO.getDirectCreateRecord())
                 .orderByDesc(OfflinesettlementRequestMainDO::getId));
     }
-
+    default PageResult<OfflinesettlementRequestMainDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<OfflinesettlementRequestMainDO> selectList(OfflinesettlementRequestMainExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<OfflinesettlementRequestMainDO>()
                 .eqIfPresent(OfflinesettlementRequestMainDO::getProductReceiptRecordNumber, reqVO.getProductReceiptRecordNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/onlinesettlementRecord/OnlinesettlementRecordDetailMapper.java

@@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.onlinesettlementRecord;
 
 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.onlinesettlementRecord.vo.OnlinesettlementRecordDetailExportReqVO;
 import com.win.module.wms.controller.onlinesettlementRecord.vo.OnlinesettlementRecordDetailPageReqVO;
 import com.win.module.wms.dal.dataobject.onlinesettlementRecord.OnlinesettlementRecordDetailDO;
@@ -41,7 +43,9 @@ public interface OnlinesettlementRecordDetailMapper extends BaseMapperX<Onlinese
                 .eqIfPresent(OnlinesettlementRecordDetailDO::getJobDetailId, reqVO.getJobDetailId())
                 .orderByDesc(OnlinesettlementRecordDetailDO::getId));
     }
-
+    default PageResult<OnlinesettlementRecordDetailDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<OnlinesettlementRecordDetailDO> selectList(OnlinesettlementRecordDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<OnlinesettlementRecordDetailDO>()
                 .eqIfPresent(OnlinesettlementRecordDetailDO::getPackingNumber, reqVO.getPackingNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/onlinesettlementRecord/OnlinesettlementRecordMainMapper.java

@@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.onlinesettlementRecord;
 
 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.onlinesettlementRecord.vo.OnlinesettlementRecordMainExportReqVO;
 import com.win.module.wms.controller.onlinesettlementRecord.vo.OnlinesettlementRecordMainPageReqVO;
 import com.win.module.wms.dal.dataobject.onlinesettlementRecord.OnlinesettlementRecordMainDO;
@@ -39,7 +41,9 @@ public interface OnlinesettlementRecordMainMapper extends BaseMapperX<Onlinesett
                 .eqIfPresent(OnlinesettlementRecordMainDO::getAvailable, reqVO.getAvailable())
                 .orderByDesc(OnlinesettlementRecordMainDO::getId));
     }
-
+    default PageResult<OnlinesettlementRecordMainDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<OnlinesettlementRecordMainDO> selectList(OnlinesettlementRecordMainExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<OnlinesettlementRecordMainDO>()
                 .eqIfPresent(OnlinesettlementRecordMainDO::getRequestNumber, reqVO.getRequestNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/onlinesettlementRequest/OnlinesettlementRequestDetailMapper.java

@@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.onlinesettlementRequest;
 
 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.onlinesettlementRequest.vo.OnlinesettlementRequestDetailExportReqVO;
 import com.win.module.wms.controller.onlinesettlementRequest.vo.OnlinesettlementRequestDetailPageReqVO;
 import com.win.module.wms.dal.dataobject.onlinesettlementRequest.OnlinesettlementRequestDetailDO;
@@ -40,7 +42,9 @@ public interface OnlinesettlementRequestDetailMapper extends BaseMapperX<Onlines
                 .eqIfPresent(OnlinesettlementRequestDetailDO::getCreator, reqVO.getCreator())
                 .orderByDesc(OnlinesettlementRequestDetailDO::getId));
     }
-
+    default PageResult<OnlinesettlementRequestDetailDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<OnlinesettlementRequestDetailDO> selectList(OnlinesettlementRequestDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<OnlinesettlementRequestDetailDO>()
                 .eqIfPresent(OnlinesettlementRequestDetailDO::getPackingNumber, reqVO.getPackingNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/onlinesettlementRequest/OnlinesettlementRequestMainMapper.java

@@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.onlinesettlementRequest;
 
 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.onlinesettlementRequest.vo.OnlinesettlementRequestMainExportReqVO;
 import com.win.module.wms.controller.onlinesettlementRequest.vo.OnlinesettlementRequestMainPageReqVO;
 import com.win.module.wms.dal.dataobject.onlinesettlementRequest.OnlinesettlementRequestMainDO;
@@ -40,6 +42,9 @@ public interface OnlinesettlementRequestMainMapper extends BaseMapperX<Onlineset
                 .orderByDesc(OnlinesettlementRequestMainDO::getId));
     }
 
+    default PageResult<OnlinesettlementRequestMainDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<OnlinesettlementRequestMainDO> selectList(OnlinesettlementRequestMainExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<OnlinesettlementRequestMainDO>()
                 .eqIfPresent(OnlinesettlementRequestMainDO::getIssueRecordNumber, reqVO.getIssueRecordNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/owner/OwnerMapper.java

@@ -1,8 +1,10 @@
 package com.win.module.wms.dal.mysql.owner;
 
+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.owner.vo.OwnerExportReqVO;
 import com.win.module.wms.controller.owner.vo.OwnerPageReqVO;
 import com.win.module.wms.dal.dataobject.owner.OwnerDO;
@@ -42,7 +44,9 @@ public interface OwnerMapper extends BaseMapperX<OwnerDO> {
                 .eqIfPresent(OwnerDO::getAvailable, reqVO.getAvailable())
                 .orderByDesc(OwnerDO::getId));
     }
-
+    default PageResult<OwnerDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<OwnerDO> selectList(OwnerExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<OwnerDO>()
                 .eqIfPresent(OwnerDO::getCode, reqVO.getCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceService.java

@@ -84,22 +84,22 @@ public interface BalanceService {
      * 跟据管理模式查询数量
      * @author lianhongxi
      * @param itemcode 物品code
-     * @param inventorystatus 库存状态
+     * @param inventoryStatus 库存状态
      * @param locationcode 库位code
      * @return
      */
-    public List<BalanceDO> selectNumber(String itemcode, String inventorystatus, String locationcode);
+    public List<BalanceDO> selectNumber(String itemcode, List<String> inventoryStatus, String locationcode);
     /**
      * TB2----BY_BATCH
      * 跟据管理模式查询批次
      * @author lianhongxi
      * @param itemcode 物品code
      * @param batch 批次
-     * @param inventorystatus 库存状态
+     * @param inventoryStatus 库存状态
      * @param locationcode 库位code
      * @return
      */
-    public List<BalanceDO> selectBatch(String itemcode, String batch, String inventorystatus, String locationcode);
+    public List<BalanceDO> selectBatch(String itemcode, String batch, List<String> inventoryStatus, String locationcode);
     /**
      * TB2----BY_PACKAGING
      * 跟据管理模式查询包装号
@@ -107,20 +107,20 @@ public interface BalanceService {
      * @param itemcode 物品code
      * @param batch 批次
      * @param packingnumber 包装号
-     * @param inventorystatus 库存状态
+     * @param inventoryStatus 库存状态
      * @param locationcode 库位code
      * @return
      */
-    public List<BalanceDO> selectPackaging(String itemcode, String packingnumber, String batch, String inventorystatus, String locationcode);
+    public List<BalanceDO> selectPackaging(String itemcode, String packingnumber, String batch, List<String> inventoryStatus, String locationcode);
     /**
      * TB2----BY_UNIQUE_ID
      * 跟据管理模式查询唯一码
      * @author lianhongxi
      * @param packingnumber 包装号
-     * @param inventorystatus 库存状态
+     * @param inventoryStatus 库存状态
      * @param locationcode 库位code
      * @return
      */
-    public List<BalanceDO> selectUniqueId(String packingnumber, String locationcode, String inventorystatus);
+    public List<BalanceDO> selectUniqueId(String packingnumber, String locationcode, List<String> inventoryStatus);
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java

@@ -105,21 +105,21 @@ public class BalanceServiceImpl implements BalanceService {
      * 跟据管理模式查询数量
      * @author lianhongxi
      * @param itemcode 物品code
-     * @param inventorystatus 库存状态
+     * @param inventoryStatus 库存状态
      * @param locationcode 库位code
      * @return
      */
     @Override
-    public List<BalanceDO> selectNumber(String itemcode, String inventorystatus, String locationcode) {
+    public List<BalanceDO> selectNumber(String itemcode, List<String> inventoryStatus, String locationcode) {
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("item_code", itemcode);
-        queryWrapper.eq("inventory_status", inventorystatus);
+        queryWrapper.eq("inventory_status", inventoryStatus);
         queryWrapper.eq("location_code", locationcode);
         List<BalanceDO> balanceDO = balanceMapper.selectList(queryWrapper);
         if (!balanceDO.isEmpty()) {
             return balanceDO;
-        } else {
-            throw new UtilException( "物料号" + itemcode + "库存状态" + inventorystatus + "在" + locationcode + "库位中未查找到库存记录");
+        }else {
+            return null;
         }
     }
 
@@ -129,22 +129,22 @@ public class BalanceServiceImpl implements BalanceService {
      * @author lianhongxi
      * @param itemcode 物品code
      * @param batch 批次
-     * @param inventorystatus 库存状态
+     * @param inventoryStatus 库存状态
      * @param locationcode 库位code
      * @return
      */
     @Override
-    public List<BalanceDO> selectBatch(String itemcode, String batch, String inventorystatus, String locationcode) {
+    public List<BalanceDO> selectBatch(String itemcode, String batch, List<String> inventoryStatus, String locationcode) {
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("item_code", itemcode);
         queryWrapper.eq("batch", batch);
-        queryWrapper.eq("inventory_status", inventorystatus);
+        queryWrapper.eq("inventory_status", inventoryStatus);
         queryWrapper.eq("location_code", locationcode);
         List<BalanceDO> balanceDO = balanceMapper.selectList(queryWrapper);
         if (!balanceDO.isEmpty()) {
             return balanceDO;
-        } else {
-            throw new UtilException( "物料号" + itemcode + "批次" + batch + "库存状态" + inventorystatus + "在" + locationcode + "库位中未查找到库存记录");
+        }else {
+            return null;
         }
     }
 
@@ -157,23 +157,23 @@ public class BalanceServiceImpl implements BalanceService {
      * @param itemcode 物品code
      * @param packingnumber 包装号
      * @param batch 批次
-     * @param inventorystatus 库存状态
+     * @param inventoryStatus 库存状态
      * @param locationcode 库位code
      * @return
      */
     @Override
-    public List<BalanceDO> selectPackaging(String itemcode, String packingnumber, String batch, String inventorystatus, String locationcode) {
+    public List<BalanceDO> selectPackaging(String itemcode, String packingnumber, String batch, List<String> inventoryStatus, String locationcode) {
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("item_code", itemcode);
         queryWrapper.eq("packing_number", packingnumber);
         queryWrapper.eq("batch", batch);
-        queryWrapper.eq("inventory_status", inventorystatus);
+        queryWrapper.eq("inventory_status", inventoryStatus);
         queryWrapper.eq("location_code", locationcode);
         List<BalanceDO> balanceDO = balanceMapper.selectList(queryWrapper);
         if (!balanceDO.isEmpty()) {
             return balanceDO;
-        } else {
-            throw new UtilException( "物料号" + itemcode + "箱码" + packingnumber + "批次" + batch + "库存状态" + inventorystatus + "在" + locationcode + "库位中未查找到库存记录");
+        }else {
+            return null;
         }
     }
 
@@ -183,20 +183,20 @@ public class BalanceServiceImpl implements BalanceService {
      * @author lianhongxi
      * @param packingnumber 包装号
      * @param locationcode 库位code
-     * @param inventorystatus 库存状态
+     * @param inventoryStatus 库存状态
      * @return
      */
     @Override
-    public List<BalanceDO> selectUniqueId(String packingnumber, String locationcode, String inventorystatus) {
+    public List<BalanceDO> selectUniqueId(String packingnumber, String locationcode, List<String> inventoryStatus) {
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("packing_number", packingnumber);
-        queryWrapper.eq("inventory_status", inventorystatus);
+        queryWrapper.in("inventory_status", inventoryStatus);
         queryWrapper.eq("location_code", locationcode);
         List<BalanceDO> balanceDO = balanceMapper.selectList(queryWrapper);
         if (!balanceDO.isEmpty()) {
             return balanceDO;
-        } else {
-            throw new UtilException( "唯一码" + packingnumber + "库存状态" + inventorystatus + "在" + locationcode + "库位中未查找到库存记录");
+        }else {
+            return null;
         }
     }
 }