workstation到productscrapjob的代码更改

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java

@@ -23,7 +23,6 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
@@ -31,7 +30,6 @@ import java.io.IOException;
 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;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/ProductscrapJobDetailController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.productscrapJob;
 
+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.productscrapJob.vo.*;
@@ -91,7 +92,19 @@ public class ProductscrapJobDetailController {
         PageResult<ProductscrapJobDetailDO> pageResult = productscrapJobDetailService.getProductscrapJobDetailPage(pageVO);
         return success(ProductscrapJobDetailConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:productscrap-job-detail:query')")
+    public CommonResult<PageResult<ProductscrapJobDetailRespVO>> getProductscrapJobDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductscrapJobDetailDO> pageResult = productscrapJobDetailService.getProductscrapJobDetailSenior(conditions);
+        PageResult<ProductscrapJobDetailRespVO> result = ProductscrapJobDetailConvert.INSTANCE.convertPage(pageResult);
+        for(ProductscrapJobDetailRespVO 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:productscrap-job-detail:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/ProductscrapJobMainController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.productscrapJob;
 
+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.InspectRecordMainExcelVO;
 import com.win.module.wms.controller.productscrapJob.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -11,22 +11,16 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
-
 import javax.validation.*;
 import javax.servlet.http.*;
 import java.util.*;
 import java.io.IOException;
-
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.common.pojo.CommonResult;
 import static com.win.framework.common.pojo.CommonResult.success;
-
 import com.win.framework.excel.core.util.ExcelUtils;
-
 import com.win.framework.operatelog.core.annotations.OperateLog;
 import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-import com.win.module.wms.controller.productscrapJob.vo.*;
 import com.win.module.wms.dal.dataobject.productscrapJob.ProductscrapJobMainDO;
 import com.win.module.wms.convert.productscrapJob.ProductscrapJobMainConvert;
 import com.win.module.wms.service.productscrapJob.ProductscrapJobMainService;
@@ -42,7 +36,19 @@ public class ProductscrapJobMainController {
 
     @Resource
     private AdminUserApi userApi;
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:productscrap-job-main:query')")
+    public CommonResult<PageResult<ProductscrapJobMainRespVO>> getProductscrapJobMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductscrapJobMainDO> pageResult = productscrapJobMainService.getProductscrapJobMainSenior(conditions);
+        PageResult<ProductscrapJobMainRespVO> result = ProductscrapJobMainConvert.INSTANCE.convertPage(pageResult);
+        for(ProductscrapJobMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @PostMapping("/create")
     @Operation(summary = "创建制品报废任务主")
     @PreAuthorize("@ss.hasPermission('wms:productscrap-job-main:create')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/ProductscrapRecordDetailController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.productscrapRecord;
 
+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.productscrapRecord.vo.*;
@@ -41,7 +42,19 @@ public class ProductscrapRecordDetailController {
 
     @Resource
     private AdminUserApi userApi;
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得创建制品报废记录子信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:productscrap-record-detail:query')")
+    public CommonResult<PageResult<ProductscrapRecordDetailRespVO>> getProductscrapRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductscrapRecordDetailDO> pageResult = productscrapRecordDetailService.getProductscrapRecordDetailSenior(conditions);
+        PageResult<ProductscrapRecordDetailRespVO> result = ProductscrapRecordDetailConvert.INSTANCE.convertPage(pageResult);
+        for(ProductscrapRecordDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @PostMapping("/create")
     @Operation(summary = "创建制品报废记录子")
     @PreAuthorize("@ss.hasPermission('wms:productscrap-record-detail:create')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/ProductscrapRecordMainController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.productscrapRecord;
 
+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.productscrapRecord.vo.*;
@@ -48,7 +49,19 @@ public class ProductscrapRecordMainController {
     public CommonResult<String> createProductscrapRecordMain(@Valid @RequestBody ProductscrapRecordMainCreateReqVO createReqVO) {
         return success(productscrapRecordMainService.createProductscrapRecordMain(createReqVO));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:ProductscrapRecordMain:query')")
+    public CommonResult<PageResult<ProductscrapRecordMainRespVO>> getProductscrapRecordMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductscrapRecordMainDO> pageResult = productscrapRecordMainService.getProductscrapRecordMainSenior(conditions);
+        PageResult<ProductscrapRecordMainRespVO> result = ProductscrapRecordMainConvert.INSTANCE.convertPage(pageResult);
+        for(ProductscrapRecordMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @PutMapping("/update")
     @Operation(summary = "更新制品报废记录主")
     @PreAuthorize("@ss.hasPermission('wms:productscrap-record-main:update')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/ProductscrapRequestDetailController.java

@@ -1,5 +1,5 @@
 package com.win.module.wms.controller.productscrapRequest;
-
+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.productscrapRequest.vo.*;
@@ -10,22 +10,16 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
-
 import javax.validation.*;
 import javax.servlet.http.*;
 import java.util.*;
 import java.io.IOException;
-
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.common.pojo.CommonResult;
 import static com.win.framework.common.pojo.CommonResult.success;
-
 import com.win.framework.excel.core.util.ExcelUtils;
-
 import com.win.framework.operatelog.core.annotations.OperateLog;
 import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-import com.win.module.wms.controller.productscrapRequest.vo.*;
 import com.win.module.wms.dal.dataobject.productscrapRequest.ProductscrapRequestDetailDO;
 import com.win.module.wms.convert.productscrapRequest.ProductscrapRequestDetailConvert;
 import com.win.module.wms.service.productscrapRequest.ProductscrapRequestDetailService;
@@ -91,7 +85,19 @@ public class ProductscrapRequestDetailController {
         PageResult<ProductscrapRequestDetailDO> pageResult = productscrapRequestDetailService.getProductscrapRequestDetailPage(pageVO);
         return success(ProductscrapRequestDetailConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:productscrap-request-detail:query')")
+    public CommonResult<PageResult<ProductscrapRequestDetailRespVO>> getProductscrapRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductscrapRequestDetailDO> pageResult = productscrapRequestDetailService.getProductscrapRequestDetailSenior(conditions);
+        PageResult<ProductscrapRequestDetailRespVO> result = ProductscrapRequestDetailConvert.INSTANCE.convertPage(pageResult);
+        for(ProductscrapRequestDetailRespVO 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:productscrap-request-detail:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/ProductscrapRequestMainController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.productscrapRequest;
 
+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.productscrapRequest.vo.*;
@@ -65,7 +66,19 @@ public class ProductscrapRequestMainController {
         productscrapRequestMainService.deleteProductscrapRequestMain(id);
         return success(true);
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:productscrap-request-main:query')")
+    public CommonResult<PageResult<ProductscrapRequestMainRespVO>> getProductscrapRequestMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductscrapRequestMainDO> pageResult = productscrapRequestMainService.getProductscrapRequestMainSenior(conditions);
+        PageResult<ProductscrapRequestMainRespVO> result = ProductscrapRequestMainConvert.INSTANCE.convertPage(pageResult);
+        for(ProductscrapRequestMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/get")
     @Operation(summary = "获得制品报废申请主")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/project/ProjectController.java

@@ -1,6 +1,7 @@
 package com.win.module.wms.controller.project;
 
 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;
@@ -75,7 +76,19 @@ public class ProjectController {
         ProjectDO project = projectService.getProject(id);
         return success(ProjectConvert.INSTANCE.convert(project));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:project:query')")
+    public CommonResult<PageResult<ProjectRespVO>> getProjectSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProjectDO> pageResult = projectService.getProjectSenior(conditions);
+        PageResult<ProjectRespVO> result = ProjectConvert.INSTANCE.convertPage(pageResult);
+        for(ProjectRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/list")
     @Operation(summary = "获得项目列表")
     @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/PurchaseDetailController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.purchase;
 
+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.purchase.vo.*;
@@ -91,7 +92,19 @@ public class PurchaseDetailController {
         PageResult<PurchaseDetailDO> pageResult = purchaseDetailService.getPurchaseDetailPage(pageVO);
         return success(PurchaseDetailConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得采购订单子信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:purchase-detail:query')")
+    public CommonResult<PageResult<PurchaseDetailRespVO>> getPurchaseDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<PurchaseDetailDO> pageResult = purchaseDetailService.getPurchaseDetailSenior(conditions);
+        PageResult<PurchaseDetailRespVO> result = PurchaseDetailConvert.INSTANCE.convertPage(pageResult);
+        for(PurchaseDetailRespVO 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:purchase-detail:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/PurchaseMainController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.purchase;
 
+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.purchase.vo.*;
@@ -55,7 +56,19 @@ public class PurchaseMainController {
         purchaseMainService.updatePurchaseMain(updateReqVO);
         return success(true);
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:purchase-main:query')")
+    public CommonResult<PageResult<PurchaseMainRespVO>> getPurchaseMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<PurchaseMainDO> pageResult = purchaseMainService.getPurchaseMainSenior(conditions);
+        PageResult<PurchaseMainRespVO> result = PurchaseMainConvert.INSTANCE.convertPage(pageResult);
+        for(PurchaseMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @DeleteMapping("/delete")
     @Operation(summary = "删除采购订单主")
     @Parameter(name = "id", description = "编号", required = true)

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/PurchasePlanDetailController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.purchasePlan;
 
+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.purchasePlan.vo.*;
@@ -55,7 +56,19 @@ public class PurchasePlanDetailController {
         purchasePlanDetailService.updatePurchasePlanDetail(updateReqVO);
         return success(true);
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得要货计划子信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:purchase-plan-detail:query')")
+    public CommonResult<PageResult<PurchasePlanDetailRespVO>> getPurchasePlanDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<PurchasePlanDetailDO> pageResult = purchasePlanDetailService.getPurchasePlanDetailSenior(conditions);
+        PageResult<PurchasePlanDetailRespVO> result = PurchasePlanDetailConvert.INSTANCE.convertPage(pageResult);
+        for(PurchasePlanDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @DeleteMapping("/delete")
     @Operation(summary = "删除要货计划子")
     @Parameter(name = "id", description = "编号", required = true)

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/PurchasePlanMainController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.purchasePlan;
 
+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.purchasePlan.vo.*;
@@ -90,7 +91,19 @@ public class PurchasePlanMainController {
         PageResult<PurchasePlanMainDO> pageResult = purchasePlanMainService.getPurchasePlanMainPage(pageVO);
         return success(PurchasePlanMainConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:purchase-plan-main:query')")
+    public CommonResult<PageResult<PurchasePlanMainRespVO>> getPurchasePlanMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<PurchasePlanMainDO> pageResult = purchasePlanMainService.getPurchasePlanMainSenior(conditions);
+        PageResult<PurchasePlanMainRespVO> result = PurchasePlanMainConvert.INSTANCE.convertPage(pageResult);
+        for(PurchasePlanMainRespVO 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:purchase-plan-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/PurchaseclaimRecordDetailController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.purchaseclaimRecord;
 
+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.purchaseclaimRecord.vo.*;
@@ -48,7 +49,19 @@ public class PurchaseclaimRecordDetailController {
     public CommonResult<Long> createPurchaseclaimRecordDetail(@Valid @RequestBody PurchaseclaimRecordDetailCreateReqVO createReqVO) {
         return success(purchaseclaimRecordDetailService.createPurchaseclaimRecordDetail(createReqVO));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:PurchaseclaimRecordDetail:query')")
+    public CommonResult<PageResult<PurchaseclaimRecordDetailRespVO>> getPurchaseclaimRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<PurchaseclaimRecordDetailDO> pageResult = purchaseclaimRecordDetailService.getPurchaseclaimRecordDetailSenior(conditions);
+        PageResult<PurchaseclaimRecordDetailRespVO> result = PurchaseclaimRecordDetailConvert.INSTANCE.convertPage(pageResult);
+        for(PurchaseclaimRecordDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @PutMapping("/update")
     @Operation(summary = "更新采购索赔记录子")
     @PreAuthorize("@ss.hasPermission('wms:purchaseclaim-record-detail:update')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/PurchaseclaimRecordMainController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.purchaseclaimRecord;
 
+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.purchaseclaimRecord.vo.*;
@@ -89,7 +90,19 @@ public class PurchaseclaimRecordMainController {
         PageResult<PurchaseclaimRecordMainDO> pageResult = purchaseclaimRecordMainService.getPurchaseclaimRecordMainPage(pageVO);
         return success(PurchaseclaimRecordMainConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:purchaseclaim-record-main:query')")
+    public CommonResult<PageResult<PurchaseclaimRecordMainRespVO>> getPurchaseclaimRecordMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<PurchaseclaimRecordMainDO> pageResult = purchaseclaimRecordMainService.getPurchaseclaimRecordMainSenior(conditions);
+        PageResult<PurchaseclaimRecordMainRespVO> result = PurchaseclaimRecordMainConvert.INSTANCE.convertPage(pageResult);
+        for(PurchaseclaimRecordMainRespVO 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:purchaseclaim-record-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/PurchaseclaimRequestDetailController.java

@@ -4,6 +4,7 @@ import com.win.framework.common.pojo.CommonResult;
 import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
 import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.purchaseclaimRequest.vo.PurchaseclaimRequestDetailCreateReqVO;
 import com.win.module.wms.controller.purchaseclaimRequest.vo.PurchaseclaimRequestDetailPageReqVO;
 import com.win.module.wms.controller.purchaseclaimRequest.vo.PurchaseclaimRequestDetailRespVO;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseprice/PurchasepriceController.java

@@ -1,6 +1,7 @@
 package com.win.module.wms.controller.purchaseprice;
 
 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;
@@ -49,7 +50,19 @@ public class PurchasepriceController {
     public CommonResult<Long> createPurchaseprice(@Valid @RequestBody PurchasepriceCreateReqVO createReqVO) {
         return success(purchasepriceService.createPurchaseprice(createReqVO));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得采购价格单信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:purchaseprice:query')")
+    public CommonResult<PageResult<PurchasepriceRespVO>> getPurchasepriceSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<PurchasepriceDO> pageResult = purchasepriceService.getPurchasepriceSenior(conditions);
+        PageResult<PurchasepriceRespVO> result = PurchasepriceConvert.INSTANCE.convertPage(pageResult);
+        for(PurchasepriceRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @PutMapping("/update")
     @Operation(summary = "更新采购价格单")
     @PreAuthorize("@ss.hasPermission('wms:purchaseprice:update')")
@@ -106,8 +119,12 @@ public class PurchasepriceController {
             AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
             //后端创建个字段作为前端展示的虚拟字段
             vo.setCreator(user.getNickname());
-        }
-        ExcelUtils.write(response, "采购价格单.xls", "数据", PurchasepriceExcelVO.class, datas);
+        } Map<Integer, String[]> mapDropDown = new HashMap<>();
+        String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY);
+        mapDropDown.put(2, currency);
+        String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
+        mapDropDown.put(4, available);
+        ExcelUtils.write(response, "采购价格单.xls", "数据", PurchasepriceExcelVO.class, datas,mapDropDown);
     }
     @GetMapping("/get-import-template")
     @Operation(summary = "获得导入采购价格单模板")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobDetailController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.purchasereceiptJob;
 
+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.*;
@@ -74,7 +75,19 @@ public class PurchasereceiptJobDetailController {
         PurchasereceiptJobDetailDO purchasereceiptJobDetail = purchasereceiptJobDetailService.getPurchasereceiptJobDetail(id);
         return success(PurchasereceiptJobDetailConvert.INSTANCE.convert(purchasereceiptJobDetail));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得采购收货任务子信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-detail:query')")
+    public CommonResult<PageResult<PurchasereceiptJobDetailRespVO>> getPurchasereceiptJobDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<PurchasereceiptJobDetailDO> pageResult = purchasereceiptJobDetailService.getPurchasereceiptJobDetailSenior(conditions);
+        PageResult<PurchasereceiptJobDetailRespVO> result = PurchasereceiptJobDetailConvert.INSTANCE.convertPage(pageResult);
+        for(PurchasereceiptJobDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/list")
     @Operation(summary = "获得采购收货任务子列表")
     @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.purchasereceiptJob;
 
+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.*;
@@ -91,7 +92,19 @@ public class PurchasereceiptJobMainController {
         PageResult<PurchasereceiptJobMainDO> pageResult = purchasereceiptJobMainService.getPurchasereceiptJobMainPage(pageVO);
         return success(PurchasereceiptJobMainConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得采购收货任务主信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:query')")
+    public CommonResult<PageResult<PurchasereceiptJobMainRespVO>> getPurchasereceiptJobMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<PurchasereceiptJobMainDO> pageResult = purchasereceiptJobMainService.getPurchasereceiptJobMainSenior(conditions);
+        PageResult<PurchasereceiptJobMainRespVO> result = PurchasereceiptJobMainConvert.INSTANCE.convertPage(pageResult);
+        for(PurchasereceiptJobMainRespVO 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:purchasereceipt-job-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordDetailController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.purchasereceiptRecord;
 
+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.purchasereceiptRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -91,7 +91,19 @@ public class PurchasereceiptRecordDetailController {
         PageResult<PurchasereceiptRecordDetailDO> pageResult = purchasereceiptRecordDetailService.getPurchasereceiptRecordDetailPage(pageVO);
         return success(PurchasereceiptRecordDetailConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得采购收货记录子信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-record-detail:query')")
+    public CommonResult<PageResult<PurchasereceiptRecordDetailRespVO>> getPurchasereceiptRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<PurchasereceiptRecordDetailDO> pageResult = purchasereceiptRecordDetailService.getPurchasereceiptRecordDetailSenior(conditions);
+        PageResult<PurchasereceiptRecordDetailRespVO> result = PurchasereceiptRecordDetailConvert.INSTANCE.convertPage(pageResult);
+        for(PurchasereceiptRecordDetailRespVO 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:purchasereceipt-record-detail:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordMainController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.purchasereceiptRecord;
 
+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.purchasereceiptRecord.vo.*;
@@ -55,7 +56,19 @@ public class PurchasereceiptRecordMainController {
         purchasereceiptRecordMainService.updatePurchasereceiptRecordMain(updateReqVO);
         return success(true);
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得采购收货记录主信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:PurchasereceiptRecordMain:query')")
+    public CommonResult<PageResult<PurchasereceiptRecordMainRespVO>> getPurchasereceiptRecordMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<PurchasereceiptRecordMainDO> pageResult = purchasereceiptRecordMainService.getPurchasereceiptRecordMainSenior(conditions);
+        PageResult<PurchasereceiptRecordMainRespVO> result = PurchasereceiptRecordMainConvert.INSTANCE.convertPage(pageResult);
+        for(PurchasereceiptRecordMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @DeleteMapping("/delete")
     @Operation(summary = "删除采购收货记录主")
     @Parameter(name = "id", description = "编号", required = true)

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestDetailController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.purchasereceiptRequest;
 
+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.purchasereceiptRequest.vo.*;
@@ -49,7 +50,19 @@ public class PurchasereceiptRequestDetailController {
     public CommonResult<Long> createPurchasereceiptRequestDetail(@Valid @RequestBody PurchasereceiptRequestDetailCreateReqVO createReqVO) {
         return success(purchasereceiptRequestDetailService.createPurchasereceiptRequestDetail(createReqVO));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:PurchasereceiptRequestDetail:query')")
+    public CommonResult<PageResult<PurchasereceiptRequestDetailRespVO>> getPurchasereceiptRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<PurchasereceiptRequestDetailDO> pageResult = purchasereceiptRequestDetailService.getPurchasereceiptRequestDetailSenior(conditions);
+        PageResult<PurchasereceiptRequestDetailRespVO> result = PurchasereceiptRequestDetailConvert.INSTANCE.convertPage(pageResult);
+        for(PurchasereceiptRequestDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @PutMapping("/update")
     @Operation(summary = "更新采购收货申请子")
     @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-request-detail:update')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestMainController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.purchasereceiptRequest;
 
+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.purchasereceiptRequest.vo.*;
@@ -65,7 +66,19 @@ public class PurchasereceiptRequestMainController {
         purchasereceiptRequestMainService.deletePurchasereceiptRequestMain(id);
         return success(true);
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-request-main:query')")
+    public CommonResult<PageResult<PurchasereceiptRequestMainRespVO>> getPurchasereceiptRequestMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<PurchasereceiptRequestMainDO> pageResult = purchasereceiptRequestMainService.getPurchasereceiptRequestMainSenior(conditions);
+        PageResult<PurchasereceiptRequestMainRespVO> result = PurchasereceiptRequestMainConvert.INSTANCE.convertPage(pageResult);
+        for(PurchasereceiptRequestMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/get")
     @Operation(summary = "获得采购收货申请主")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobDetailController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.purchasereturnJob;
 
+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.purchasereceiptRequest.vo.PurchasereceiptRequestMainExcelVO;
 import com.win.module.wms.controller.purchasereturnJob.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -92,6 +92,19 @@ public class PurchasereturnJobDetailController {
         PageResult<PurchasereturnJobDetailDO> pageResult = purchasereturnJobDetailService.getPurchasereturnJobDetailPage(pageVO);
         return success(PurchasereturnJobDetailConvert.INSTANCE.convertPage(pageResult));
     }
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:PurchasereturnJobDetail:query')")
+    public CommonResult<PageResult<PurchasereturnJobDetailRespVO>> getPurchasereturnJobDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<PurchasereturnJobDetailDO> pageResult = purchasereturnJobDetailService.getPurchasereturnJobDetailSenior(conditions);
+        PageResult<PurchasereturnJobDetailRespVO> result = PurchasereturnJobDetailConvert.INSTANCE.convertPage(pageResult);
+        for(PurchasereturnJobDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出采购退货任务子 Excel")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobMainController.java

@@ -1,5 +1,8 @@
 package com.win.module.wms.controller.purchasereturnJob;
 
+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.purchasereturnJob.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -32,7 +35,8 @@ import com.win.module.wms.service.purchasereturnJob.PurchasereturnJobMainService
 @RequestMapping("/wms/purchasereturn-job-main")
 @Validated
 public class PurchasereturnJobMainController {
-
+    @Resource
+    private AdminUserApi userApi;
     @Resource
     private PurchasereturnJobMainService purchasereturnJobMainService;
 
@@ -77,7 +81,19 @@ public class PurchasereturnJobMainController {
         List<PurchasereturnJobMainDO> list = purchasereturnJobMainService.getPurchasereturnJobMainList(ids);
         return success(PurchasereturnJobMainConvert.INSTANCE.convertList(list));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:PurchasereturnJobMain:query')")
+    public CommonResult<PageResult<PurchasereturnJobMainRespVO>> getPurchasereturnJobMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<PurchasereturnJobMainDO> pageResult = purchasereturnJobMainService.getPurchasereturnJobMainSenior(conditions);
+        PageResult<PurchasereturnJobMainRespVO> result = PurchasereturnJobMainConvert.INSTANCE.convertPage(pageResult);
+        for(PurchasereturnJobMainRespVO 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:purchasereturn-job-main:query')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailRespVO.java

@@ -8,5 +8,6 @@ import lombok.*;
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class PurchasereturnJobDetailRespVO extends PurchasereturnJobDetailBaseVO {
-
+    @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/purchasereturnRecord/PurchasereturnRecordDetailController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.purchasereturnRecord;
 
+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.purchasereturnRecord.vo.*;
@@ -48,7 +49,19 @@ public class PurchasereturnRecordDetailController {
     public CommonResult<Long> createPurchasereturnRecordDetail(@Valid @RequestBody PurchasereturnRecordDetailCreateReqVO createReqVO) {
         return success(purchasereturnRecordDetailService.createPurchasereturnRecordDetail(createReqVO));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得采购退货记录子信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:PurchasereturnRecordDetail:query')")
+    public CommonResult<PageResult<PurchasereturnRecordDetailRespVO>> getPurchasereturnRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<PurchasereturnRecordDetailDO> pageResult = purchasereturnRecordDetailService.getPurchasereturnRecordDetailSenior(conditions);
+        PageResult<PurchasereturnRecordDetailRespVO> result = PurchasereturnRecordDetailConvert.INSTANCE.convertPage(pageResult);
+        for(PurchasereturnRecordDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @PutMapping("/update")
     @Operation(summary = "更新采购退货记录子")
     @PreAuthorize("@ss.hasPermission('wms:purchasereturn-record-detail:update')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/PurchasereturnRecordMainController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.purchasereturnRecord;
 
+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.purchasereturnRecord.vo.*;
@@ -47,7 +48,19 @@ public class PurchasereturnRecordMainController {
     public CommonResult<Long> createPurchasereturnRecordMain(@Valid @RequestBody PurchasereturnRecordMainCreateReqVO createReqVO) {
         return success(purchasereturnRecordMainService.createPurchasereturnRecordMain(createReqVO));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:PurchasereturnRecordMain:query')")
+    public CommonResult<PageResult<PurchasereturnRecordMainRespVO>> getPurchasereturnRecordMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<PurchasereturnRecordMainDO> pageResult = purchasereturnRecordMainService.getPurchasereturnRecordMainSenior(conditions);
+        PageResult<PurchasereturnRecordMainRespVO> result = PurchasereturnRecordMainConvert.INSTANCE.convertPage(pageResult);
+        for(PurchasereturnRecordMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @PutMapping("/update")
     @Operation(summary = "更新采购退货记录主")
     @PreAuthorize("@ss.hasPermission('wms:purchasereturn-record-main:update')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestDetailController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.purchasereturnRequest;
 
+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.purchasereturnRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -48,7 +48,19 @@ public class PurchasereturnRequestDetailController {
     public CommonResult<Long> createPurchasereturnRequestDetail(@Valid @RequestBody PurchasereturnRequestDetailCreateReqVO createReqVO) {
         return success(purchasereturnRequestDetailService.createPurchasereturnRequestDetail(createReqVO));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得采购退货申请子信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:PurchasereturnRequestDetail:query')")
+    public CommonResult<PageResult<PurchasereturnRequestDetailRespVO>> getPurchasereturnRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<PurchasereturnRequestDetailDO> pageResult = purchasereturnRequestDetailService.getPurchasereturnRequestDetailSenior(conditions);
+        PageResult<PurchasereturnRequestDetailRespVO> result = PurchasereturnRequestDetailConvert.INSTANCE.convertPage(pageResult);
+        for(PurchasereturnRequestDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @PutMapping("/update")
     @Operation(summary = "更新采购退货申请子")
     @PreAuthorize("@ss.hasPermission('wms:purchasereturn-request-detail:update')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestMainController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.purchasereturnRequest;
 
+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.purchasereturnRequest.vo.*;
@@ -90,6 +91,19 @@ public class PurchasereturnRequestMainController {
         PageResult<PurchasereturnRequestMainDO> pageResult = purchasereturnRequestMainService.getPurchasereturnRequestMainPage(pageVO);
         return success(PurchasereturnRequestMainConvert.INSTANCE.convertPage(pageResult));
     }
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:PurchasereturnRequestMain:query')")
+    public CommonResult<PageResult<PurchasereturnRequestMainRespVO>> getPurchasereturnRequestMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<PurchasereturnRequestMainDO> pageResult = purchasereturnRequestMainService.getPurchasereturnRequestMainSenior(conditions);
+        PageResult<PurchasereturnRequestMainRespVO> result = PurchasereturnRequestMainConvert.INSTANCE.convertPage(pageResult);
+        for(PurchasereturnRequestMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出采购退货申请主 Excel")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobDetailController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.putawayJob;
 
+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.putawayJob.vo.*;
@@ -91,7 +92,19 @@ public class PutawayJobDetailController {
         PageResult<PutawayJobDetailDO> pageResult = putawayJobDetailService.getPutawayJobDetailPage(pageVO);
         return success(PutawayJobDetailConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:putaway-job-detail:query')")
+    public CommonResult<PageResult<PutawayJobDetailRespVO>> getPutawayJobDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<PutawayJobDetailDO> pageResult = putawayJobDetailService.getPutawayJobDetailSenior(conditions);
+        PageResult<PutawayJobDetailRespVO> result = PutawayJobDetailConvert.INSTANCE.convertPage(pageResult);
+        for(PutawayJobDetailRespVO 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:putaway-job-detail:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobMainController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.putawayJob;
 
+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.putawayJob.vo.*;
@@ -47,7 +48,19 @@ public class PutawayJobMainController {
     public CommonResult<Long> createPutawayJobMain(@Valid @RequestBody PutawayJobMainCreateReqVO createReqVO) {
         return success(putawayJobMainService.createPutawayJobMain(createReqVO));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:PutawayJobMain:query')")
+    public CommonResult<PageResult<PutawayJobMainRespVO>> getPutawayJobMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<PutawayJobMainDO> pageResult = putawayJobMainService.getPutawayJobMainSenior(conditions);
+        PageResult<PutawayJobMainRespVO> result = PutawayJobMainConvert.INSTANCE.convertPage(pageResult);
+        for(PutawayJobMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @PutMapping("/update")
     @Operation(summary = "更新上架任务主")
     @PreAuthorize("@ss.hasPermission('wms:putaway-job-main:update')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordDetailController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.putawayRecord;
 
+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.putawayRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -65,6 +65,19 @@ public class PutawayRecordDetailController {
         putawayRecordDetailService.deletePutawayRecordDetail(id);
         return success(true);
     }
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:putaway-record-detail:query')")
+    public CommonResult<PageResult<PutawayRecordDetailRespVO>> getPutawayRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<PutawayRecordDetailDO> pageResult = putawayRecordDetailService.getPutawayRecordDetailSenior(conditions);
+        PageResult<PutawayRecordDetailRespVO> result = PutawayRecordDetailConvert.INSTANCE.convertPage(pageResult);
+        for(PutawayRecordDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
 
     @GetMapping("/get")
     @Operation(summary = "获得上架记录子")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordMainController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.putawayRecord;
 
+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.putawayRecord.vo.*;
@@ -90,6 +91,19 @@ public class PutawayRecordMainController {
         PageResult<PutawayRecordMainDO> pageResult = putawayRecordMainService.getPutawayRecordMainPage(pageVO);
         return success(PutawayRecordMainConvert.INSTANCE.convertPage(pageResult));
     }
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:PutawayRecordMain:query')")
+    public CommonResult<PageResult<PutawayRecordMainRespVO>> getPutawayRecordMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<PutawayRecordMainDO> pageResult = putawayRecordMainService.getPutawayRecordMainSenior(conditions);
+        PageResult<PutawayRecordMainRespVO> result = PutawayRecordMainConvert.INSTANCE.convertPage(pageResult);
+        for(PutawayRecordMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出上架记录主 Excel")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/PutawayRequestDetailController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.putawayRequest;
 
+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.putawayRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -91,7 +91,19 @@ public class PutawayRequestDetailController {
         PageResult<PutawayRequestDetailDO> pageResult = putawayRequestDetailService.getPutawayRequestDetailPage(pageVO);
         return success(PutawayRequestDetailConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得上架申请子信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:putaway-request-detail:query')")
+    public CommonResult<PageResult<PutawayRequestDetailRespVO>> getPutawayRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<PutawayRequestDetailDO> pageResult = putawayRequestDetailService.getPutawayRequestDetailSenior(conditions);
+        PageResult<PutawayRequestDetailRespVO> result = PutawayRequestDetailConvert.INSTANCE.convertPage(pageResult);
+        for(PutawayRequestDetailRespVO 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:putaway-request-detail:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/PutawayRequestMainController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.putawayRequest;
 
+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.putawayRequest.vo.*;
@@ -10,21 +11,16 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
-
 import javax.validation.*;
 import javax.servlet.http.*;
 import java.util.*;
 import java.io.IOException;
-
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.common.pojo.CommonResult;
 import static com.win.framework.common.pojo.CommonResult.success;
-
 import com.win.framework.excel.core.util.ExcelUtils;
-
 import com.win.framework.operatelog.core.annotations.OperateLog;
 import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
-
 import com.win.module.wms.dal.dataobject.putawayRequest.PutawayRequestMainDO;
 import com.win.module.wms.convert.putawayRequest.PutawayRequestMainConvert;
 import com.win.module.wms.service.putawayRequest.PutawayRequestMainService;
@@ -72,7 +68,19 @@ public class PutawayRequestMainController {
         PutawayRequestMainDO putawayRequestMain = putawayRequestMainService.getPutawayRequestMain(id);
         return success(PutawayRequestMainConvert.INSTANCE.convert(putawayRequestMain));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:PutawayRequestMain:query')")
+    public CommonResult<PageResult<PutawayRequestMainRespVO>> getPutawayRequestMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<PutawayRequestMainDO> pageResult = putawayRequestMainService.getPutawayRequestMainSenior(conditions);
+        PageResult<PutawayRequestMainRespVO> result = PutawayRequestMainConvert.INSTANCE.convertPage(pageResult);
+        for(PutawayRequestMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/list")
     @Operation(summary = "获得上架申请主列表")
     @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/recordsetting/RecordsettingController.java

@@ -1,6 +1,7 @@
 package com.win.module.wms.controller.recordsetting;
 
 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;
@@ -20,7 +21,6 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
@@ -28,7 +28,6 @@ import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.*;
-
 import static com.win.framework.common.pojo.CommonResult.success;
 import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
@@ -58,7 +57,20 @@ public class RecordsettingController {
         recordsettingService.updateRecordsetting(updateReqVO);
         return success(true);
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:recordsetting:query')")
+    public CommonResult<PageResult<RecordsettingRespVO>> getRecordsettingSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<RecordsettingDO> pageResult = recordsettingService.getRecordsettingSenior(conditions);
+        PageResult<RecordsettingRespVO> result = RecordsettingConvert.INSTANCE.convertPage(pageResult);
+        for(RecordsettingRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+    
     @DeleteMapping("/delete")
     @Operation(summary = "删除记录设置")
     @Parameter(name = "id", description = "编号", required = true)
@@ -107,8 +119,13 @@ public class RecordsettingController {
             AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
             //后端创建个字段作为前端展示的虚拟字段
             vo.setCreator(user.getNickname());
-        }
-        ExcelUtils.write(response, "记录设置.xls", "数据", RecordsettingExcelVO.class, datas);
+        } Map<Integer, String[]> mapDropDown = new HashMap<>();
+        String[] interfaceType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INTERFACE_TYPE);
+        mapDropDown.put(1, interfaceType);
+
+        String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
+        mapDropDown.put(2, available);
+        ExcelUtils.write(response, "记录设置.xls", "数据", RecordsettingExcelVO.class, datas,mapDropDown);
     }
     @GetMapping("/get-import-template")
     @Operation(summary = "获得导入记录设置模板")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/RepleinshJobDetailController.java

@@ -2,6 +2,7 @@ package com.win.module.wms.controller.repleinshJob;
 
 
 
+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.repleinshJob.vo.*;
@@ -77,6 +78,20 @@ public class RepleinshJobDetailController {
         return success(RepleinshJobDetailConvert.INSTANCE.convert(repleinshJobDetail));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:RepleinshJobDetail:query')")
+    public CommonResult<PageResult<RepleinshJobDetailRespVO>> getRepleinshJobDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<RepleinshJobDetailDO> pageResult = repleinshJobDetailService.getRepleinshJobDetailSenior(conditions);
+        PageResult<RepleinshJobDetailRespVO> result = RepleinshJobDetailConvert.INSTANCE.convertPage(pageResult);
+        for(RepleinshJobDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+    
     @GetMapping("/list")
     @Operation(summary = "获得补料任务子列表")
     @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/RepleinshJobMainController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.repleinshJob;
 
+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.*;
@@ -8,9 +9,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.security.access.prepost.PreAuthorize;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import javax.validation.constraints.*;
+import io.swagger.v3.oas.annotations.Operation;;
 import javax.validation.*;
 import javax.servlet.http.*;
 import java.util.*;
@@ -48,7 +47,19 @@ public class RepleinshJobMainController {
     public CommonResult<Long> createRepleinshJobMain(@Valid @RequestBody RepleinshJobMainCreateReqVO createReqVO) {
         return success(repleinshJobMainService.createRepleinshJobMain(createReqVO));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得补料任务主信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:RepleinshJobMain:query')")
+    public CommonResult<PageResult<RepleinshJobMainRespVO>> getRepleinshJobMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<RepleinshJobMainDO> pageResult = repleinshJobMainService.getRepleinshJobMainSenior(conditions);
+        PageResult<RepleinshJobMainRespVO> result = RepleinshJobMainConvert.INSTANCE.convertPage(pageResult);
+        for(RepleinshJobMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @PutMapping("/update")
     @Operation(summary = "更新补料任务主")
     @PreAuthorize("@ss.hasPermission('wms:repleinsh-job-main:update')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/RepleinshRecordDetailController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.repleinshRecord;
 
+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.*;
@@ -9,8 +10,6 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
-
-import javax.validation.constraints.*;
 import javax.validation.*;
 import javax.servlet.http.*;
 import java.util.*;
@@ -65,6 +64,19 @@ public class RepleinshRecordDetailController {
         repleinshRecordDetailService.deleteRepleinshRecordDetail(id);
         return success(true);
     }
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:repleinsh-record-detail:query')")
+    public CommonResult<PageResult<RepleinshRecordDetailRespVO>> getRepleinshRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<RepleinshRecordDetailDO> pageResult = repleinshRecordDetailService.getRepleinshRecordDetailSenior(conditions);
+        PageResult<RepleinshRecordDetailRespVO> result = RepleinshRecordDetailConvert.INSTANCE.convertPage(pageResult);
+        for(RepleinshRecordDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
 
     @GetMapping("/get")
     @Operation(summary = "获得补料记录子")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/RepleinshRecordMainController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.repleinshRecord;
 
+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.*;
@@ -56,6 +57,19 @@ public class RepleinshRecordMainController {
         repleinshRecordMainService.updateRepleinshRecordMain(updateReqVO);
         return success(true);
     }
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得补料记录主信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:RepleinshRecordMain:query')")
+    public CommonResult<PageResult<RepleinshRecordMainRespVO>> getRepleinshRecordMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<RepleinshRecordMainDO> pageResult = repleinshRecordMainService.getRepleinshRecordMainSenior(conditions);
+        PageResult<RepleinshRecordMainRespVO> result = RepleinshRecordMainConvert.INSTANCE.convertPage(pageResult);
+        for(RepleinshRecordMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
 
     @DeleteMapping("/delete")
     @Operation(summary = "删除补料记录主")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/RepleinshRequestDetailController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.repleinshRequest;
 
+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.repleinshRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -65,7 +65,19 @@ public class RepleinshRequestDetailController {
         repleinshRequestDetailService.deleteRepleinshRequestDetail(id);
         return success(true);
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:repleinsh-request-detail:query')")
+    public CommonResult<PageResult<RepleinshRequestDetailRespVO>> getRepleinshRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<RepleinshRequestDetailDO> pageResult = repleinshRequestDetailService.getRepleinshRequestDetailSenior(conditions);
+        PageResult<RepleinshRequestDetailRespVO> result = RepleinshRequestDetailConvert.INSTANCE.convertPage(pageResult);
+        for(RepleinshRequestDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/get")
     @Operation(summary = "获得补料申请子")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/RepleinshRequestMainController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.repleinshRequest;
 
+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.repleinshRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -65,6 +65,19 @@ public class RepleinshRequestMainController {
         repleinshRequestMainService.deleteRepleinshRequestMain(id);
         return success(true);
     }
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:repleinsh-request-main:query')")
+    public CommonResult<PageResult<RepleinshRequestMainRespVO>> getRepleinshRequestMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<RepleinshRequestMainDO> pageResult = repleinshRequestMainService.getRepleinshRequestMainSenior(conditions);
+        PageResult<RepleinshRequestMainRespVO> result = RepleinshRequestMainConvert.INSTANCE.convertPage(pageResult);
+        for(RepleinshRequestMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
 
     @GetMapping("/get")
     @Operation(summary = "获得补料申请主")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/requestsetting/RequestsettingController.java

@@ -1,6 +1,7 @@
 package com.win.module.wms.controller.requestsetting;
 
 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;
@@ -76,7 +77,19 @@ public class RequestsettingController {
         RequestsettingDO requestsetting = requestsettingService.getRequestsetting(id);
         return success(RequestsettingConvert.INSTANCE.convert(requestsetting));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:Requestsetting:query')")
+    public CommonResult<PageResult<RequestsettingRespVO>> getRequestsettingSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<RequestsettingDO> pageResult = requestsettingService.getRequestsettingSenior(conditions);
+        PageResult<RequestsettingRespVO> result = RequestsettingConvert.INSTANCE.convertPage(pageResult);
+        for(RequestsettingRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/list")
     @Operation(summary = "获得申请设置列表")
     @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@@ -107,8 +120,20 @@ public class RequestsettingController {
             AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
             //后端创建个字段作为前端展示的虚拟字段
             vo.setCreator(user.getNickname());
-        }
-        ExcelUtils.write(response, "申请设置.xls", "数据", RequestsettingExcelVO.class, datas);
+        }  Map<Integer, String[]> mapDropDown = new HashMap<>();
+        String[] requestMode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.REQUEST_MODE);
+        mapDropDown.put(1, requestMode);
+        String[] autoCommit = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
+        mapDropDown.put(2, autoCommit);
+        String[] autoAgree = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
+        mapDropDown.put(3, autoAgree);
+        String[] autoExecute = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
+        mapDropDown.put(4, autoExecute);
+        String[] directCreateRecord = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
+        mapDropDown.put(5, directCreateRecord);
+        String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
+        mapDropDown.put(6, available);
+        ExcelUtils.write(response, "申请设置.xls", "数据", RequestsettingExcelVO.class, datas,mapDropDown);
     }
     @GetMapping("/get-import-template")
     @Operation(summary = "获得导入记录设置模板")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/RuleController.java

@@ -1,8 +1,10 @@
 package com.win.module.wms.controller.rule;
 
 import com.win.framework.common.pojo.CommonResult;
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
 import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.rule.vo.RuleCreateReqVO;
 import com.win.module.wms.controller.rule.vo.RulePageReqVO;
 import com.win.module.wms.controller.rule.vo.RuleRespVO;
@@ -66,6 +68,19 @@ public class RuleController {
         RuleDO rule = ruleService.getRule(id);
         return success(RuleConvert.INSTANCE.convert(rule));
     }
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:rule:query')")
+    public CommonResult<PageResult<RuleRespVO>> getRuleSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<RuleDO> pageResult = ruleService.getRuleSenior(conditions);
+        PageResult<RuleRespVO> result = RuleConvert.INSTANCE.convertPage(pageResult);
+        for(RuleRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
 
     @GetMapping("/page")
     @Operation(summary = "获得规则分页")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/RuleRespVO.java

@@ -8,5 +8,6 @@ import lombok.*;
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class RuleRespVO extends RuleBaseVO {
-
+    @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/sale/SaleDetailController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.sale;
 
+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.sale.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -91,6 +91,20 @@ public class SaleDetailController {
         PageResult<SaleDetailDO> pageResult = saleDetailService.getSaleDetailPage(pageVO);
         return success(SaleDetailConvert.INSTANCE.convertPage(pageResult));
     }
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:sale-detail:query')")
+    public CommonResult<PageResult<SaleDetailRespVO>> getSaleDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<SaleDetailDO> pageResult = saleDetailService.getSaleDetailSenior(conditions);
+        PageResult<SaleDetailRespVO> result = SaleDetailConvert.INSTANCE.convertPage(pageResult);
+        for(SaleDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出销售订单子 Excel")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/SaleMainController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.sale;
 
+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.sale.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -56,6 +56,19 @@ public class SaleMainController {
         saleMainService.updateSaleMain(updateReqVO);
         return success(true);
     }
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得销售订单主信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:sale-main:query')")
+    public CommonResult<PageResult<SaleMainRespVO>> getSaleMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<SaleMainDO> pageResult = saleMainService.getSaleMainSenior(conditions);
+        PageResult<SaleMainRespVO> result = SaleMainConvert.INSTANCE.convertPage(pageResult);
+        for(SaleMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
 
     @DeleteMapping("/delete")
     @Operation(summary = "删除销售订单主")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/SalepriceController.java

@@ -1,6 +1,7 @@
 package com.win.module.wms.controller.saleprice;
 
 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,7 +95,19 @@ public class SalepriceController {
         PageResult<SalepriceDO> pageResult = salepriceService.getSalepricePage(pageVO);
         return success(SalepriceConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得销售价格单信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:Saleprice:query')")
+    public CommonResult<PageResult<SalepriceRespVO>> getSalepriceSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<SalepriceDO> pageResult = salepriceService.getSalepriceSenior(conditions);
+        PageResult<SalepriceRespVO> result = SalepriceConvert.INSTANCE.convertPage(pageResult);
+        for(SalepriceRespVO 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:saleprice:export')")
@@ -109,7 +122,12 @@ public class SalepriceController {
             //后端创建个字段作为前端展示的虚拟字段
             vo.setCreator(user.getNickname());
         }
-        ExcelUtils.write(response, "销售价格单.xls", "数据", SalepriceExcelVO.class, datas);
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
+        mapDropDown.put(4, available);
+        String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY);
+        mapDropDown.put(2, currency);
+        ExcelUtils.write(response, "销售价格单.xls", "数据", SalepriceExcelVO.class, datas,mapDropDown);
     }
     @GetMapping("/get-import-template")
     @Operation(summary = "获得导销售价格单信息模板")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/ScrapJobDetailController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.scrapJob;
 
+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.scrapJob.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -65,7 +65,19 @@ public class ScrapJobDetailController {
         scrapJobDetailService.deleteScrapJobDetail(id);
         return success(true);
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:ScrapJobDetail:query')")
+    public CommonResult<PageResult<ScrapJobDetailRespVO>> getScrapJobDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ScrapJobDetailDO> pageResult = scrapJobDetailService.getScrapJobDetailSenior(conditions);
+        PageResult<ScrapJobDetailRespVO> result = ScrapJobDetailConvert.INSTANCE.convertPage(pageResult);
+        for(ScrapJobDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/get")
     @Operation(summary = "获得报废出库任务子")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/ScrapJobMainController.java

@@ -1,8 +1,9 @@
 package com.win.module.wms.controller.scrapJob;
 
+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.scrapJob.vo.*;
+
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -48,7 +49,19 @@ public class ScrapJobMainController {
     public CommonResult<Long> createScrapJobMain(@Valid @RequestBody ScrapJobMainCreateReqVO createReqVO) {
         return success(scrapJobMainService.createScrapJobMain(createReqVO));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:ScrapJobMain:query')")
+    public CommonResult<PageResult<ScrapJobMainRespVO>> getScrapJobMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ScrapJobMainDO> pageResult = scrapJobMainService.getScrapJobMainSenior(conditions);
+        PageResult<ScrapJobMainRespVO> result = ScrapJobMainConvert.INSTANCE.convertPage(pageResult);
+        for(ScrapJobMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @PutMapping("/update")
     @Operation(summary = "更新报废出库任务主")
     @PreAuthorize("@ss.hasPermission('wms:scrap-job-main:update')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/ScrapRecordDetailController.java

@@ -1,6 +1,8 @@
 package com.win.module.wms.controller.scrapRecord;
 
-import com.win.module.wms.controller.scrapRecord.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,10 @@ public class ScrapRecordDetailController {
     @Resource
     private ScrapRecordDetailService scrapRecordDetailService;
 
+    @Resource
+    private AdminUserApi userApi;
+    
+
     @PostMapping("/create")
     @Operation(summary = "创建报废出库记录子")
     @PreAuthorize("@ss.hasPermission('wms:scrap-record-detail:create')")
@@ -69,6 +75,19 @@ public class ScrapRecordDetailController {
         ScrapRecordDetailDO scrapRecordDetail = scrapRecordDetailService.getScrapRecordDetail(id);
         return success(ScrapRecordDetailConvert.INSTANCE.convert(scrapRecordDetail));
     }
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:ScrapRecordDetail:query')")
+    public CommonResult<PageResult<ScrapRecordDetailRespVO>> getScrapRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ScrapRecordDetailDO> pageResult = scrapRecordDetailService.getScrapRecordDetailSenior(conditions);
+        PageResult<ScrapRecordDetailRespVO> result = ScrapRecordDetailConvert.INSTANCE.convertPage(pageResult);
+        for(ScrapRecordDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
 
     @GetMapping("/list")
     @Operation(summary = "获得报废出库记录子列表")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/ScrapRecordMainController.java

@@ -1,6 +1,8 @@
 package com.win.module.wms.controller.scrapRecord;
 
-import com.win.module.wms.controller.scrapRecord.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 ScrapRecordMainController {
     @Resource
     private ScrapRecordMainService scrapRecordMainService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建报废出库记录主")
     @PreAuthorize("@ss.hasPermission('wms:scrap-record-main:create')")
@@ -86,6 +91,19 @@ public class ScrapRecordMainController {
         PageResult<ScrapRecordMainDO> pageResult = scrapRecordMainService.getScrapRecordMainPage(pageVO);
         return success(ScrapRecordMainConvert.INSTANCE.convertPage(pageResult));
     }
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得报废出库记录主信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:ScrapRecordMain:query')")
+    public CommonResult<PageResult<ScrapRecordMainRespVO>> getScrapRecordMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ScrapRecordMainDO> pageResult = scrapRecordMainService.getScrapRecordMainSenior(conditions);
+        PageResult<ScrapRecordMainRespVO> result = ScrapRecordMainConvert.INSTANCE.convertPage(pageResult);
+        for(ScrapRecordMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出报废出库记录主 Excel")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/ScrapRequestDetailController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.scrapRequest;
-
+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.scrapRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -8,22 +10,16 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
-
 import javax.validation.*;
 import javax.servlet.http.*;
 import java.util.*;
 import java.io.IOException;
-
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.common.pojo.CommonResult;
 import static com.win.framework.common.pojo.CommonResult.success;
-
 import com.win.framework.excel.core.util.ExcelUtils;
-
 import com.win.framework.operatelog.core.annotations.OperateLog;
 import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-import com.win.module.wms.controller.scrapRequest.vo.*;
 import com.win.module.wms.dal.dataobject.scrapRequest.ScrapRequestDetailDO;
 import com.win.module.wms.convert.scrapRequest.ScrapRequestDetailConvert;
 import com.win.module.wms.service.scrapRequest.ScrapRequestDetailService;
@@ -37,6 +33,10 @@ public class ScrapRequestDetailController {
     @Resource
     private ScrapRequestDetailService scrapRequestDetailService;
 
+    @Resource
+    private AdminUserApi userApi;
+
+
     @PostMapping("/create")
     @Operation(summary = "创建报废出库申请子")
     @PreAuthorize("@ss.hasPermission('wms:scrap-request-detail:create')")
@@ -51,7 +51,19 @@ public class ScrapRequestDetailController {
         scrapRequestDetailService.updateScrapRequestDetail(updateReqVO);
         return success(true);
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:ScrapRequestDetail:query')")
+    public CommonResult<PageResult<ScrapRequestDetailRespVO>> getScrapRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ScrapRequestDetailDO> pageResult = scrapRequestDetailService.getScrapRequestDetailSenior(conditions);
+        PageResult<ScrapRequestDetailRespVO> result = ScrapRequestDetailConvert.INSTANCE.convertPage(pageResult);
+        for(ScrapRequestDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @DeleteMapping("/delete")
     @Operation(summary = "删除报废出库申请子")
     @Parameter(name = "id", description = "编号", required = true)

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/ScrapRequestMainController.java

@@ -1,5 +1,8 @@
 package com.win.module.wms.controller.scrapRequest;
 
+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.scrapRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -8,22 +11,16 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
-
 import javax.validation.*;
 import javax.servlet.http.*;
 import java.util.*;
 import java.io.IOException;
-
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.common.pojo.CommonResult;
 import static com.win.framework.common.pojo.CommonResult.success;
-
 import com.win.framework.excel.core.util.ExcelUtils;
-
 import com.win.framework.operatelog.core.annotations.OperateLog;
 import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-import com.win.module.wms.controller.scrapRequest.vo.*;
 import com.win.module.wms.dal.dataobject.scrapRequest.ScrapRequestMainDO;
 import com.win.module.wms.convert.scrapRequest.ScrapRequestMainConvert;
 import com.win.module.wms.service.scrapRequest.ScrapRequestMainService;
@@ -37,6 +34,9 @@ public class ScrapRequestMainController {
     @Resource
     private ScrapRequestMainService scrapRequestMainService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建报废出库申请主")
     @PreAuthorize("@ss.hasPermission('wms:scrap-request-main:create')")
@@ -87,6 +87,21 @@ public class ScrapRequestMainController {
         return success(ScrapRequestMainConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:scrap-request-main:query')")
+    public CommonResult<PageResult<ScrapRequestMainRespVO>> getScrapRequestMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ScrapRequestMainDO> pageResult = scrapRequestMainService.getScrapRequestMainSenior(conditions);
+        PageResult<ScrapRequestMainRespVO> result = ScrapRequestMainConvert.INSTANCE.convertPage(pageResult);
+        for(ScrapRequestMainRespVO 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:scrap-request-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/shift/ShiftController.java

@@ -1,6 +1,7 @@
 package com.win.module.wms.controller.shift;
 
 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;
@@ -21,7 +22,6 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
@@ -29,7 +29,6 @@ import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.*;
-
 import static com.win.framework.common.pojo.CommonResult.success;
 import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
@@ -94,6 +93,19 @@ public class ShiftController {
         PageResult<ShiftDO> pageResult = shiftService.getShiftPage(pageVO);
         return success(ShiftConvert.INSTANCE.convertPage(pageResult));
     }
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得班次信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:shift:query')")
+    public CommonResult<PageResult<ShiftRespVO>> getShiftSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ShiftDO> pageResult = shiftService.getShiftSenior(conditions);
+        PageResult<ShiftRespVO> result = ShiftConvert.INSTANCE.convertPage(pageResult);
+        for(ShiftRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出班次 Excel")
@@ -109,7 +121,12 @@ public class ShiftController {
             //后端创建个字段作为前端展示的虚拟字段
             vo.setCreator(user.getNickname());
         }
-        ExcelUtils.write(response, "班次.xls", "数据", ShiftExcelVO.class, datas);
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
+        mapDropDown.put(9, available);
+        String[] endAtNextDay = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
+        mapDropDown.put(8, endAtNextDay);
+        ExcelUtils.write(response, "班次.xls", "数据", ShiftExcelVO.class, datas,mapDropDown);
     }
     @GetMapping("/get-import-template")
     @Operation(summary = "获得导入班次信息模板")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/stdcostprice/StdcostpriceController.java

@@ -1,6 +1,7 @@
 package com.win.module.wms.controller.stdcostprice;
 
 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;
@@ -95,6 +96,20 @@ public class StdcostpriceController {
         return success(StdcostpriceConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得标准成本价格单信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:Stdcostprice:query')")
+    public CommonResult<PageResult<StdcostpriceRespVO>> getStdcostpriceSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<StdcostpriceDO> pageResult = stdcostpriceService.getStdcostpriceSenior(conditions);
+        PageResult<StdcostpriceRespVO> result = StdcostpriceConvert.INSTANCE.convertPage(pageResult);
+        for(StdcostpriceRespVO 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:stdcostprice:export')")
@@ -108,8 +123,12 @@ public class StdcostpriceController {
             AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
             //后端创建个字段作为前端展示的虚拟字段
             vo.setCreator(user.getNickname());
-        }
-        ExcelUtils.write(response, "标准成本价格单.xls", "数据", StdcostpriceExcelVO.class, datas);
+        }  Map<Integer, String[]> mapDropDown = new HashMap<>();
+        String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
+        mapDropDown.put(4, available);
+        String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY);
+        mapDropDown.put(2, currency);
+        ExcelUtils.write(response, "标准成本价格单.xls", "数据", StdcostpriceExcelVO.class, datas,mapDropDown);
     }
     @GetMapping("/get-import-template")
     @Operation(summary = "获得导入标准成本价格单信息模板")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/StrategyController.java

@@ -1,6 +1,7 @@
 package com.win.module.wms.controller.strategy;
 
 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;
@@ -16,14 +17,12 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
-
 import static com.win.framework.common.pojo.CommonResult.success;
 import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
@@ -53,6 +52,19 @@ public class StrategyController {
         strategyService.updateStrategy(updateReqVO);
         return success(true);
     }
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得策略信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:strategy:query')")
+    public CommonResult<PageResult<StrategyRespVO>> getStrategySenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<StrategyDO> pageResult = strategyService.getStrategySenior(conditions);
+        PageResult<StrategyRespVO> result = StrategyConvert.INSTANCE.convertPage(pageResult);
+        for(StrategyRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
 
     @DeleteMapping("/delete")
     @Operation(summary = "删除策略")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/vo/StrategyRespVO.java

@@ -15,5 +15,7 @@ public class StrategyRespVO extends StrategyBaseVO {
 
     @Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED)
     private String creatorId;
+    @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/supplier/SupplierController.java

@@ -1,6 +1,7 @@
 package com.win.module.wms.controller.supplier;
 
 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;
@@ -50,7 +51,19 @@ public class SupplierController {
     public CommonResult<Long> createSupplier(@Valid @RequestBody SupplierCreateReqVO createReqVO) {
         return success(supplierService.createSupplier(createReqVO));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:Supplier:query')")
+    public CommonResult<PageResult<SupplierRespVO>> getSupplierSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<SupplierDO> pageResult = supplierService.getSupplierSenior(conditions);
+        PageResult<SupplierRespVO> result = SupplierConvert.INSTANCE.convertPage(pageResult);
+        for(SupplierRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @PutMapping("/update")
     @Operation(summary = "更新供应商")
     @PreAuthorize("@ss.hasPermission('wms:supplier:update')")
@@ -106,8 +119,14 @@ public class SupplierController {
             AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
             //后端创建个字段作为前端展示的虚拟字段
             vo.setCreator(user.getNickname());
-        }
-        ExcelUtils.write(response, "供应商.xls", "数据", SupplierExcelVO.class, datas);
+        } Map<Integer, String[]> mapDropDown = new HashMap<>();
+        String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY);
+        mapDropDown.put(11, currency);
+        String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.SUPPLIER_TYPE);
+        mapDropDown.put(13, type);
+        String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
+        mapDropDown.put(14, available);
+        ExcelUtils.write(response, "供应商.xls", "数据", SupplierExcelVO.class, datas,mapDropDown);
     }
     @GetMapping("/get-import-template")
     @Operation(summary = "获得导入供应商模板")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordDetailController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.supplierdeliverRecord;
 
+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.supplierdeliverRecord.vo.*;
@@ -10,21 +11,16 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
-
 import javax.validation.*;
 import javax.servlet.http.*;
 import java.util.*;
 import java.io.IOException;
-
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.common.pojo.CommonResult;
 import static com.win.framework.common.pojo.CommonResult.success;
-
 import com.win.framework.excel.core.util.ExcelUtils;
-
 import com.win.framework.operatelog.core.annotations.OperateLog;
 import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
-
 import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO;
 import com.win.module.wms.convert.supplierdeliverRecord.SupplierdeliverRecordDetailConvert;
 import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordDetailService;
@@ -73,7 +69,19 @@ public class SupplierdeliverRecordDetailController {
         SupplierdeliverRecordDetailDO supplierdeliverRecordDetail = supplierdeliverRecordDetailService.getSupplierdeliverRecordDetail(id);
         return success(SupplierdeliverRecordDetailConvert.INSTANCE.convert(supplierdeliverRecordDetail));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:SupplierdeliverRecordDetail:query')")
+    public CommonResult<PageResult<SupplierdeliverRecordDetailRespVO>> getSupplierdeliverRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<SupplierdeliverRecordDetailDO> pageResult = supplierdeliverRecordDetailService.getSupplierdeliverRecordDetailSenior(conditions);
+        PageResult<SupplierdeliverRecordDetailRespVO> result = SupplierdeliverRecordDetailConvert.INSTANCE.convertPage(pageResult);
+        for(SupplierdeliverRecordDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/list")
     @Operation(summary = "获得供应商发货记录子列表")
     @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordMainController.java

@@ -1,5 +1,8 @@
 package com.win.module.wms.controller.supplierdeliverRecord;
 
+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.supplierdeliverRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -8,22 +11,16 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
-
 import javax.validation.*;
 import javax.servlet.http.*;
 import java.util.*;
 import java.io.IOException;
-
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.common.pojo.CommonResult;
 import static com.win.framework.common.pojo.CommonResult.success;
-
 import com.win.framework.excel.core.util.ExcelUtils;
-
 import com.win.framework.operatelog.core.annotations.OperateLog;
 import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-
 import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordMainDO;
 import com.win.module.wms.convert.supplierdeliverRecord.SupplierdeliverRecordMainConvert;
 import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordMainService;
@@ -37,6 +34,9 @@ public class SupplierdeliverRecordMainController {
     @Resource
     private SupplierdeliverRecordMainService supplierdeliverRecordMainService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建供应商发货记录主")
     @PreAuthorize("@ss.hasPermission('wms:supplierdeliver-record-main:create')")
@@ -52,6 +52,19 @@ public class SupplierdeliverRecordMainController {
         return success(true);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:supplierdeliver-record-main:query')")
+    public CommonResult<PageResult<SupplierdeliverRecordMainRespVO>> getSupplierdeliverRecordMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<SupplierdeliverRecordMainDO> pageResult = supplierdeliverRecordMainService.getSupplierdeliverRecordMainSenior(conditions);
+        PageResult<SupplierdeliverRecordMainRespVO> result = SupplierdeliverRecordMainConvert.INSTANCE.convertPage(pageResult);
+        for(SupplierdeliverRecordMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @DeleteMapping("/delete")
     @Operation(summary = "删除供应商发货记录主")
     @Parameter(name = "id", description = "编号", required = true)

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestDetailController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.supplierdeliverRequest;
 
+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.supplierdeliverRequest.vo.*;
@@ -57,6 +58,20 @@ public class SupplierdeliverRequestDetailController {
         return success(true);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:SupplierdeliverRequestDetail:query')")
+    public CommonResult<PageResult<SupplierdeliverRequestDetailRespVO>> getSupplierdeliverRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<SupplierdeliverRequestDetailDO> pageResult = supplierdeliverRequestDetailService.getSupplierdeliverRequestDetailSenior(conditions);
+        PageResult<SupplierdeliverRequestDetailRespVO> result = SupplierdeliverRequestDetailConvert.INSTANCE.convertPage(pageResult);
+        for(SupplierdeliverRequestDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
     @DeleteMapping("/delete")
     @Operation(summary = "删除供应商发货申请子")
     @Parameter(name = "id", description = "编号", required = true)

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestMainController.java

@@ -1,5 +1,5 @@
 package com.win.module.wms.controller.supplierdeliverRequest;
-
+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.supplierdeliverRequest.vo.*;
@@ -10,21 +10,16 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
-
 import javax.validation.*;
 import javax.servlet.http.*;
 import java.util.*;
 import java.io.IOException;
-
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.common.pojo.CommonResult;
 import static com.win.framework.common.pojo.CommonResult.success;
-
 import com.win.framework.excel.core.util.ExcelUtils;
-
 import com.win.framework.operatelog.core.annotations.OperateLog;
 import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
-
 import com.win.module.wms.dal.dataobject.supplierdeliverRequest.SupplierdeliverRequestMainDO;
 import com.win.module.wms.convert.supplierdeliverRequest.SupplierdeliverRequestMainConvert;
 import com.win.module.wms.service.supplierdeliverRequest.SupplierdeliverRequestMainService;
@@ -82,6 +77,19 @@ public class SupplierdeliverRequestMainController {
         List<SupplierdeliverRequestMainDO> list = supplierdeliverRequestMainService.getSupplierdeliverRequestMainList(ids);
         return success(SupplierdeliverRequestMainConvert.INSTANCE.convertList(list));
     }
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:SupplierdeliverRequestMain:query')")
+    public CommonResult<PageResult<SupplierdeliverRequestMainRespVO>> getSupplierdeliverRequestMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<SupplierdeliverRequestMainDO> pageResult = supplierdeliverRequestMainService.getSupplierdeliverRequestMainSenior(conditions);
+        PageResult<SupplierdeliverRequestMainRespVO> result = SupplierdeliverRequestMainConvert.INSTANCE.convertPage(pageResult);
+        for(SupplierdeliverRequestMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
 
     @GetMapping("/page")
     @Operation(summary = "获得供应商发货申请主分页")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/SupplierinvoiceRecordDeatilController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.supplierinvoiceRecord;
 
+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.supplierinvoiceRecord.vo.*;
@@ -90,7 +91,19 @@ public class SupplierinvoiceRecordDeatilController {
         PageResult<SupplierinvoiceRecordDeatilDO> pageResult = supplierinvoiceRecordDeatilService.getSupplierinvoiceRecordDeatilPage(pageVO);
         return success(SupplierinvoiceRecordDeatilConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:supplierinvoice-record-deatil:query')")
+    public CommonResult<PageResult<SupplierinvoiceRecordDeatilRespVO>> getSupplierinvoiceRecordDeatilSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<SupplierinvoiceRecordDeatilDO> pageResult = supplierinvoiceRecordDeatilService.getSupplierinvoiceRecordDeatilSenior(conditions);
+        PageResult<SupplierinvoiceRecordDeatilRespVO> result = SupplierinvoiceRecordDeatilConvert.INSTANCE.convertPage(pageResult);
+        for(SupplierinvoiceRecordDeatilRespVO 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:supplierinvoice-record-deatil:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/SupplierinvoiceRecordMainController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.supplierinvoiceRecord;
 
+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.supplierinvoiceRecord.vo.*;
@@ -10,21 +11,16 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
-
 import javax.validation.*;
 import javax.servlet.http.*;
 import java.util.*;
 import java.io.IOException;
-
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.common.pojo.CommonResult;
 import static com.win.framework.common.pojo.CommonResult.success;
-
 import com.win.framework.excel.core.util.ExcelUtils;
-
 import com.win.framework.operatelog.core.annotations.OperateLog;
 import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
-
 import com.win.module.wms.dal.dataobject.supplierinvoiceRecord.SupplierinvoiceRecordMainDO;
 import com.win.module.wms.convert.supplierinvoiceRecord.SupplierinvoiceRecordMainConvert;
 import com.win.module.wms.service.supplierinvoiceRecord.SupplierinvoiceRecordMainService;
@@ -64,7 +60,19 @@ public class SupplierinvoiceRecordMainController {
         supplierinvoiceRecordMainService.deleteSupplierinvoiceRecordMain(id);
         return success(true);
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:SupplierinvoiceRecordMain:query')")
+    public CommonResult<PageResult<SupplierinvoiceRecordMainRespVO>> getSupplierinvoiceRecordMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<SupplierinvoiceRecordMainDO> pageResult = supplierinvoiceRecordMainService.getSupplierinvoiceRecordMainSenior(conditions);
+        PageResult<SupplierinvoiceRecordMainRespVO> result = SupplierinvoiceRecordMainConvert.INSTANCE.convertPage(pageResult);
+        for(SupplierinvoiceRecordMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/get")
     @Operation(summary = "获得供应商发票记录主")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/SupplierinvoiceRequestDetailController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.supplierinvoiceRequest;
 
+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.supplierinvoiceRequest.vo.*;
@@ -73,7 +74,19 @@ public class SupplierinvoiceRequestDetailController {
         SupplierinvoiceRequestDetailDO supplierinvoiceRequestDetail = supplierinvoiceRequestDetailService.getSupplierinvoiceRequestDetail(id);
         return success(SupplierinvoiceRequestDetailConvert.INSTANCE.convert(supplierinvoiceRequestDetail));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:supplierinvoice-request-detail:query')")
+    public CommonResult<PageResult<SupplierinvoiceRequestDetailRespVO>> getSupplierinvoiceRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<SupplierinvoiceRequestDetailDO> pageResult = supplierinvoiceRequestDetailService.getSupplierinvoiceRequestDetailSenior(conditions);
+        PageResult<SupplierinvoiceRequestDetailRespVO> result = SupplierinvoiceRequestDetailConvert.INSTANCE.convertPage(pageResult);
+        for(SupplierinvoiceRequestDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/list")
     @Operation(summary = "获得供应商发票申请子列表")
     @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/SupplierinvoiceRequestMainController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.supplierinvoiceRequest;
 
+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.supplierinvoiceRequest.vo.*;
@@ -90,7 +91,19 @@ public class SupplierinvoiceRequestMainController {
         PageResult<SupplierinvoiceRequestMainDO> pageResult = supplierinvoiceRequestMainService.getSupplierinvoiceRequestMainPage(pageVO);
         return success(SupplierinvoiceRequestMainConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得供应商发票申请主信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:supplierinvoice-request-main:query')")
+    public CommonResult<PageResult<SupplierinvoiceRequestMainRespVO>> getSupplierinvoiceRequestMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<SupplierinvoiceRequestMainDO> pageResult = supplierinvoiceRequestMainService.getSupplierinvoiceRequestMainSenior(conditions);
+        PageResult<SupplierinvoiceRequestMainRespVO> result = SupplierinvoiceRequestMainConvert.INSTANCE.convertPage(pageResult);
+        for(SupplierinvoiceRequestMainRespVO 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:supplierinvoice-request-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/SupplieritemController.java

@@ -1,6 +1,7 @@
 package com.win.module.wms.controller.supplieritem;
 
 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;
@@ -8,7 +9,6 @@ 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.supplieritem.vo.*;
-
 import com.win.module.wms.convert.supplieritem.SupplieritemConvert;
 import com.win.module.wms.dal.dataobject.supplieritem.SupplieritemDO;
 import com.win.module.wms.enums.DictTypeConstants;
@@ -94,6 +94,19 @@ public class SupplieritemController {
         PageResult<SupplieritemDO> pageResult = supplieritemService.getSupplieritemPage(pageVO);
         return success(SupplieritemConvert.INSTANCE.convertPage(pageResult));
     }
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:supplieritem:query')")
+    public CommonResult<PageResult<SupplieritemRespVO>> getSupplieritemSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<SupplieritemDO> pageResult = supplieritemService.getSupplieritemSenior(conditions);
+        PageResult<SupplieritemRespVO> result = SupplieritemConvert.INSTANCE.convertPage(pageResult);
+        for(SupplieritemRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出供应商物品 Excel")
@@ -108,8 +121,18 @@ public class SupplieritemController {
             AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
             //后端创建个字段作为前端展示的虚拟字段
             vo.setCreator(user.getNickname());
-        }
-        ExcelUtils.write(response, "供应商物品.xls", "数据", SupplieritemExcelVO.class, datas);
+        } Map<Integer, String[]> mapDropDown = new HashMap<>();
+        String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
+        mapDropDown.put(13, available);
+        String[] supplierUom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
+        mapDropDown.put(3, supplierUom);
+        String[] packUnit = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PACK_UNIT);
+        mapDropDown.put(5, packUnit);
+        String[] altPackUnit = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PACK_UNIT);
+        mapDropDown.put(7, altPackUnit);
+        String[] settlementType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.SETTLEMENT_TYPE);
+        mapDropDown.put(12, settlementType);
+        ExcelUtils.write(response, "供应商物品.xls", "数据", SupplieritemExcelVO.class, datas,mapDropDown);
     }
 
     @GetMapping("/get-import-template")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/systemcalendar/SystemcalendarController.java

@@ -1,12 +1,13 @@
 package com.win.module.wms.controller.systemcalendar;
 
 import com.win.framework.common.pojo.CommonResult;
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.dict.core.util.DictFrameworkUtils;
 import com.win.framework.excel.core.util.ExcelUtils;
 import com.win.framework.operatelog.core.annotations.OperateLog;
 import com.win.module.system.api.user.AdminUserApi;
-import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;;
 import com.win.module.wms.controller.systemcalendar.vo.*;
 import com.win.module.wms.controller.systemcalendar.vo.SystemcalendarImportExcelVo;
 import com.win.module.wms.convert.systemcalendar.SystemcalendarConvert;
@@ -21,7 +22,6 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
@@ -29,7 +29,6 @@ import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.*;
-
 import static com.win.framework.common.pojo.CommonResult.success;
 import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
@@ -94,7 +93,19 @@ public class SystemcalendarController {
         PageResult<SystemcalendarDO> pageResult = systemcalendarService.getSystemcalendarPage(pageVO);
         return success(SystemcalendarConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:Systemcalendar:query')")
+    public CommonResult<PageResult<SystemcalendarRespVO>> getSystemcalendarSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<SystemcalendarDO> pageResult = systemcalendarService.getSystemcalendarSenior(conditions);
+        PageResult<SystemcalendarRespVO> result = SystemcalendarConvert.INSTANCE.convertPage(pageResult);
+        for(SystemcalendarRespVO 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:systemcalendar:export')")
@@ -108,8 +119,10 @@ public class SystemcalendarController {
             AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
             //后端创建个字段作为前端展示的虚拟字段
             vo.setCreator(user.getNickname());
-        }
-        ExcelUtils.write(response, "系统日历.xls", "数据", SystemcalendarExcelVO.class, datas);
+        }  Map<Integer, String[]> mapDropDown = new HashMap<>();
+        String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
+        mapDropDown.put(3, available);
+        ExcelUtils.write(response, "系统日历.xls", "数据", SystemcalendarExcelVO.class, datas,mapDropDown);
     }
     @GetMapping("/get-import-template")
     @Operation(summary = "获得导入班组信息模板")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/team/TeamController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.team;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.dict.core.util.DictFrameworkUtils;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
@@ -96,7 +97,19 @@ public class TeamController {
         PageResult<TeamDO> pageResult = teamService.getTeamPage(pageVO);
         return success(TeamConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:team:query')")
+    public CommonResult<PageResult<TeamRespVO>> getTeamSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<TeamDO> pageResult = teamService.getTeamSenior(conditions);
+        PageResult<TeamRespVO> result = TeamConvert.INSTANCE.convertPage(pageResult);
+        for(TeamRespVO 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:team:export')")
@@ -111,7 +124,10 @@ public class TeamController {
             //后端创建个字段作为前端展示的虚拟字段
             vo.setCreator(user.getNickname());
         }
-        ExcelUtils.write(response, "班组.xls", "数据", TeamExcelVO.class, datas);
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
+        mapDropDown.put(7, available);
+        ExcelUtils.write(response, "班组.xls", "数据", TeamExcelVO.class, datas,mapDropDown);
     }
     @GetMapping("/get-import-template")
     @Operation(summary = "获得导入班组信息模板")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/TransactionController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.transaction;
 
+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.transaction.vo.*;
@@ -83,7 +84,19 @@ public class TransactionController {
         List<TransactionDO> list = transactionService.getTransactionList(ids);
         return success(TransactionConvert.INSTANCE.convertList(list));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:Transaction:query')")
+    public CommonResult<PageResult<TransactionRespVO>> getTransactionSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<TransactionDO> pageResult = transactionService.getTransactionSenior(conditions);
+        PageResult<TransactionRespVO> result = TransactionConvert.INSTANCE.convertPage(pageResult);
+        for(TransactionRespVO 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:transaction:query')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/vo/TransactionRespVO.java

@@ -9,4 +9,6 @@ import lombok.*;
 @ToString(callSuper = true)
 public class TransactionRespVO extends TransactionBaseVO {
 
+    @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/transactiontype/TransactiontypeController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.transactiontype;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.dict.core.util.DictFrameworkUtils;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
@@ -70,7 +71,19 @@ public class TransactiontypeController {
         transactiontypeService.deleteTransactiontype(id);
         return success(true);
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:Transactiontype:query')")
+    public CommonResult<PageResult<TransactiontypeRespVO>> getTransactiontypeSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<TransactiontypeDO> pageResult = transactiontypeService.getTransactiontypeSenior(conditions);
+        PageResult<TransactiontypeRespVO> result = TransactiontypeConvert.INSTANCE.convertPage(pageResult);
+        for(TransactiontypeRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/get")
     @Operation(summary = "获得事务类型")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
@@ -110,8 +123,14 @@ public class TransactiontypeController {
             AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
             //后端创建个字段作为前端展示的虚拟字段
             vo.setCreator(user.getNickname());
-        }
-        ExcelUtils.write(response, "事务类型.xls", "数据", TransactiontypeExcelVO.class, datas);
+        }   Map<Integer, String[]> mapDropDown = new HashMap<>();
+        String[] allowNegative = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
+        mapDropDown.put(7, allowNegative);
+        String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
+        mapDropDown.put(8, available);
+        String[] isSoftDeleted = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
+        mapDropDown.put(9, isSoftDeleted);
+        ExcelUtils.write(response, "事务类型.xls", "数据", TransactiontypeExcelVO.class, datas,mapDropDown);
     }
 
     @GetMapping("/get-import-template")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/TransferissueJobDetailController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.transferissueJob;
 
+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.transferissueJob.vo.*;
@@ -48,7 +49,19 @@ public class TransferissueJobDetailController {
     public CommonResult<Long> createTransferissueJobDetail(@Valid @RequestBody TransferissueJobDetailCreateReqVO createReqVO) {
         return success(transferissueJobDetailService.createTransferissueJobDetail(createReqVO));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:transferissue-job-detail:query')")
+    public CommonResult<PageResult<TransferissueJobDetailRespVO>> getTransferissueJobDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<TransferissueJobDetailDO> pageResult = transferissueJobDetailService.getTransferissueJobDetailSenior(conditions);
+        PageResult<TransferissueJobDetailRespVO> result = TransferissueJobDetailConvert.INSTANCE.convertPage(pageResult);
+        for(TransferissueJobDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @PutMapping("/update")
     @Operation(summary = "更新调拨出库任务子")
     @PreAuthorize("@ss.hasPermission('wms:transferissue-job-detail:update')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/TransferissueJobMainController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.transferissueJob;
 
+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.transferissueJob.vo.*;
@@ -91,7 +92,19 @@ public class TransferissueJobMainController {
         PageResult<TransferissueJobMainDO> pageResult = transferissueJobMainService.getTransferissueJobMainPage(pageVO);
         return success(TransferissueJobMainConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:transferissue-job-main:query')")
+    public CommonResult<PageResult<TransferissueJobMainRespVO>> getTransferissueJobMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<TransferissueJobMainDO> pageResult = transferissueJobMainService.getTransferissueJobMainSenior(conditions);
+        PageResult<TransferissueJobMainRespVO> result = TransferissueJobMainConvert.INSTANCE.convertPage(pageResult);
+        for(TransferissueJobMainRespVO 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:transferissue-job-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/TransferissueRecordDetailController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.transferissueRecord;
 
+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.transferissueRecord.vo.*;
@@ -10,22 +11,16 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
-
 import javax.validation.*;
 import javax.servlet.http.*;
 import java.util.*;
 import java.io.IOException;
-
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.common.pojo.CommonResult;
 import static com.win.framework.common.pojo.CommonResult.success;
-
 import com.win.framework.excel.core.util.ExcelUtils;
-
 import com.win.framework.operatelog.core.annotations.OperateLog;
 import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-import com.win.module.wms.controller.transferissueRecord.vo.*;
 import com.win.module.wms.dal.dataobject.transferissueRecord.TransferissueRecordDetailDO;
 import com.win.module.wms.convert.transferissueRecord.TransferissueRecordDetailConvert;
 import com.win.module.wms.service.transferissueRecord.TransferissueRecordDetailService;
@@ -82,6 +77,20 @@ public class TransferissueRecordDetailController {
         List<TransferissueRecordDetailDO> list = transferissueRecordDetailService.getTransferissueRecordDetailList(ids);
         return success(TransferissueRecordDetailConvert.INSTANCE.convertList(list));
     }
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:transferissue-record-detail:query')")
+    public CommonResult<PageResult<TransferissueRecordDetailRespVO>> getTransferissueRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<TransferissueRecordDetailDO> pageResult = transferissueRecordDetailService.getTransferissueRequestDetailSenior(conditions);
+        PageResult<TransferissueRecordDetailRespVO> result = TransferissueRecordDetailConvert.INSTANCE.convertPage(pageResult);
+        for(TransferissueRecordDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+
 
     @GetMapping("/page")
     @Operation(summary = "获得调拨出库记录子分页")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/TransferissueRecordMainController.java

@@ -1,5 +1,8 @@
 package com.win.module.wms.controller.transferissueRecord;
 
+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.transferissueRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +40,9 @@ public class TransferissueRecordMainController {
     @Resource
     private TransferissueRecordMainService transferissueRecordMainService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建调拨出库记录主")
     @PreAuthorize("@ss.hasPermission('wms:transferissue-record-main:create')")
@@ -51,7 +57,20 @@ public class TransferissueRecordMainController {
         transferissueRecordMainService.updateTransferissueRecordMain(updateReqVO);
         return success(true);
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:TransferissueRecordMain:query')")
+    public CommonResult<PageResult<TransferissueRecordMainRespVO>> getTransferissueRecordMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<TransferissueRecordMainDO> pageResult = transferissueRecordMainService.getTransferissueRecordMainSenior(conditions);
+        PageResult<TransferissueRecordMainRespVO> result = TransferissueRecordMainConvert.INSTANCE.convertPage(pageResult);
+        for(TransferissueRecordMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
+    
     @DeleteMapping("/delete")
     @Operation(summary = "删除调拨出库记录主")
     @Parameter(name = "id", description = "编号", required = true)

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRequest/TransferissueRequestDetailController.java

@@ -1,5 +1,8 @@
 package com.win.module.wms.controller.transferissueRequest;
 
+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.transferissueRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -36,7 +39,8 @@ public class TransferissueRequestDetailController {
 
     @Resource
     private TransferissueRequestDetailService transferissueRequestDetailService;
-
+    @Resource
+    private AdminUserApi userApi;
     @PostMapping("/create")
     @Operation(summary = "创建调拨出库申请子")
     @PreAuthorize("@ss.hasPermission('wms:transferissue-request-detail:create')")
@@ -44,6 +48,19 @@ public class TransferissueRequestDetailController {
         return success(transferissueRequestDetailService.createTransferissueRequestDetail(createReqVO));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:itembasic:query')")
+    public CommonResult<PageResult<TransferissueRequestDetailRespVO>> getTransferissueRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<TransferissueRequestDetailDO> pageResult = transferissueRequestDetailService.getTransferissueRequestDetailSenior(conditions);
+        PageResult<TransferissueRequestDetailRespVO> result = TransferissueRequestDetailConvert.INSTANCE.convertPage(pageResult);
+        for(TransferissueRequestDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @PutMapping("/update")
     @Operation(summary = "更新调拨出库申请子")
     @PreAuthorize("@ss.hasPermission('wms:transferissue-request-detail:update')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRequest/TransferissueRequestMainController.java

@@ -1,5 +1,8 @@
 package com.win.module.wms.controller.transferissueRequest;
 
+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.transferissueRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +40,9 @@ public class TransferissueRequestMainController {
     @Resource
     private TransferissueRequestMainService transferissueRequestMainService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建调拨出库申请主")
     @PreAuthorize("@ss.hasPermission('wms:transferissue-request-main:create')")
@@ -51,6 +57,19 @@ public class TransferissueRequestMainController {
         transferissueRequestMainService.updateTransferissueRequestMain(updateReqVO);
         return success(true);
     }
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:itembasic:query')")
+    public CommonResult<PageResult<TransferissueRequestMainRespVO>> getTransferissueRequestMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<TransferissueRequestMainDO> pageResult = transferissueRequestMainService.getTransferissueRequestMainSenior(conditions);
+        PageResult<TransferissueRequestMainRespVO> result = TransferissueRequestMainConvert.INSTANCE.convertPage(pageResult);
+        for(TransferissueRequestMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
 
     @DeleteMapping("/delete")
     @Operation(summary = "删除调拨出库申请主")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferlog/TransferlogController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.transferlog;
 
+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.transferlog.vo.*;
@@ -57,6 +58,19 @@ public class TransferlogController {
         return success(true);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:itembasic:query')")
+    public CommonResult<PageResult<TransferlogRespVO>> getTransferlogSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<TransferlogDO> pageResult = transferlogService.getTransferlogSenior(conditions);
+        PageResult<TransferlogRespVO> result = TransferlogConvert.INSTANCE.convertPage(pageResult);
+        for(TransferlogRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @DeleteMapping("/delete")
     @Operation(summary = "删除库存转移日志")
     @Parameter(name = "id", description = "编号", required = true)

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferlog/vo/TransferlogRespVO.java

@@ -8,5 +8,7 @@ import lombok.*;
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class TransferlogRespVO extends TransferlogBaseVO {
+    @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/transferreceiptJob/TransferreceiptJobDetailController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.transferreceiptJob;
 
+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.transferreceiptJob.vo.*;
@@ -15,17 +16,12 @@ import javax.validation.*;
 import javax.servlet.http.*;
 import java.util.*;
 import java.io.IOException;
-
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.common.pojo.CommonResult;
 import static com.win.framework.common.pojo.CommonResult.success;
-
 import com.win.framework.excel.core.util.ExcelUtils;
-
 import com.win.framework.operatelog.core.annotations.OperateLog;
 import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-import com.win.module.wms.controller.transferreceiptJob.vo.*;
 import com.win.module.wms.dal.dataobject.transferreceiptJob.TransferreceiptJobDetailDO;
 import com.win.module.wms.convert.transferreceiptJob.TransferreceiptJobDetailConvert;
 import com.win.module.wms.service.transferreceiptJob.TransferreceiptJobDetailService;
@@ -48,7 +44,19 @@ public class TransferreceiptJobDetailController {
     public CommonResult<Long> createTransferreceiptJobDetail(@Valid @RequestBody TransferreceiptJobDetailCreateReqVO createReqVO) {
         return success(transferreceiptJobDetailService.createTransferreceiptJobDetail(createReqVO));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:itembasic:query')")
+    public CommonResult<PageResult<TransferreceiptJobDetailRespVO>> getTransferreceiptJobDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<TransferreceiptJobDetailDO> pageResult = transferreceiptJobDetailService.getTransferreceiptJobDetailSenior(conditions);
+        PageResult<TransferreceiptJobDetailRespVO> result = TransferreceiptJobDetailConvert.INSTANCE.convertPage(pageResult);
+        for(TransferreceiptJobDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @PutMapping("/update")
     @Operation(summary = "更新调拨入库任务子")
     @PreAuthorize("@ss.hasPermission('wms:transferreceipt-job-detail:update')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobMainController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.transferreceiptJob;
 
+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.transferreceiptJob.vo.*;
@@ -10,22 +11,16 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
-
 import javax.validation.*;
 import javax.servlet.http.*;
 import java.util.*;
 import java.io.IOException;
-
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.common.pojo.CommonResult;
 import static com.win.framework.common.pojo.CommonResult.success;
-
 import com.win.framework.excel.core.util.ExcelUtils;
-
 import com.win.framework.operatelog.core.annotations.OperateLog;
 import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-import com.win.module.wms.controller.transferreceiptJob.vo.*;
 import com.win.module.wms.dal.dataobject.transferreceiptJob.TransferreceiptJobMainDO;
 import com.win.module.wms.convert.transferreceiptJob.TransferreceiptJobMainConvert;
 import com.win.module.wms.service.transferreceiptJob.TransferreceiptJobMainService;
@@ -92,6 +87,20 @@ public class TransferreceiptJobMainController {
         return success(TransferreceiptJobMainConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:itembasic:query')")
+    public CommonResult<PageResult<TransferreceiptJobMainRespVO>> getTransferreceiptJobMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<TransferreceiptJobMainDO> pageResult = transferreceiptJobMainService.getTransferreceiptJobMainSenior(conditions);
+        PageResult<TransferreceiptJobMainRespVO> result = TransferreceiptJobMainConvert.INSTANCE.convertPage(pageResult);
+        for(TransferreceiptJobMainRespVO 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:transferreceipt-job-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/TransferreceiptRecordDetailController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.transferreceiptRecord;
 
+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.transferreceiptRecord.vo.*;
@@ -10,22 +11,16 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
-
 import javax.validation.*;
 import javax.servlet.http.*;
 import java.util.*;
 import java.io.IOException;
-
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.common.pojo.CommonResult;
 import static com.win.framework.common.pojo.CommonResult.success;
-
 import com.win.framework.excel.core.util.ExcelUtils;
-
 import com.win.framework.operatelog.core.annotations.OperateLog;
 import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-import com.win.module.wms.controller.transferreceiptRecord.vo.*;
 import com.win.module.wms.dal.dataobject.transferreceiptRecord.TransferreceiptRecordDetailDO;
 import com.win.module.wms.convert.transferreceiptRecord.TransferreceiptRecordDetailConvert;
 import com.win.module.wms.service.transferreceiptRecord.TransferreceiptRecordDetailService;
@@ -92,6 +87,19 @@ public class TransferreceiptRecordDetailController {
         return success(TransferreceiptRecordDetailConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:itembasic:query')")
+    public CommonResult<PageResult<TransferreceiptRecordDetailRespVO>> getTransferreceiptRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<TransferreceiptRecordDetailDO> pageResult = transferreceiptRecordDetailService.getTransferreceiptRecordDetailSenior(conditions);
+        PageResult<TransferreceiptRecordDetailRespVO> result = TransferreceiptRecordDetailConvert.INSTANCE.convertPage(pageResult);
+        for(TransferreceiptRecordDetailRespVO 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:transferreceipt-record-detail:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/TransferreceiptRecordMainController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.transferreceiptRecord;
 
+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.transferreceiptRecord.vo.*;
@@ -25,7 +26,6 @@ import com.win.framework.excel.core.util.ExcelUtils;
 import com.win.framework.operatelog.core.annotations.OperateLog;
 import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
 
-import com.win.module.wms.controller.transferreceiptRecord.vo.*;
 import com.win.module.wms.dal.dataobject.transferreceiptRecord.TransferreceiptRecordMainDO;
 import com.win.module.wms.convert.transferreceiptRecord.TransferreceiptRecordMainConvert;
 import com.win.module.wms.service.transferreceiptRecord.TransferreceiptRecordMainService;
@@ -66,6 +66,20 @@ public class TransferreceiptRecordMainController {
         return success(true);
     }
 
+
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:TransferreceiptRecordMain:query')")
+    public CommonResult<PageResult<TransferreceiptRecordMainRespVO>> getTransferreceiptRecordMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<TransferreceiptRecordMainDO> pageResult = transferreceiptRecordMainService.getTransferreceiptRecordMainSenior(conditions);
+        PageResult<TransferreceiptRecordMainRespVO> result = TransferreceiptRecordMainConvert.INSTANCE.convertPage(pageResult);
+        for(TransferreceiptRecordMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/get")
     @Operation(summary = "获得调拨入库记录主")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/TransferreceiptRequestDetailController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.transferreceiptRequest;
 
+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.transferreceiptRequest.vo.*;
@@ -48,7 +49,19 @@ public class TransferreceiptRequestDetailController {
     public CommonResult<Long> createTransferreceiptRequestDetail(@Valid @RequestBody TransferreceiptRequestDetailCreateReqVO createReqVO) {
         return success(transferreceiptRequestDetailService.createTransferreceiptRequestDetail(createReqVO));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:itembasic:query')")
+    public CommonResult<PageResult<TransferreceiptRequestDetailRespVO>> getTransferreceiptRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<TransferreceiptRequestDetailDO> pageResult = transferreceiptRequestDetailService.getTransferreceiptRequestDetailSenior(conditions);
+        PageResult<TransferreceiptRequestDetailRespVO> result = TransferreceiptRequestDetailConvert.INSTANCE.convertPage(pageResult);
+        for(TransferreceiptRequestDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @PutMapping("/update")
     @Operation(summary = "更新调拨入库申请子")
     @PreAuthorize("@ss.hasPermission('wms:transferreceipt-request-detail:update')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/TransferreceiptRequestMainController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.transferreceiptRequest;
 
+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.transferreceiptRequest.vo.*;
@@ -10,22 +11,16 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
-
 import javax.validation.*;
 import javax.servlet.http.*;
 import java.util.*;
 import java.io.IOException;
-
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.common.pojo.CommonResult;
 import static com.win.framework.common.pojo.CommonResult.success;
-
 import com.win.framework.excel.core.util.ExcelUtils;
-
 import com.win.framework.operatelog.core.annotations.OperateLog;
 import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-import com.win.module.wms.controller.transferreceiptRequest.vo.*;
 import com.win.module.wms.dal.dataobject.transferreceiptRequest.TransferreceiptRequestMainDO;
 import com.win.module.wms.convert.transferreceiptRequest.TransferreceiptRequestMainConvert;
 import com.win.module.wms.service.transferreceiptRequest.TransferreceiptRequestMainService;
@@ -92,6 +87,21 @@ public class TransferreceiptRequestMainController {
         return success(TransferreceiptRequestMainConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:transferreceipt-request-main:query')")
+    public CommonResult<PageResult<TransferreceiptRequestMainRespVO>> getTransferreceiptRequestMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<TransferreceiptRequestMainDO> pageResult = transferreceiptRequestMainService.getTransferreceiptRequestMainSenior(conditions);
+        PageResult<TransferreceiptRequestMainRespVO> result = TransferreceiptRequestMainConvert.INSTANCE.convertPage(pageResult);
+        for(TransferreceiptRequestMainRespVO 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:transferreceipt-request-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/UnplannedissueJobDetailController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.unplannedissueJob;
 
+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.unplannedissueJob.vo.*;
@@ -57,6 +58,19 @@ public class UnplannedissueJobDetailController {
         return success(true);
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得计划外出库任务子信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:itembasic:query')")
+    public CommonResult<PageResult<UnplannedissueJobDetailRespVO>> getUnplannedissueJobDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<UnplannedissueJobDetailDO> pageResult = unplannedissueJobDetailService.getUnplannedissueJobDetailSenior(conditions);
+        PageResult<UnplannedissueJobDetailRespVO> result = UnplannedissueJobDetailConvert.INSTANCE.convertPage(pageResult);
+        for(UnplannedissueJobDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @DeleteMapping("/delete")
     @Operation(summary = "删除计划外出库任务子")
     @Parameter(name = "id", description = "编号", required = true)

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/UnplannedissueJobMainController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.unplannedissueJob;
 
+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.unplannedissueJob.vo.*;
@@ -56,7 +57,19 @@ public class UnplannedissueJobMainController {
         unplannedissueJobMainService.updateUnplannedissueJobMain(updateReqVO);
         return success(true);
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:itembasic:query')")
+    public CommonResult<PageResult<UnplannedissueJobMainRespVO>> getUnplannedissueJobMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<UnplannedissueJobMainDO> pageResult = unplannedissueJobMainService.getUnplannedissueJobMainSenior(conditions);
+        PageResult<UnplannedissueJobMainRespVO> result = UnplannedissueJobMainConvert.INSTANCE.convertPage(pageResult);
+        for(UnplannedissueJobMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @DeleteMapping("/delete")
     @Operation(summary = "删除计划外出库任务主")
     @Parameter(name = "id", description = "编号", required = true)

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/UnplannedissueRecordDetailController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.unplannedissueRecord;
 
+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.unplannedissueRecord.vo.*;
@@ -48,7 +49,19 @@ public class UnplannedissueRecordDetailController {
     public CommonResult<Long> createUnplannedissueRecordDetail(@Valid @RequestBody UnplannedissueRecordDetailCreateReqVO createReqVO) {
         return success(unplannedissueRecordDetailService.createUnplannedissueRecordDetail(createReqVO));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:itembasic:query')")
+    public CommonResult<PageResult<UnplannedissueRecordDetailRespVO>> getUnplannedissueRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<UnplannedissueRecordDetailDO> pageResult = unplannedissueRecordDetailService.getUnplannedissueRecordDetailSenior(conditions);
+        PageResult<UnplannedissueRecordDetailRespVO> result = UnplannedissueRecordDetailConvert.INSTANCE.convertPage(pageResult);
+        for(UnplannedissueRecordDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @PutMapping("/update")
     @Operation(summary = "更新计划外出库记录子")
     @PreAuthorize("@ss.hasPermission('wms:unplannedissue-record-detail:update')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/UnplannedissueRecordMainController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.unplannedissueRecord;
 
+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.unplannedissueRecord.vo.*;
@@ -15,17 +16,12 @@ import javax.validation.*;
 import javax.servlet.http.*;
 import java.util.*;
 import java.io.IOException;
-
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.common.pojo.CommonResult;
 import static com.win.framework.common.pojo.CommonResult.success;
-
 import com.win.framework.excel.core.util.ExcelUtils;
-
 import com.win.framework.operatelog.core.annotations.OperateLog;
 import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-import com.win.module.wms.controller.unplannedissueRecord.vo.*;
 import com.win.module.wms.dal.dataobject.unplannedissueRecord.UnplannedissueRecordMainDO;
 import com.win.module.wms.convert.unplannedissueRecord.UnplannedissueRecordMainConvert;
 import com.win.module.wms.service.unplannedissueRecord.UnplannedissueRecordMainService;
@@ -91,7 +87,19 @@ public class UnplannedissueRecordMainController {
         PageResult<UnplannedissueRecordMainDO> pageResult = unplannedissueRecordMainService.getUnplannedissueRecordMainPage(pageVO);
         return success(UnplannedissueRecordMainConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:unplannedissue-record-main:query')")
+    public CommonResult<PageResult<UnplannedissueRecordMainRespVO>> getUnplannedissueRecordMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<UnplannedissueRecordMainDO> pageResult = unplannedissueRecordMainService.getUnplannedissueRecordMainSenior(conditions);
+        PageResult<UnplannedissueRecordMainRespVO> result = UnplannedissueRecordMainConvert.INSTANCE.convertPage(pageResult);
+        for(UnplannedissueRecordMainRespVO 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:unplannedissue-record-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordMainBaseVO.java

@@ -86,6 +86,7 @@ public class UnplannedissueRecordMainBaseVO {
     @NotNull(message = "创建者Id不能为空")
     private String creatorId;
 
+
     @Schema(description = "从仓库代码")
     private String fromWarehouseCode;
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordMainExcelVO.java

@@ -93,4 +93,5 @@ public class UnplannedissueRecordMainExcelVO {
     @ExcelProperty("创建者ID")
     private String creator;
 
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordMainRespVO.java

@@ -9,4 +9,7 @@ import lombok.*;
 @ToString(callSuper = true)
 public class UnplannedissueRecordMainRespVO extends UnplannedissueRecordMainBaseVO {
 
+    @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/unplannedissueRequest/UnplannedissueRequestDetailController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.unplannedissueRequest;
 
+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.unplannedissueRequest.vo.*;
@@ -83,7 +84,19 @@ public class UnplannedissueRequestDetailController {
         List<UnplannedissueRequestDetailDO> list = unplannedissueRequestDetailService.getUnplannedissueRequestDetailList(ids);
         return success(UnplannedissueRequestDetailConvert.INSTANCE.convertList(list));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:unplannedissue-request-detail:query')")
+    public CommonResult<PageResult<UnplannedissueRequestDetailRespVO>> getUnplannedissueRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<UnplannedissueRequestDetailDO> pageResult = unplannedissueRequestDetailService.getUnplannedissueRequestDetailSenior(conditions);
+        PageResult<UnplannedissueRequestDetailRespVO> result = UnplannedissueRequestDetailConvert.INSTANCE.convertPage(pageResult);
+        for(UnplannedissueRequestDetailRespVO 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:unplannedissue-request-detail:query')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/UnplannedissueRequestMainController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.unplannedissueRequest;
 
+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.unplannedissueRequest.vo.*;
@@ -24,8 +25,6 @@ import com.win.framework.excel.core.util.ExcelUtils;
 
 import com.win.framework.operatelog.core.annotations.OperateLog;
 import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-import com.win.module.wms.controller.unplannedissueRequest.vo.*;
 import com.win.module.wms.dal.dataobject.unplannedissueRequest.UnplannedissueRequestMainDO;
 import com.win.module.wms.convert.unplannedissueRequest.UnplannedissueRequestMainConvert;
 import com.win.module.wms.service.unplannedissueRequest.UnplannedissueRequestMainService;
@@ -84,6 +83,20 @@ public class UnplannedissueRequestMainController {
         return success(UnplannedissueRequestMainConvert.INSTANCE.convertList(list));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:unplannedissue-request-main:query')")
+    public CommonResult<PageResult<UnplannedissueRequestMainRespVO>> getUnplannedissueRequestMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<UnplannedissueRequestMainDO> pageResult = unplannedissueRequestMainService.getUnplannedissueRequestMainSenior(conditions);
+        PageResult<UnplannedissueRequestMainRespVO> result = UnplannedissueRequestMainConvert.INSTANCE.convertPage(pageResult);
+        for(UnplannedissueRequestMainRespVO 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:unplannedissue-request-main:query')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/UnplannedreceiptJobDetailController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.unplannedreceiptJob;
 
+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.unplannedreceiptJob.vo.*;
@@ -10,22 +11,16 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
-
 import javax.validation.*;
 import javax.servlet.http.*;
 import java.util.*;
 import java.io.IOException;
-
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.common.pojo.CommonResult;
 import static com.win.framework.common.pojo.CommonResult.success;
-
 import com.win.framework.excel.core.util.ExcelUtils;
-
 import com.win.framework.operatelog.core.annotations.OperateLog;
 import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-import com.win.module.wms.controller.unplannedreceiptJob.vo.*;
 import com.win.module.wms.dal.dataobject.unplannedreceiptJob.UnplannedreceiptJobDetailDO;
 import com.win.module.wms.convert.unplannedreceiptJob.UnplannedreceiptJobDetailConvert;
 import com.win.module.wms.service.unplannedreceiptJob.UnplannedreceiptJobDetailService;
@@ -57,6 +52,20 @@ public class UnplannedreceiptJobDetailController {
         return success(true);
     }
 
+
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:unplannedreceipt-job-detail:query')")
+    public CommonResult<PageResult<UnplannedreceiptJobDetailRespVO>> getUnplannedreceiptJobDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<UnplannedreceiptJobDetailDO> pageResult = unplannedreceiptJobDetailService.getUnplannedreceiptJobDetailSenior(conditions);
+        PageResult<UnplannedreceiptJobDetailRespVO> result = UnplannedreceiptJobDetailConvert.INSTANCE.convertPage(pageResult);
+        for(UnplannedreceiptJobDetailRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @DeleteMapping("/delete")
     @Operation(summary = "删除计划外入库任务子")
     @Parameter(name = "id", description = "编号", required = true)

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/UnplannedreceiptJobMainController.java

@@ -1,5 +1,5 @@
 package com.win.module.wms.controller.unplannedreceiptJob;
-
+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.unplannedreceiptJob.vo.*;
@@ -10,22 +10,16 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
-
 import javax.validation.*;
 import javax.servlet.http.*;
 import java.util.*;
 import java.io.IOException;
-
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.common.pojo.CommonResult;
 import static com.win.framework.common.pojo.CommonResult.success;
-
 import com.win.framework.excel.core.util.ExcelUtils;
-
 import com.win.framework.operatelog.core.annotations.OperateLog;
 import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-import com.win.module.wms.controller.unplannedreceiptJob.vo.*;
 import com.win.module.wms.dal.dataobject.unplannedreceiptJob.UnplannedreceiptJobMainDO;
 import com.win.module.wms.convert.unplannedreceiptJob.UnplannedreceiptJobMainConvert;
 import com.win.module.wms.service.unplannedreceiptJob.UnplannedreceiptJobMainService;
@@ -65,7 +59,19 @@ public class UnplannedreceiptJobMainController {
         unplannedreceiptJobMainService.deleteUnplannedreceiptJobMain(id);
         return success(true);
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:unplannedreceipt-job-main:query')")
+    public CommonResult<PageResult<UnplannedreceiptJobMainRespVO>> getUnplannedreceiptJobMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<UnplannedreceiptJobMainDO> pageResult = unplannedreceiptJobMainService.getUnplannedreceiptJobMainSenior(conditions);
+        PageResult<UnplannedreceiptJobMainRespVO> result = UnplannedreceiptJobMainConvert.INSTANCE.convertPage(pageResult);
+        for(UnplannedreceiptJobMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/get")
     @Operation(summary = "获得计划外入库任务主")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/UnplannedreceiptRecordDetailController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.unplannedreceiptRecord;
 
+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.unplannedreceiptRecord.vo.*;
@@ -10,22 +11,16 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
-
 import javax.validation.*;
 import javax.servlet.http.*;
 import java.util.*;
 import java.io.IOException;
-
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.common.pojo.CommonResult;
 import static com.win.framework.common.pojo.CommonResult.success;
-
 import com.win.framework.excel.core.util.ExcelUtils;
-
 import com.win.framework.operatelog.core.annotations.OperateLog;
 import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-import com.win.module.wms.controller.unplannedreceiptRecord.vo.*;
 import com.win.module.wms.dal.dataobject.unplannedreceiptRecord.UnplannedreceiptRecordDetailDO;
 import com.win.module.wms.convert.unplannedreceiptRecord.UnplannedreceiptRecordDetailConvert;
 import com.win.module.wms.service.unplannedreceiptRecord.UnplannedreceiptRecordDetailService;
@@ -91,7 +86,19 @@ public class UnplannedreceiptRecordDetailController {
         PageResult<UnplannedreceiptRecordDetailDO> pageResult = unplannedreceiptRecordDetailService.getUnplannedreceiptRecordDetailPage(pageVO);
         return success(UnplannedreceiptRecordDetailConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:unplannedreceiptRecordDetail:query')")
+    public CommonResult<PageResult<UnplannedreceiptRecordDetailRespVO>> getUnplannedreceiptRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<UnplannedreceiptRecordDetailDO> pageResult = unplannedreceiptRecordDetailService.getUnplannedreceiptRecordDetailSenior(conditions);
+        PageResult<UnplannedreceiptRecordDetailRespVO> result = UnplannedreceiptRecordDetailConvert.INSTANCE.convertPage(pageResult);
+        for(UnplannedreceiptRecordDetailRespVO 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:unplannedreceipt-record-detail:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/UnplannedreceiptRecordMainController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.unplannedreceiptRecord;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.unplannedreceiptRecord.vo.*;
@@ -10,22 +12,16 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
-
 import javax.validation.*;
 import javax.servlet.http.*;
 import java.util.*;
 import java.io.IOException;
-
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.common.pojo.CommonResult;
 import static com.win.framework.common.pojo.CommonResult.success;
-
 import com.win.framework.excel.core.util.ExcelUtils;
-
 import com.win.framework.operatelog.core.annotations.OperateLog;
 import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-import com.win.module.wms.controller.unplannedreceiptRecord.vo.*;
 import com.win.module.wms.dal.dataobject.unplannedreceiptRecord.UnplannedreceiptRecordMainDO;
 import com.win.module.wms.convert.unplannedreceiptRecord.UnplannedreceiptRecordMainConvert;
 import com.win.module.wms.service.unplannedreceiptRecord.UnplannedreceiptRecordMainService;
@@ -56,6 +52,7 @@ public class UnplannedreceiptRecordMainController {
         unplannedreceiptRecordMainService.updateUnplannedreceiptRecordMain(updateReqVO);
         return success(true);
     }
+    
 
     @DeleteMapping("/delete")
     @Operation(summary = "删除计划外入库记录主")
@@ -65,7 +62,19 @@ public class UnplannedreceiptRecordMainController {
         unplannedreceiptRecordMainService.deleteUnplannedreceiptRecordMain(id);
         return success(true);
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @PreAuthorize("@ss.hasPermission('wms:unplannedreceiptRecordMain:query')")
+    public CommonResult<PageResult<UnplannedreceiptRecordMainRespVO>> getUnplannedreceiptRecordMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<UnplannedreceiptRecordMainDO> pageResult = unplannedreceiptRecordMainService.getUnplannedreceiptRecordMainSenior(conditions);
+        PageResult<UnplannedreceiptRecordMainRespVO> result = UnplannedreceiptRecordMainConvert.INSTANCE.convertPage(pageResult);
+        for(UnplannedreceiptRecordMainRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return success(result);
+    }
     @GetMapping("/get")
     @Operation(summary = "获得计划外入库记录主")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")