高级搜索代码编写

win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java

@@ -435,7 +435,7 @@ public interface ErrorCodeConstants {
     //采购收货记录子ErrorCode
     ErrorCode PURCHASERECEIPT_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_074_001, "采购收货记录子不存在");
     ErrorCode PURCHASERECEIPT_RECORD_MAIN_NUMBER_NOT_EXISTS = new ErrorCode(1_000_074_002, "采购收货记录无效,number无效");
-    ErrorCode PURCHASERECEIPT_RECORD_DETAIL_PONUMBER_POLINE_ITEMCODE_INVALID = new ErrorCode(1_000_074_003, "采购收货记录明细:订单号，订单行，零件号无效");
+    ErrorCode PURCHASERECEIPT_RECORD_DETAIL_PONUMBER_NUMBER_POLINE_ITEMCODE_INVALID = new ErrorCode(1_000_074_003, "采购收货记录明细:订单号，单据号,订单行，零件号无效");
     //采购退货申请主ErrorCode
     ErrorCode PURCHASERETURN_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_075_000, "采购退货申请主不存在");
     //采购退货申请子ErrorCode

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/accountcalendar/AccountcalendarController.java

@@ -98,7 +98,7 @@ public class AccountcalendarController {
     @PostMapping("/senior")
     @Operation(summary = "高级搜索获得账期日历分页")
     @PreAuthorize("@ss.hasPermission('wms:accountcalendar:query')")
-    public CommonResult<PageResult<AccountcalendarRespVO>> getItembasicSenior(@Valid @RequestBody CustomConditions conditions) {
+    public CommonResult<PageResult<AccountcalendarRespVO>> getAccountcalendarSenior(@Valid @RequestBody CustomConditions conditions) {
         PageResult<AccountcalendarDO> pageResult = accountcalendarService.getAccountcalendarSenior(conditions);
         PageResult<AccountcalendarRespVO> result = AccountcalendarConvert.INSTANCE.convertPage(pageResult);
         for(AccountcalendarRespVO vo : result.getList()) {

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

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.container;
 
+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.container.vo.*;
@@ -91,7 +92,19 @@ public class ContainerDetailController {
         PageResult<ContainerDetailDO> pageResult = containerDetailService.getContainerDetailPage(pageVO);
         return success(ContainerDetailConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得器具子分页")
+    @PreAuthorize("@ss.hasPermission('wms:container-detail:query')")
+    public CommonResult<PageResult<ContainerDetailRespVO>> getContainerDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ContainerDetailDO> pageResult = containerDetailService.getContainerDetailSenior(conditions);
+        PageResult<ContainerDetailRespVO> result = ContainerDetailConvert.INSTANCE.convertPage(pageResult);
+        for(ContainerDetailRespVO 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:container-detail:export')")

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

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.container;
 
+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.container.vo.*;
@@ -91,7 +92,19 @@ public class ContainerMainController {
         PageResult<ContainerMainDO> pageResult = containerMainService.getContainerMainPage(pageVO);
         return success(ContainerMainConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得器具主分页")
+    @PreAuthorize("@ss.hasPermission('wms:container-main:query')")
+    public CommonResult<PageResult<ContainerMainRespVO>> getContainerMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ContainerMainDO> pageResult = containerMainService.getContainerMainSenior(conditions);
+        PageResult<ContainerMainRespVO> result = ContainerMainConvert.INSTANCE.convertPage(pageResult);
+        for(ContainerMainRespVO 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:container-main:export')")

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

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

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

@@ -3,9 +3,18 @@ package com.win.module.wms.controller.container.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
+import java.time.LocalDateTime;
+
 @Schema(description = "管理后台 - 器具主 Response VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class ContainerMainRespVO extends ContainerMainBaseVO {
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    private LocalDateTime createTime;
+
+    @Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String creator;
+
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/CountJobDetailController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.countJob;
 
+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.countJob.vo.*;
@@ -91,7 +92,19 @@ public class CountJobDetailController {
         PageResult<CountJobDetailDO> pageResult = countJobDetailService.getCountJobDetailPage(pageVO);
         return success(CountJobDetailConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得盘点任务子分页")
+    @PreAuthorize("@ss.hasPermission('wms:count-job-detail:query')")
+    public CommonResult<PageResult<CountJobDetailRespVO>> getCountJobDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<CountJobDetailDO> pageResult = countJobDetailService.getCountJobDetailSenior(conditions);
+        PageResult<CountJobDetailRespVO> result = CountJobDetailConvert.INSTANCE.convertPage(pageResult);
+        for(CountJobDetailRespVO 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:count-job-detail:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/CountJobMainController.java

@@ -1,9 +1,9 @@
 package com.win.module.wms.controller.countJob;
 
+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.countJob.vo.*;
-import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestMainExcelVO;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -92,7 +92,19 @@ public class CountJobMainController {
         PageResult<CountJobMainDO> pageResult = countJobMainService.getCountJobMainPage(pageVO);
         return success(CountJobMainConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得盘点任务主分页")
+    @PreAuthorize("@ss.hasPermission('wms:count-job-main:query')")
+    public CommonResult<PageResult<CountJobMainRespVO>> getCountJobMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<CountJobMainDO> pageResult = countJobMainService.getCountJobMainSenior(conditions);
+        PageResult<CountJobMainRespVO> result = CountJobMainConvert.INSTANCE.convertPage(pageResult);
+        for(CountJobMainRespVO 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:count-job-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/CountPlanDetailController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.countPlan;
 
+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.countPlan.vo.*;
@@ -91,7 +92,19 @@ public class CountPlanDetailController {
         PageResult<CountPlanDetailDO> pageResult = countPlanDetailService.getCountPlanDetailPage(pageVO);
         return success(CountPlanDetailConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得盘点计划子分页")
+    @PreAuthorize("@ss.hasPermission('wms:count-plan-detail:query')")
+    public CommonResult<PageResult<CountPlanDetailRespVO>> getCountPlanDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<CountPlanDetailDO> pageResult = countPlanDetailService.getCountPlanDetailSenior(conditions);
+        PageResult<CountPlanDetailRespVO> result = CountPlanDetailConvert.INSTANCE.convertPage(pageResult);
+        for(CountPlanDetailRespVO 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:count-plan-detail:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/CountPlanMainController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.countPlan;
 
+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.countJob.vo.CountJobMainExcelVO;
 import com.win.module.wms.controller.countPlan.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -92,7 +92,19 @@ public class CountPlanMainController {
         PageResult<CountPlanMainDO> pageResult = countPlanMainService.getCountPlanMainPage(pageVO);
         return success(CountPlanMainConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得盘点计划主分页")
+    @PreAuthorize("@ss.hasPermission('wms:count-plan-main:query')")
+    public CommonResult<PageResult<CountPlanMainRespVO>> getCountPlanMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<CountPlanMainDO> pageResult = countPlanMainService.getCountPlanMainSenior(conditions);
+        PageResult<CountPlanMainRespVO> result = CountPlanMainConvert.INSTANCE.convertPage(pageResult);
+        for(CountPlanMainRespVO 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:count-plan-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/CountRecordDetailController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.countRecord;
 
+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.countPlan.vo.CountPlanMainExcelVO;
 import com.win.module.wms.controller.countRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -26,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.countRecord.vo.*;
 import com.win.module.wms.dal.dataobject.countRecord.CountRecordDetailDO;
 import com.win.module.wms.convert.countRecord.CountRecordDetailConvert;
 import com.win.module.wms.service.countRecord.CountRecordDetailService;
@@ -92,7 +91,19 @@ public class CountRecordDetailController {
         PageResult<CountRecordDetailDO> pageResult = countRecordDetailService.getCountRecordDetailPage(pageVO);
         return success(CountRecordDetailConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得盘点记录子分页")
+    @PreAuthorize("@ss.hasPermission('wms:count-record-detail:query')")
+    public CommonResult<PageResult<CountRecordDetailRespVO>> getCountRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<CountRecordDetailDO> pageResult = countRecordDetailService.getCountRecordDetailSenior(conditions);
+        PageResult<CountRecordDetailRespVO> result = CountRecordDetailConvert.INSTANCE.convertPage(pageResult);
+        for(CountRecordDetailRespVO 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:count-record-detail:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/CountRecordMainController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.countRecord;
 
+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.countRecord.vo.*;
@@ -91,7 +92,19 @@ public class CountRecordMainController {
         PageResult<CountRecordMainDO> pageResult = countRecordMainService.getCountRecordMainPage(pageVO);
         return success(CountRecordMainConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得盘点记录主分页")
+    @PreAuthorize("@ss.hasPermission('wms:count-record-main:query')")
+    public CommonResult<PageResult<CountRecordMainRespVO>> getCountRecordMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<CountRecordMainDO> pageResult = countRecordMainService.getCountRecordMainSenior(conditions);
+        PageResult<CountRecordMainRespVO> result = CountRecordMainConvert.INSTANCE.convertPage(pageResult);
+        for(CountRecordMainRespVO 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:count-record-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailRespVO.java

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

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/CountRequestDetailController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.countRequest;
 
+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.countRecord.vo.CountRecordMainExcelVO;
 import com.win.module.wms.controller.countRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -93,7 +93,19 @@ public class CountRequestDetailController {
         PageResult<CountRequestDetailDO> pageResult = countRequestDetailService.getCountRequestDetailPage(pageVO);
         return success(CountRequestDetailConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得盘点申请子分页")
+    @PreAuthorize("@ss.hasPermission('wms:count-request-detail:query')")
+    public CommonResult<PageResult<CountRequestDetailRespVO>> getCountRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<CountRequestDetailDO> pageResult = countRequestDetailService.getCountRequestDetailSenior(conditions);
+        PageResult<CountRequestDetailRespVO> result = CountRequestDetailConvert.INSTANCE.convertPage(pageResult);
+        for(CountRequestDetailRespVO 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:count-request-detail:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/CountRequestMainController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.countRequest;
 
+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.countRequest.vo.*;
@@ -92,7 +93,19 @@ public class CountRequestMainController {
         PageResult<CountRequestMainDO> pageResult = countRequestMainService.getCountRequestMainPage(pageVO);
         return success(CountRequestMainConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得盘点申请主分页")
+    @PreAuthorize("@ss.hasPermission('wms:count-request-main:query')")
+    public CommonResult<PageResult<CountRequestMainRespVO>> getCountRequestMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<CountRequestMainDO> pageResult = countRequestMainService.getCountRequestMainSenior(conditions);
+        PageResult<CountRequestMainRespVO> result = CountRequestMainConvert.INSTANCE.convertPage(pageResult);
+        for(CountRequestMainRespVO 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:count-request-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/CountadjustRecordDetailController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.countadjustRecord;
 
+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.countadjustRecord.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.countadjustRecord.vo.*;
 import com.win.module.wms.dal.dataobject.countadjustRecord.CountadjustRecordDetailDO;
 import com.win.module.wms.convert.countadjustRecord.CountadjustRecordDetailConvert;
 import com.win.module.wms.service.countadjustRecord.CountadjustRecordDetailService;
@@ -91,7 +91,19 @@ public class CountadjustRecordDetailController {
         PageResult<CountadjustRecordDetailDO> pageResult = countadjustRecordDetailService.getCountadjustRecordDetailPage(pageVO);
         return success(CountadjustRecordDetailConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得盘点调整记录子分页")
+    @PreAuthorize("@ss.hasPermission('wms:countadjust-record-detail:query')")
+    public CommonResult<PageResult<CountadjustRecordDetailRespVO>> getCountadjustRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<CountadjustRecordDetailDO> pageResult = countadjustRecordDetailService.getCountadjustRecordDetailSenior(conditions);
+        PageResult<CountadjustRecordDetailRespVO> result = CountadjustRecordDetailConvert.INSTANCE.convertPage(pageResult);
+        for(CountadjustRecordDetailRespVO 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:countadjust-record-detail:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/CountadjustRecordMainController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.countadjustRecord;
 
+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.container.vo.ContainerMainExcelVO;
 import com.win.module.wms.controller.countadjustRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -92,7 +92,19 @@ public class CountadjustRecordMainController {
         PageResult<CountadjustRecordMainDO> pageResult = countadjustRecordMainService.getCountadjustRecordMainPage(pageVO);
         return success(CountadjustRecordMainConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得盘点调整记录主分页")
+    @PreAuthorize("@ss.hasPermission('wms:countadjust-record-main:query')")
+    public CommonResult<PageResult<CountadjustRecordMainRespVO>> getItembasicSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<CountadjustRecordMainDO> pageResult = countadjustRecordMainService.getCountadjustRecordMainSenior(conditions);
+        PageResult<CountadjustRecordMainRespVO> result = CountadjustRecordMainConvert.INSTANCE.convertPage(pageResult);
+        for(CountadjustRecordMainRespVO 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:countadjust-record-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/CountadjustRequestMainController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.countadjustRequest;
 
+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.countadjustRecord.vo.CountadjustRecordMainExcelVO;
 import com.win.module.wms.controller.countadjustRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -92,7 +92,19 @@ public class CountadjustRequestMainController {
         PageResult<CountadjustRequestMainDO> pageResult = countadjustRequestMainService.getCountadjustRequestMainPage(pageVO);
         return success(CountadjustRequestMainConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得盘点调整申请主分页")
+    @PreAuthorize("@ss.hasPermission('wms:countadjust-request-main:query')")
+    public CommonResult<PageResult<CountadjustRequestMainRespVO>> getCountadjustRequestMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<CountadjustRequestMainDO> pageResult = countadjustRequestMainService.getCountadjustRequestMainSenior(conditions);
+        PageResult<CountadjustRequestMainRespVO> result = CountadjustRequestMainConvert.INSTANCE.convertPage(pageResult);
+        for(CountadjustRequestMainRespVO 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:countadjust-request-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/currencyexchange/CurrencyexchangeController.java

@@ -1,13 +1,13 @@
 package com.win.module.wms.controller.currencyexchange;
 
 import com.win.framework.common.pojo.CommonResult;
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.dict.core.util.DictFrameworkUtils;
 import com.win.framework.excel.core.util.ExcelUtils;
 import com.win.framework.operatelog.core.annotations.OperateLog;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.countRequest.vo.CountRequestMainExcelVO;
 import com.win.module.wms.controller.currencyexchange.vo.*;
 import com.win.module.wms.convert.currencyexchange.CurrencyexchangeConvert;
 import com.win.module.wms.dal.dataobject.currencyexchange.CurrencyexchangeDO;
@@ -94,7 +94,19 @@ public class CurrencyexchangeController {
         PageResult<CurrencyexchangeDO> pageResult = currencyexchangeService.getCurrencyexchangePage(pageVO);
         return success(CurrencyexchangeConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得货币转换分页")
+    @PreAuthorize("@ss.hasPermission('wms:currencyexchange:query')")
+    public CommonResult<PageResult<CurrencyexchangeRespVO>> getCurrencyexchangeSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<CurrencyexchangeDO> pageResult = currencyexchangeService.getCurrencyexchangeSenior(conditions);
+        PageResult<CurrencyexchangeRespVO> result = CurrencyexchangeConvert.INSTANCE.convertPage(pageResult);
+        for(CurrencyexchangeRespVO 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:currencyexchange:export')")
@@ -108,8 +120,12 @@ public class CurrencyexchangeController {
             AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
             //后端创建个字段作为前端展示的虚拟字段
             vo.setCreator(user.getNickname());
-        }
+        } Map<Integer, String[]> mapDropDown = new HashMap<>();
-        ExcelUtils.write(response, "货币转换.xls", "数据", CurrencyexchangeExcelVO.class, datas);
+        String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY);
+        mapDropDown.put(0, currency);
+        String[] isRequired = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
+        mapDropDown.put(3, isRequired);
+        ExcelUtils.write(response, "货币转换.xls", "数据", CurrencyexchangeExcelVO.class, datas,mapDropDown);
     }
     @GetMapping("/get-import-template")
     @Operation(summary = "获得导入货币转换模板")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customer/CustomerController.java

@@ -1,13 +1,13 @@
 package com.win.module.wms.controller.customer;
 
 import com.win.framework.common.pojo.CommonResult;
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.dict.core.util.DictFrameworkUtils;
 import com.win.framework.excel.core.util.ExcelUtils;
 import com.win.framework.operatelog.core.annotations.OperateLog;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.currencyexchange.vo.CurrencyexchangeExcelVO;
 import com.win.module.wms.controller.customer.vo.CustomerImportExcelVo;
 import com.win.module.wms.controller.customer.vo.*;
 import com.win.module.wms.convert.customer.CustomerConvert;
@@ -94,7 +94,19 @@ public class CustomerController {
         PageResult<CustomerDO> pageResult = customerService.getCustomerPage(pageVO);
         return success(CustomerConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得客户分页")
+    @PreAuthorize("@ss.hasPermission('wms:customer:query')")
+    public CommonResult<PageResult<CustomerRespVO>> getCustomerSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<CustomerDO> pageResult = customerService.getCustomerSenior(conditions);
+        PageResult<CustomerRespVO> result = CustomerConvert.INSTANCE.convertPage(pageResult);
+        for(CustomerRespVO 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:customer:export')")
@@ -109,7 +121,14 @@ public class CustomerController {
             //后端创建个字段作为前端展示的虚拟字段
             vo.setCreator(user.getNickname());
         }
-        ExcelUtils.write(response, "客户.xls", "数据", CustomerExcelVO.class, datas);
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY);
+        mapDropDown.put(11, currency);
+        String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CUSTOMER_TYPE);
+        mapDropDown.put(13, type);
+        String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
+        mapDropDown.put(14, available);
+        ExcelUtils.write(response, "客户.xls", "数据", CustomerExcelVO.class, datas,mapDropDown);
     }
     @GetMapping("/get-import-template")
     @Operation(summary = "获得导入客户模板")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerdock/CustomerdockController.java

@@ -1,14 +1,13 @@
 package com.win.module.wms.controller.customerdock;
 
 import com.win.framework.common.pojo.CommonResult;
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.dict.core.util.DictFrameworkUtils;
 import com.win.framework.excel.core.util.ExcelUtils;
 import com.win.framework.operatelog.core.annotations.OperateLog;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.customer.vo.CustomerExcelVO;
-import com.win.module.wms.controller.customer.vo.CustomerImportExcelVo;
 import com.win.module.wms.controller.customerdock.vo.*;
 import com.win.module.wms.convert.customerdock.CustomerdockConvert;
 import com.win.module.wms.dal.dataobject.customerdock.CustomerdockDO;
@@ -95,7 +94,19 @@ public class CustomerdockController {
         PageResult<CustomerdockDO> pageResult = customerdockService.getCustomerdockPage(pageVO);
         return success(CustomerdockConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得客户月台分页")
+    @PreAuthorize("@ss.hasPermission('wms:customerdock:query')")
+    public CommonResult<PageResult<CustomerdockRespVO>> getCustomerdockSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<CustomerdockDO> pageResult = customerdockService.getCustomerdockSenior(conditions);
+        PageResult<CustomerdockRespVO> result = CustomerdockConvert.INSTANCE.convertPage(pageResult);
+        for(CustomerdockRespVO 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:customerdock:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/CustomeritemController.java

@@ -1,13 +1,13 @@
 package com.win.module.wms.controller.customeritem;
 
 import com.win.framework.common.pojo.CommonResult;
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.dict.core.util.DictFrameworkUtils;
 import com.win.framework.excel.core.util.ExcelUtils;
 import com.win.framework.operatelog.core.annotations.OperateLog;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.customerdock.vo.CustomerdockExcelVO;
 import com.win.module.wms.controller.customeritem.vo.*;
 import com.win.module.wms.convert.customeritem.CustomeritemConvert;
 import com.win.module.wms.dal.dataobject.customeritem.CustomeritemDO;
@@ -94,7 +94,19 @@ public class CustomeritemController {
         PageResult<CustomeritemDO> pageResult = customeritemService.getCustomeritemPage(pageVO);
         return success(CustomeritemConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得客户物品分页")
+    @PreAuthorize("@ss.hasPermission('wms:customeritem:query')")
+    public CommonResult<PageResult<CustomeritemRespVO>> getCustomeritemSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<CustomeritemDO> pageResult = customeritemService.getCustomeritemSenior(conditions);
+        PageResult<CustomeritemRespVO> result = CustomeritemConvert.INSTANCE.convertPage(pageResult);
+        for(CustomeritemRespVO 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:customeritem:export')")
@@ -109,7 +121,16 @@ public class CustomeritemController {
             //后端创建个字段作为前端展示的虚拟字段
             vo.setCreator(user.getNickname());
         }
-        ExcelUtils.write(response, "客户物品.xls", "数据", CustomeritemExcelVO.class, datas);
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        String[] cusotmerUom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
+        mapDropDown.put(3, cusotmerUom);
+        String[] packUnit = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PACK_UNIT);
+        mapDropDown.put(5, packUnit);
+        String[] altPackUnit = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PACK_UNIT);
+        mapDropDown.put(7, altPackUnit);
+        String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
+        mapDropDown.put(10, available);
+        ExcelUtils.write(response, "客户物品.xls", "数据", CustomeritemExcelVO.class, datas,mapDropDown);
     }
 
     @GetMapping("/get-import-template")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/CustomerreceiptRecordDetailController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.customerreceiptRecord;
 
+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.customeritem.vo.CustomeritemExcelVO;
 import com.win.module.wms.controller.customerreceiptRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -92,7 +92,19 @@ public class CustomerreceiptRecordDetailController {
         PageResult<CustomerreceiptRecordDetailDO> pageResult = customerreceiptRecordDetailService.getCustomerreceiptRecordDetailPage(pageVO);
         return success(CustomerreceiptRecordDetailConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得账期日历分页")
+    @PreAuthorize("@ss.hasPermission('wms:customerreceipt-record-detail:query')")
+    public CommonResult<PageResult<CustomerreceiptRecordDetailRespVO>> getCustomerreceiptRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<CustomerreceiptRecordDetailDO> pageResult = customerreceiptRecordDetailService.getCustomerreceiptRecordDetailSenior(conditions);
+        PageResult<CustomerreceiptRecordDetailRespVO> result = CustomerreceiptRecordDetailConvert.INSTANCE.convertPage(pageResult);
+        for(CustomerreceiptRecordDetailRespVO 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:customerreceipt-record-detail:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/CustomerreceiptRecordMainController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.customerreceiptRecord;
 
+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.customerreceiptRecord.vo.*;
@@ -90,7 +91,19 @@ public class CustomerreceiptRecordMainController {
         PageResult<CustomerreceiptRecordMainDO> pageResult = customerreceiptRecordMainService.getCustomerreceiptRecordMainPage(pageVO);
         return success(CustomerreceiptRecordMainConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得客户收货记录主分页")
+    @PreAuthorize("@ss.hasPermission('wms:customerreceipt-record-main:query')")
+    public CommonResult<PageResult<CustomerreceiptRecordMainRespVO>> getCustomerreceiptRecordMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<CustomerreceiptRecordMainDO> pageResult = customerreceiptRecordMainService.getCustomerreceiptRecordMainSenior(conditions);
+        PageResult<CustomerreceiptRecordMainRespVO> result = CustomerreceiptRecordMainConvert.INSTANCE.convertPage(pageResult);
+        for(CustomerreceiptRecordMainRespVO 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:customerreceipt-record-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/CustomerreceiptRequestDetailController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.customerreceiptRequest;
 
+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.customerreceiptRecord.vo.CustomerreceiptRecordDetailExcelVO;
 import com.win.module.wms.controller.customerreceiptRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -92,7 +92,19 @@ public class CustomerreceiptRequestDetailController {
         PageResult<CustomerreceiptRequestDetailDO> pageResult = customerreceiptRequestDetailService.getCustomerreceiptRequestDetailPage(pageVO);
         return success(CustomerreceiptRequestDetailConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得客户收货申请子分页")
+    @PreAuthorize("@ss.hasPermission('wms:customerreceipt-request-detail:query')")
+    public CommonResult<PageResult<CustomerreceiptRequestDetailRespVO>> getCustomerreceiptRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<CustomerreceiptRequestDetailDO> pageResult = customerreceiptRequestDetailService.getCustomerreceiptRequestDetailSenior(conditions);
+        PageResult<CustomerreceiptRequestDetailRespVO> result = CustomerreceiptRequestDetailConvert.INSTANCE.convertPage(pageResult);
+        for(CustomerreceiptRequestDetailRespVO 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:customerreceipt-request-detail:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/CustomerreceiptRequestMainController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.customerreceiptRequest;
 
+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.customerreceiptRequest.vo.*;
@@ -91,7 +92,19 @@ public class CustomerreceiptRequestMainController {
         PageResult<CustomerreceiptRequestMainDO> pageResult = customerreceiptRequestMainService.getCustomerreceiptRequestMainPage(pageVO);
         return success(CustomerreceiptRequestMainConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得客户收货申请主分页")
+    @PreAuthorize("@ss.hasPermission('wms:customerreceipt-request-main:query')")
+    public CommonResult<PageResult<CustomerreceiptRequestMainRespVO>> getCustomerreceiptRequestMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<CustomerreceiptRequestMainDO> pageResult = customerreceiptRequestMainService.getCustomerreceiptRequestMainSenior(conditions);
+        PageResult<CustomerreceiptRequestMainRespVO> result = CustomerreceiptRequestMainConvert.INSTANCE.convertPage(pageResult);
+        for(CustomerreceiptRequestMainRespVO 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:customerreceipt-request-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobDetailController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.customerreturnJob;
 
+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.customerreceiptRequest.vo.CustomerreceiptRequestMainExcelVO;
 import com.win.module.wms.controller.customerreturnJob.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -92,7 +92,19 @@ public class CustomerreturnJobDetailController {
         PageResult<CustomerreturnJobDetailDO> pageResult = customerreturnJobDetailService.getCustomerreturnJobDetailPage(pageVO);
         return success(CustomerreturnJobDetailConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得客户退货任务子分页")
+    @PreAuthorize("@ss.hasPermission('wms:customerreturn-job-detail:query')")
+    public CommonResult<PageResult<CustomerreturnJobDetailRespVO>> getCustomerreturnJobDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<CustomerreturnJobDetailDO> pageResult = customerreturnJobDetailService.getCustomerreturnJobDetailSenior(conditions);
+        PageResult<CustomerreturnJobDetailRespVO> result = CustomerreturnJobDetailConvert.INSTANCE.convertPage(pageResult);
+        for(CustomerreturnJobDetailRespVO 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:customerreturn-job-detail:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobMainController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.customerreturnJob;
 
+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.customerreturnJob.vo.*;
@@ -92,6 +93,19 @@ public class CustomerreturnJobMainController {
         return success(CustomerreturnJobMainConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得客户退货任务主分页")
+    @PreAuthorize("@ss.hasPermission('wms:customerreturn-job-main:query')")
+    public CommonResult<PageResult<CustomerreturnJobMainRespVO>> getCustomerreturnJobMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<CustomerreturnJobMainDO> pageResult = customerreturnJobMainService.getCustomerreturnJobMainSenior(conditions);
+        PageResult<CustomerreturnJobMainRespVO> result = CustomerreturnJobMainConvert.INSTANCE.convertPage(pageResult);
+        for(CustomerreturnJobMainRespVO 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:customerreturn-job-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/CustomerreturnRecordDetailController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.customerreturnRecord;
 
+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.customerreturnJob.vo.CustomerreturnJobMainExcelVO;
 import com.win.module.wms.controller.customerreturnRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -92,7 +92,19 @@ public class CustomerreturnRecordDetailController {
         PageResult<CustomerreturnRecordDetailDO> pageResult = customerreturnRecordDetailService.getCustomerreturnRecordDetailPage(pageVO);
         return success(CustomerreturnRecordDetailConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得客户退货记录子分页")
+    @PreAuthorize("@ss.hasPermission('wms:customerreturn-record-detail:query')")
+    public CommonResult<PageResult<CustomerreturnRecordDetailRespVO>> getCustomerreturnRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<CustomerreturnRecordDetailDO> pageResult = customerreturnRecordDetailService.getCustomerreturnRecordDetailSenior(conditions);
+        PageResult<CustomerreturnRecordDetailRespVO> result = CustomerreturnRecordDetailConvert.INSTANCE.convertPage(pageResult);
+        for(CustomerreturnRecordDetailRespVO 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:customerreturn-record-detail:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/CustomerreturnRecordMainController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.customerreturnRecord;
 
+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.customerreturnRecord.vo.*;
@@ -91,7 +92,19 @@ public class CustomerreturnRecordMainController {
         PageResult<CustomerreturnRecordMainDO> pageResult = customerreturnRecordMainService.getCustomerreturnRecordMainPage(pageVO);
         return success(CustomerreturnRecordMainConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得客户退货记录主分页")
+    @PreAuthorize("@ss.hasPermission('wms:accountcalendar:query')")
+    public CommonResult<PageResult<CustomerreturnRecordMainRespVO>> getCustomerreturnRecordMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<CustomerreturnRecordMainDO> pageResult = customerreturnRecordMainService.getCustomerreturnRecordMainSenior(conditions);
+        PageResult<CustomerreturnRecordMainRespVO> result = CustomerreturnRecordMainConvert.INSTANCE.convertPage(pageResult);
+        for(CustomerreturnRecordMainRespVO 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:customerreturn-record-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordMainRespVO.java

@@ -3,10 +3,18 @@ package com.win.module.wms.controller.customerreturnRecord.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
+import java.time.LocalDateTime;
+
 @Schema(description = "管理后台 - 客户退货记录主 Response VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class CustomerreturnRecordMainRespVO extends CustomerreturnRecordMainBaseVO {
 
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    private LocalDateTime createTime;
+
+    @Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String creator;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/CustomerreturnRequestDetailController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.customerreturnRequest;
 
+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.customerreturnRecord.vo.CustomerreturnRecordMainExcelVO;
 import com.win.module.wms.controller.customerreturnRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -92,7 +92,19 @@ public class CustomerreturnRequestDetailController {
         PageResult<CustomerreturnRequestDetailDO> pageResult = customerreturnRequestDetailService.getCustomerreturnRequestDetailPage(pageVO);
         return success(CustomerreturnRequestDetailConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得客户退货申请子分页")
+    @PreAuthorize("@ss.hasPermission('wms:customerreturn-request-detail:query')")
+    public CommonResult<PageResult<CustomerreturnRequestDetailRespVO>> getCustomerreturnRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<CustomerreturnRequestDetailDO> pageResult = customerreturnRequestDetailService.getCustomerreturnRequestDetailSenior(conditions);
+        PageResult<CustomerreturnRequestDetailRespVO> result = CustomerreturnRequestDetailConvert.INSTANCE.convertPage(pageResult);
+        for(CustomerreturnRequestDetailRespVO 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:customerreturn-request-detail:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/CustomerreturnRequestMainController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.customerreturnRequest;
 
+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.customerreturnRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -91,7 +91,19 @@ public class CustomerreturnRequestMainController {
         PageResult<CustomerreturnRequestMainDO> pageResult = customerreturnRequestMainService.getCustomerreturnRequestMainPage(pageVO);
         return success(CustomerreturnRequestMainConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得客户退货申请主分页")
+    @PreAuthorize("@ss.hasPermission('wms:customerreturn-request-main:query')")
+    public CommonResult<PageResult<CustomerreturnRequestMainRespVO>> getCustomerreturnRequestMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<CustomerreturnRequestMainDO> pageResult = customerreturnRequestMainService.getCustomerreturnRequestMainSenior(conditions);
+        PageResult<CustomerreturnRequestMainRespVO> result = CustomerreturnRequestMainConvert.INSTANCE.convertPage(pageResult);
+        for(CustomerreturnRequestMainRespVO 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:customerreturn-request-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/CustomersettleRecordDetailController.java

@@ -1,9 +1,8 @@
 package com.win.module.wms.controller.customersettleRecord;
 
+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.customerreturnRequest.vo.CustomerreturnRequestMainExcelVO;
-import com.win.module.wms.controller.customersettleRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -92,7 +91,19 @@ public class CustomersettleRecordDetailController {
         PageResult<CustomersettleRecordDetailDO> pageResult = customersettleRecordDetailService.getCustomersettleRecordDetailPage(pageVO);
         return success(CustomersettleRecordDetailConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得客户结算记录子分页")
+    @PreAuthorize("@ss.hasPermission('wms:customersettle-record-detail:query')")
+    public CommonResult<PageResult<CustomersettleRecordDetailRespVO>> getCustomersettleRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<CustomersettleRecordDetailDO> pageResult = customersettleRecordDetailService.getCustomersettleRecordDetailSenior(conditions);
+        PageResult<CustomersettleRecordDetailRespVO> result = CustomersettleRecordDetailConvert.INSTANCE.convertPage(pageResult);
+        for(CustomersettleRecordDetailRespVO 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:customersettle-record-detail:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/CustomersettleRecordMainController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.customersettleRecord;
 
+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.customersettleRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -90,7 +90,19 @@ public class CustomersettleRecordMainController {
         PageResult<CustomersettleRecordMainDO> pageResult = customersettleRecordMainService.getCustomersettleRecordMainPage(pageVO);
         return success(CustomersettleRecordMainConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得客户结算记录主分页")
+    @PreAuthorize("@ss.hasPermission('wms:customersettle-record-main:query')")
+    public CommonResult<PageResult<CustomersettleRecordMainRespVO>> getCustomersettleRecordMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<CustomersettleRecordMainDO> pageResult = customersettleRecordMainService.getCustomersettleRecordMainSenior(conditions);
+        PageResult<CustomersettleRecordMainRespVO> result = CustomersettleRecordMainConvert.INSTANCE.convertPage(pageResult);
+        for(CustomersettleRecordMainRespVO 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:customersettle-record-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/CustomersettleRequestDetailController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.customersettleRequest;
 
+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.customersettleRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -91,7 +91,19 @@ public class CustomersettleRequestDetailController {
         PageResult<CustomersettleRequestDetailDO> pageResult = customersettleRequestDetailService.getCustomersettleRequestDetailPage(pageVO);
         return success(CustomersettleRequestDetailConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得客户结算申请子分页")
+    @PreAuthorize("@ss.hasPermission('wms:customersettle-request-detail:query')")
+    public CommonResult<PageResult<CustomersettleRequestDetailRespVO>> getCustomersettleRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<CustomersettleRequestDetailDO> pageResult = customersettleRequestDetailService.getCustomersettleRequestDetailSenior(conditions);
+        PageResult<CustomersettleRequestDetailRespVO> result = CustomersettleRequestDetailConvert.INSTANCE.convertPage(pageResult);
+        for(CustomersettleRequestDetailRespVO 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:customersettle-request-detail:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/CustomersettleRequestMainController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.customersettleRequest;
 
+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.customersettleRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -90,7 +90,19 @@ public class CustomersettleRequestMainController {
         PageResult<CustomersettleRequestMainDO> pageResult = customersettleRequestMainService.getCustomersettleRequestMainPage(pageVO);
         return success(CustomersettleRequestMainConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得客户结算申请主分页")
+    @PreAuthorize("@ss.hasPermission('wms:customersettle-request-main:query')")
+    public CommonResult<PageResult<CustomersettleRequestMainRespVO>> getCustomersettleRequestMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<CustomersettleRequestMainDO> pageResult = customersettleRequestMainService.getCustomersettleRequestMainSenior(conditions);
+        PageResult<CustomersettleRequestMainRespVO> result = CustomersettleRequestMainConvert.INSTANCE.convertPage(pageResult);
+        for(CustomersettleRequestMainRespVO 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:customersettle-request-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/DeliverJobDetailController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.deliverJob;
 
+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.deliverJob.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -91,7 +91,19 @@ public class DeliverJobDetailController {
         PageResult<DeliverJobDetailDO> pageResult = deliverJobDetailService.getDeliverJobDetailPage(pageVO);
         return success(DeliverJobDetailConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得发货任务子分页")
+    @PreAuthorize("@ss.hasPermission('wms:deliver-job-detail:query')")
+    public CommonResult<PageResult<DeliverJobDetailRespVO>> getDeliverJobDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<DeliverJobDetailDO> pageResult = deliverJobDetailService.getDeliverJobDetailSenior(conditions);
+        PageResult<DeliverJobDetailRespVO> result = DeliverJobDetailConvert.INSTANCE.convertPage(pageResult);
+        for(DeliverJobDetailRespVO 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:deliver-job-detail:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/DeliverJobMainController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.deliverJob;
 
+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.deliverJob.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -91,7 +91,19 @@ public class DeliverJobMainController {
         PageResult<DeliverJobMainDO> pageResult = deliverJobMainService.getDeliverJobMainPage(pageVO);
         return success(DeliverJobMainConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得发货任务主分页")
+    @PreAuthorize("@ss.hasPermission('wms:deliver-job-main:query')")
+    public CommonResult<PageResult<DeliverJobMainRespVO>> getDeliverJobMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<DeliverJobMainDO> pageResult = deliverJobMainService.getDeliverJobMainSenior(conditions);
+        PageResult<DeliverJobMainRespVO> result = DeliverJobMainConvert.INSTANCE.convertPage(pageResult);
+        for(DeliverJobMainRespVO 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:deliver-job-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/DeliverPlanDetailController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.deliverPlan;
 
+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.deliverPlan.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -91,7 +91,19 @@ public class DeliverPlanDetailController {
         PageResult<DeliverPlanDetailDO> pageResult = deliverPlanDetailService.getDeliverPlanDetailPage(pageVO);
         return success(DeliverPlanDetailConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得发货计划子分页")
+    @PreAuthorize("@ss.hasPermission('wms:deliver-plan-detail:query')")
+    public CommonResult<PageResult<DeliverPlanDetailRespVO>> getDeliverPlanDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<DeliverPlanDetailDO> pageResult = deliverPlanDetailService.getDeliverPlanDetailSenior(conditions);
+        PageResult<DeliverPlanDetailRespVO> result = DeliverPlanDetailConvert.INSTANCE.convertPage(pageResult);
+        for(DeliverPlanDetailRespVO 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:deliver-plan-detail:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/DeliverPlanMainController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.deliverPlan;
 
+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.deliverPlan.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -90,7 +90,19 @@ public class DeliverPlanMainController {
         PageResult<DeliverPlanMainDO> pageResult = deliverPlanMainService.getDeliverPlanMainPage(pageVO);
         return success(DeliverPlanMainConvert.INSTANCE.convertPage(pageResult));
     }
-
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得发货计划主分页")
+    @PreAuthorize("@ss.hasPermission('wms:wms:deliver-plan-main:query')")
+    public CommonResult<PageResult<DeliverPlanMainRespVO>> getDeliverPlanMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<DeliverPlanMainDO> pageResult = deliverPlanMainService.getDeliverPlanMainSenior(conditions);
+        PageResult<DeliverPlanMainRespVO> result = DeliverPlanMainConvert.INSTANCE.convertPage(pageResult);
+        for(DeliverPlanMainRespVO 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:deliver-plan-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/DeliverRecordDetailController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.deliverRecord;
 
+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.deliverRecord.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.deliverRecord.vo.*;
 import com.win.module.wms.dal.dataobject.deliverRecord.DeliverRecordDetailDO;
 import com.win.module.wms.convert.deliverRecord.DeliverRecordDetailConvert;
 import com.win.module.wms.service.deliverRecord.DeliverRecordDetailService;
@@ -91,6 +90,20 @@ public class DeliverRecordDetailController {
         return success(DeliverRecordDetailConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得发货记录子分页")
+    @PreAuthorize("@ss.hasPermission('wms:deliver-record-detail:query')")
+    public CommonResult<PageResult<DeliverRecordDetailRespVO>> getDeliverRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<DeliverRecordDetailDO> pageResult = deliverRecordDetailService.getDeliverRecordDetailSenior(conditions);
+        PageResult<DeliverRecordDetailRespVO> result = DeliverRecordDetailConvert.INSTANCE.convertPage(pageResult);
+        for(DeliverRecordDetailRespVO 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:deliver-record-detail:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/DeliverRecordMainController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.deliverRecord;
 
+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.deliverRecord.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.deliverRecord.vo.*;
 import com.win.module.wms.dal.dataobject.deliverRecord.DeliverRecordMainDO;
 import com.win.module.wms.convert.deliverRecord.DeliverRecordMainConvert;
 import com.win.module.wms.service.deliverRecord.DeliverRecordMainService;
@@ -92,6 +92,19 @@ public class DeliverRecordMainController {
         return success(DeliverRecordMainConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得发货记录主分页")
+    @PreAuthorize("@ss.hasPermission('wms:deliver-record-main:query')")
+    public CommonResult<PageResult<DeliverRecordMainRespVO>> getDeliverRecordMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<DeliverRecordMainDO> pageResult = deliverRecordMainService.getDeliverRecordMainSenior(conditions);
+        PageResult<DeliverRecordMainRespVO> result = DeliverRecordMainConvert.INSTANCE.convertPage(pageResult);
+        for(DeliverRecordMainRespVO 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:deliver-record-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/DeliverRequestDetailController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.deliverRequest;
 
+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.deliverRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -92,6 +92,20 @@ public class DeliverRequestDetailController {
         return success(DeliverRequestDetailConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得发货申请子分页")
+    @PreAuthorize("@ss.hasPermission('wms:deliver-request-detail:query')")
+    public CommonResult<PageResult<DeliverRequestDetailRespVO>> getDeliverRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<DeliverRequestDetailDO> pageResult = deliverRequestDetailService.getDeliverRequestDetailSenior(conditions);
+        PageResult<DeliverRequestDetailRespVO> result = DeliverRequestDetailConvert.INSTANCE.convertPage(pageResult);
+        for(DeliverRequestDetailRespVO 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:deliver-request-detail:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/DeliverRequestMainController.java

@@ -1,8 +1,8 @@
 package com.win.module.wms.controller.deliverRequest;
 
+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.deliverRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -92,6 +92,19 @@ public class DeliverRequestMainController {
         return success(DeliverRequestMainConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得发货申请主分页")
+    @PreAuthorize("@ss.hasPermission('wms:deliver-request-main:query')")
+    public CommonResult<PageResult<DeliverRequestMainRespVO>> getDeliverRequestMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<DeliverRequestMainDO> pageResult = deliverRequestMainService.getDeliverRequestMainSenior(conditions);
+        PageResult<DeliverRequestMainRespVO> result = DeliverRequestMainConvert.INSTANCE.convertPage(pageResult);
+        for(DeliverRequestMainRespVO 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:deliver-request-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/DemandforecastingDetailController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.demandforecasting;
 
+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.demandforecasting.vo.*;
@@ -92,6 +93,19 @@ public class DemandforecastingDetailController {
         return success(DemandforecastingDetailConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得要货预测子分页")
+    @PreAuthorize("@ss.hasPermission('wms:demandforecasting-detail:query')")
+    public CommonResult<PageResult<DemandforecastingDetailRespVO>> getDemandforecastingDetailSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<DemandforecastingDetailDO> pageResult = demandforecastingDetailService.getDemandforecastingDetailSenior(conditions);
+        PageResult<DemandforecastingDetailRespVO> result = DemandforecastingDetailConvert.INSTANCE.convertPage(pageResult);
+        for(DemandforecastingDetailRespVO 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:demandforecasting-detail:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/DemandforecastingMainController.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.demandforecasting;
 
+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.demandforecasting.vo.*;
@@ -91,6 +92,19 @@ public class DemandforecastingMainController {
         return success(DemandforecastingMainConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得要货预测主分页")
+    @PreAuthorize("@ss.hasPermission('wms:demandforecasting-main:query')")
+    public CommonResult<PageResult<DemandforecastingMainRespVO>> getDemandforecastingMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<DemandforecastingMainDO> pageResult = demandforecastingMainService.getDemandforecastingMainSenior(conditions);
+        PageResult<DemandforecastingMainRespVO> result = DemandforecastingMainConvert.INSTANCE.convertPage(pageResult);
+        for(DemandforecastingMainRespVO 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:demandforecasting-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/DismantleRecordDetailbController.java

@@ -1,112 +0,0 @@
-package com.win.module.wms.controller.dismantleRecord;
-
-import com.win.module.system.api.user.AdminUserApi;
-import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.dismantleRecord.vo.*;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import 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.dismantleRecord.vo.*;
-import com.win.module.wms.dal.dataobject.dismantleRecord.DismantleRecordDetailbDO;
-import com.win.module.wms.convert.dismantleRecord.DismantleRecordDetailbConvert;
-import com.win.module.wms.service.dismantleRecord.DismantleRecordDetailbService;
-
-@Tag(name = "管理后台 - 制品拆解记录子")
-@RestController
-@RequestMapping("/wms/dismantle-record-detailb")
-@Validated
-public class DismantleRecordDetailbController {
-
-    @Resource
-    private DismantleRecordDetailbService dismantleRecordDetailbService;
-
-    @Resource
-    private AdminUserApi userApi;
-
-    @PostMapping("/create")
-    @Operation(summary = "创建制品拆解记录子")
-    @PreAuthorize("@ss.hasPermission('wms:dismantle-record-detailb:create')")
-    public CommonResult<Long> createDismantleRecordDetailb(@Valid @RequestBody DismantleRecordDetailbCreateReqVO createReqVO) {
-        return success(dismantleRecordDetailbService.createDismantleRecordDetailb(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新制品拆解记录子")
-    @PreAuthorize("@ss.hasPermission('wms:dismantle-record-detailb:update')")
-    public CommonResult<Boolean> updateDismantleRecordDetailb(@Valid @RequestBody DismantleRecordDetailbUpdateReqVO updateReqVO) {
-        dismantleRecordDetailbService.updateDismantleRecordDetailb(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除制品拆解记录子")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('wms:dismantle-record-detailb:delete')")
-    public CommonResult<Boolean> deleteDismantleRecordDetailb(@RequestParam("id") Long id) {
-        dismantleRecordDetailbService.deleteDismantleRecordDetailb(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "获得制品拆解记录子")
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('wms:dismantle-record-detailb:query')")
-    public CommonResult<DismantleRecordDetailbRespVO> getDismantleRecordDetailb(@RequestParam("id") Long id) {
-        DismantleRecordDetailbDO dismantleRecordDetailb = dismantleRecordDetailbService.getDismantleRecordDetailb(id);
-        return success(DismantleRecordDetailbConvert.INSTANCE.convert(dismantleRecordDetailb));
-    }
-
-    @GetMapping("/list")
-    @Operation(summary = "获得制品拆解记录子列表")
-    @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
-    @PreAuthorize("@ss.hasPermission('wms:dismantle-record-detailb:query')")
-    public CommonResult<List<DismantleRecordDetailbRespVO>> getDismantleRecordDetailbList(@RequestParam("ids") Collection<Long> ids) {
-        List<DismantleRecordDetailbDO> list = dismantleRecordDetailbService.getDismantleRecordDetailbList(ids);
-        return success(DismantleRecordDetailbConvert.INSTANCE.convertList(list));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得制品拆解记录子分页")
-    @PreAuthorize("@ss.hasPermission('wms:dismantle-record-detailb:query')")
-    public CommonResult<PageResult<DismantleRecordDetailbRespVO>> getDismantleRecordDetailbPage(@Valid DismantleRecordDetailbPageReqVO pageVO) {
-        PageResult<DismantleRecordDetailbDO> pageResult = dismantleRecordDetailbService.getDismantleRecordDetailbPage(pageVO);
-        return success(DismantleRecordDetailbConvert.INSTANCE.convertPage(pageResult));
-    }
-
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出制品拆解记录子 Excel")
-    @PreAuthorize("@ss.hasPermission('wms:dismantle-record-detailb:export')")
-    @OperateLog(type = EXPORT)
-    public void exportDismantleRecordDetailbExcel(@Valid DismantleRecordDetailbExportReqVO exportReqVO,
-              HttpServletResponse response) throws IOException {
-        List<DismantleRecordDetailbDO> list = dismantleRecordDetailbService.getDismantleRecordDetailbList(exportReqVO);
-        // 导出 Excel
-        List<DismantleRecordDetailbExcelVO> datas = DismantleRecordDetailbConvert.INSTANCE.convertList02(list);
-        for(DismantleRecordDetailbExcelVO vo : datas) {
-            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
-            //后端创建个字段作为前端展示的虚拟字段
-            vo.setCreator(user.getNickname());
-        }
-        ExcelUtils.write(response, "制品拆解记录子.xls", "数据", DismantleRecordDetailbExcelVO.class, datas);
-    }
-
-}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/vo/DismantleRecordDetailbCreateReqVO.java

@@ -1,12 +0,0 @@
-package com.win.module.wms.controller.dismantleRecord.vo;
-
-import lombok.*;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-@Schema(description = "管理后台 - 制品拆解记录子创建 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class DismantleRecordDetailbCreateReqVO extends DismantleRecordDetailbBaseVO {
-
-}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/vo/DismantleRecordDetailbRespVO.java

@@ -1,12 +0,0 @@
-package com.win.module.wms.controller.dismantleRecord.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
-@Schema(description = "管理后台 - 制品拆解记录子 Response VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class DismantleRecordDetailbRespVO extends DismantleRecordDetailbBaseVO {
-
-}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/vo/DismantleRecordDetailbUpdateReqVO.java

@@ -1,12 +0,0 @@
-package com.win.module.wms.controller.dismantleRecord.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
-@Schema(description = "管理后台 - 制品拆解记录子更新 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class DismantleRecordDetailbUpdateReqVO extends DismantleRecordDetailbBaseVO {
-
-}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/vo/DismantleRequestDetailbCreateReqVO.java

@@ -1,12 +0,0 @@
-package com.win.module.wms.controller.dismantleRequest.vo;
-
-import lombok.*;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-@Schema(description = "管理后台 - 制品拆解申请子创建 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class DismantleRequestDetailbCreateReqVO extends DismantleRequestDetailbBaseVO {
-
-}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/vo/DismantleRequestDetailbRespVO.java

@@ -1,12 +0,0 @@
-package com.win.module.wms.controller.dismantleRequest.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
-@Schema(description = "管理后台 - 制品拆解申请子 Response VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class DismantleRequestDetailbRespVO extends DismantleRequestDetailbBaseVO {
-
-}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/vo/DismantleRequestDetailbUpdateReqVO.java

@@ -1,12 +0,0 @@
-package com.win.module.wms.controller.dismantleRequest.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
-@Schema(description = "管理后台 - 制品拆解申请子更新 Request VO")
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString(callSuper = true)
-public class DismantleRequestDetailbUpdateReqVO extends DismantleRequestDetailbBaseVO {
-
-}

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

@@ -0,0 +1,124 @@
+package com.win.module.wms.controller.productdismantleRecord;
+
+import com.win.framework.common.pojo.CommonResult;
+import com.win.framework.common.pojo.CustomConditions;
+import com.win.framework.common.pojo.PageResult;
+import com.win.framework.excel.core.util.ExcelUtils;
+import com.win.framework.operatelog.core.annotations.OperateLog;
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.controller.productdismantleRecord.vo.*;
+import com.win.module.wms.convert.productdismantleRecord.ProductdismantleRecordDetailbConvert;
+import com.win.module.wms.dal.dataobject.productdismantleRecord.ProductdismantleRecordDetailbDO;
+import com.win.module.wms.service.productdismantleRecord.ProductdismantleRecordDetailbService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.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;
+
+@Tag(name = "管理后台 - 制品拆解记录子")
+@RestController
+@RequestMapping("/wms/dismantle-record-detailb")
+@Validated
+public class DismantleRecordDetailbController {
+
+    @Resource
+    private ProductdismantleRecordDetailbService dismantleRecordDetailbService;
+
+    @Resource
+    private AdminUserApi userApi;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建制品拆解记录子")
+    @PreAuthorize("@ss.hasPermission('wms:productdismantle-record-detailb:create')")
+    public CommonResult<Long> createDismantleRecordDetailb(@Valid @RequestBody ProductdismantleRecordDetailbCreateReqVO createReqVO) {
+        return success(dismantleRecordDetailbService.createDismantleRecordDetailb(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新制品拆解记录子")
+    @PreAuthorize("@ss.hasPermission('wms:productdismantle-record-detailb:update')")
+    public CommonResult<Boolean> updateDismantleRecordDetailb(@Valid @RequestBody ProductdismantleRecordDetailbUpdateReqVO updateReqVO) {
+        dismantleRecordDetailbService.updateDismantleRecordDetailb(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除制品拆解记录子")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('wms:productdismantle-record-detailb:delete')")
+    public CommonResult<Boolean> deleteDismantleRecordDetailb(@RequestParam("id") Long id) {
+        dismantleRecordDetailbService.deleteDismantleRecordDetailb(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得制品拆解记录子")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:productdismantle-record-detailb:query')")
+    public CommonResult<ProductdismantleRecordDetailbRespVO> getDismantleRecordDetailb(@RequestParam("id") Long id) {
+        ProductdismantleRecordDetailbDO dismantleRecordDetailb = dismantleRecordDetailbService.getDismantleRecordDetailb(id);
+        return success(ProductdismantleRecordDetailbConvert.INSTANCE.convert(dismantleRecordDetailb));
+    }
+
+    @GetMapping("/list")
+    @Operation(summary = "获得制品拆解记录子列表")
+    @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
+    @PreAuthorize("@ss.hasPermission('wms:productdismantle-record-detailb:query')")
+    public CommonResult<List<ProductdismantleRecordDetailbRespVO>> getDismantleRecordDetailbList(@RequestParam("ids") Collection<Long> ids) {
+        List<ProductdismantleRecordDetailbDO> list = dismantleRecordDetailbService.getDismantleRecordDetailbList(ids);
+        return success(ProductdismantleRecordDetailbConvert.INSTANCE.convertList(list));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得制品拆解记录子分页")
+    @PreAuthorize("@ss.hasPermission('wms:productdismantle-record-detailb:query')")
+    public CommonResult<PageResult<ProductdismantleRecordDetailbRespVO>> getDismantleRecordDetailbPage(@Valid ProductdismantleRecordDetailbPageReqVO pageVO) {
+        PageResult<ProductdismantleRecordDetailbDO> pageResult = dismantleRecordDetailbService.getDismantleRecordDetailbPage(pageVO);
+        return success(ProductdismantleRecordDetailbConvert.INSTANCE.convertPage(pageResult));
+    }
+
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得制品拆解记录子分页")
+    @PreAuthorize("@ss.hasPermission('wms:productdismantle-record-detailb:query')")
+    public CommonResult<PageResult<ProductdismantleRecordDetailbRespVO>> getDismantleRecordDetailbSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductdismantleRecordDetailbDO> pageResult = dismantleRecordDetailbService.getDismantleRecordDetailbSenior(conditions);
+        PageResult<ProductdismantleRecordDetailbRespVO> result = ProductdismantleRecordDetailbConvert.INSTANCE.convertPage(pageResult);
+        for(ProductdismantleRecordDetailbRespVO 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:productdismantle-record-detailb:export')")
+    @OperateLog(type = EXPORT)
+    public void exportDismantleRecordDetailbExcel(@Valid ProductdismantleRecordDetailbExportReqVO exportReqVO,
+              HttpServletResponse response) throws IOException {
+        List<ProductdismantleRecordDetailbDO> list = dismantleRecordDetailbService.getDismantleRecordDetailbList(exportReqVO);
+        // 导出 Excel
+        List<ProductdismantleRecordDetailbExcelVO> datas = ProductdismantleRecordDetailbConvert.INSTANCE.convertList02(list);
+        for(ProductdismantleRecordDetailbExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        ExcelUtils.write(response, "制品拆解记录子.xls", "数据", ProductdismantleRecordDetailbExcelVO.class, datas);
+    }
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecordMain/ProductdismantleRecordMainController.java → win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/ProductdismantleRecordMainController.java

@@ -1,34 +1,32 @@
-package com.win.module.wms.controller.productdismantleRecordMain;
+package com.win.module.wms.controller.productdismantleRecord;
 
+import com.win.framework.common.pojo.CommonResult;
+import com.win.framework.common.pojo.CustomConditions;
+import com.win.framework.common.pojo.PageResult;
+import com.win.framework.excel.core.util.ExcelUtils;
+import com.win.framework.operatelog.core.annotations.OperateLog;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.productdismantleRecordMain.vo.*;
+import com.win.module.wms.controller.productdismantleRecord.vo.*;
-import org.springframework.web.bind.annotation.*;
+import com.win.module.wms.convert.productdismantleRecord.ProductdismantleRecordMainConvert;
-import javax.annotation.Resource;
+import com.win.module.wms.dal.dataobject.productdismantleRecord.ProductdismantleRecordMainDO;
-import org.springframework.validation.annotation.Validated;
+import com.win.module.wms.service.productdismantleRecord.ProductdismantleRecordMainService;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
-import javax.validation.*;
+import javax.annotation.Resource;
-import javax.servlet.http.*;
+import javax.servlet.http.HttpServletResponse;
-import java.util.*;
+import javax.validation.Valid;
 import java.io.IOException;
+import java.util.Collection;
+import java.util.List;
 
-import com.win.framework.common.pojo.PageResult;
-import com.win.framework.common.pojo.CommonResult;
 import static com.win.framework.common.pojo.CommonResult.success;
-
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
-import com.win.framework.excel.core.util.ExcelUtils;
-
-import com.win.framework.operatelog.core.annotations.OperateLog;
-import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-import com.win.module.wms.controller.productdismantleRecordMain.vo.*;
-import com.win.module.wms.dal.dataobject.productdismantleRecordMain.ProductdismantleRecordMainDO;
-import com.win.module.wms.convert.productdismantleRecordMain.ProductdismantleRecordMainConvert;
-import com.win.module.wms.service.productdismantleRecordMain.ProductdismantleRecordMainService;
 
 @Tag(name = "管理后台 - 制品拆解记录主")
 @RestController
@@ -92,6 +90,20 @@ public class ProductdismantleRecordMainController {
         return success(ProductdismantleRecordMainConvert.INSTANCE.convertPage(pageResult));
     }
 
+    @PostMapping("/senior")
+    @Operation(summary = "高级搜索获得制品拆解记录主分页")
+    @PreAuthorize("@ss.hasPermission('wms:productdismantle-record-main:query')")
+    public CommonResult<PageResult<ProductdismantleRecordMainRespVO>> getProductdismantleRecordMainSenior(@Valid @RequestBody CustomConditions conditions) {
+        PageResult<ProductdismantleRecordMainDO> pageResult = productdismantleRecordMainService.getProductdismantleRecordMainSenior(conditions);
+        PageResult<ProductdismantleRecordMainRespVO> result = ProductdismantleRecordMainConvert.INSTANCE.convertPage(pageResult);
+        for(ProductdismantleRecordMainRespVO 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:productdismantle-record-main:export')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/vo/DismantleRecordDetailbBaseVO.java → win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbBaseVO.java

@@ -1,12 +1,11 @@
-package com.win.module.wms.controller.dismantleRecord.vo;
+package com.win.module.wms.controller.productdismantleRecord.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
-import java.util.*;
-import java.time.LocalDateTime;
-import javax.validation.constraints.*;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.time.LocalDateTime;
+
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 /**
@@ -14,7 +13,7 @@ import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY
  * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
  */
 @Data
-public class DismantleRecordDetailbBaseVO {
+public class ProductdismantleRecordDetailbBaseVO {
 
     @Schema(description = "id", example = "id")
     private Long id;

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

@@ -0,0 +1,14 @@
+package com.win.module.wms.controller.productdismantleRecord.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+@Schema(description = "管理后台 - 制品拆解记录子创建 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ProductdismantleRecordDetailbCreateReqVO extends ProductdismantleRecordDetailbBaseVO {
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/vo/DismantleRecordDetailbExcelVO.java → win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbExcelVO.java

@@ -1,13 +1,11 @@
-package com.win.module.wms.controller.dismantleRecord.vo;
+package com.win.module.wms.controller.productdismantleRecord.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.win.framework.excel.core.annotations.DictFormat;
 import com.win.framework.excel.core.convert.DictConvert;
+import lombok.Data;
+
+import java.time.LocalDateTime;
 
 
 /**
@@ -16,7 +14,7 @@ import com.win.framework.excel.core.convert.DictConvert;
  * @author 超级管理员
  */
 @Data
-public class DismantleRecordDetailbExcelVO {
+public class ProductdismantleRecordDetailbExcelVO {
 
     @ExcelProperty("工序代码")
     private String processCode;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/vo/DismantleRecordDetailbExportReqVO.java → win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbExportReqVO.java

@@ -1,17 +1,16 @@
-package com.win.module.wms.controller.dismantleRecord.vo;
+package com.win.module.wms.controller.productdismantleRecord.vo;
 
-import lombok.*;
-import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
-import com.win.framework.common.pojo.PageParam;
+import lombok.Data;
-import java.time.LocalDateTime;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.time.LocalDateTime;
+
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @Schema(description = "管理后台 - 制品拆解记录子 Excel 导出 Request VO，参数和 DismantleRecordDetailbPageReqVO 是一致的")
 @Data
-public class DismantleRecordDetailbExportReqVO {
+public class ProductdismantleRecordDetailbExportReqVO {
 
     @Schema(description = "工序代码")
     private String processCode;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/vo/DismantleRecordDetailbPageReqVO.java → win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbPageReqVO.java

@@ -1,10 +1,12 @@
-package com.win.module.wms.controller.dismantleRecord.vo;
+package com.win.module.wms.controller.productdismantleRecord.vo;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.win.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -13,7 +15,7 @@ import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-public class DismantleRecordDetailbPageReqVO extends PageParam {
+public class ProductdismantleRecordDetailbPageReqVO extends PageParam {
 
     @Schema(description = "工序代码")
     private String processCode;

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

@@ -0,0 +1,14 @@
+package com.win.module.wms.controller.productdismantleRecord.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+@Schema(description = "管理后台 - 制品拆解记录子 Response VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ProductdismantleRecordDetailbRespVO extends ProductdismantleRecordDetailbBaseVO {
+
+}

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

@@ -0,0 +1,14 @@
+package com.win.module.wms.controller.productdismantleRecord.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+@Schema(description = "管理后台 - 制品拆解记录子更新 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ProductdismantleRecordDetailbUpdateReqVO extends ProductdismantleRecordDetailbBaseVO {
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecordMain/vo/ProductdismantleRecordMainBaseVO.java → win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordMainBaseVO.java

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

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecordMain/vo/ProductdismantleRecordMainCreateReqVO.java → win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordMainCreateReqVO.java

@@ -1,7 +1,9 @@
-package com.win.module.wms.controller.productdismantleRecordMain.vo;
+package com.win.module.wms.controller.productdismantleRecord.vo;
 
-import lombok.*;
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 @Schema(description = "管理后台 - 制品拆解记录主创建 Request VO")
 @Data

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecordMain/vo/ProductdismantleRecordMainExcelVO.java → win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordMainExcelVO.java

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

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecordMain/vo/ProductdismantleRecordMainExportReqVO.java → win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordMainExportReqVO.java

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

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecordMain/vo/ProductdismantleRecordMainPageReqVO.java → win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordMainPageReqVO.java

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

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecordMain/vo/ProductdismantleRecordMainRespVO.java → win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordMainRespVO.java

@@ -1,7 +1,9 @@
-package com.win.module.wms.controller.productdismantleRecordMain.vo;
+package com.win.module.wms.controller.productdismantleRecord.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 @Schema(description = "管理后台 - 制品拆解记录主 Response VO")
 @Data

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecordMain/vo/ProductdismantleRecordMainUpdateReqVO.java → win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordMainUpdateReqVO.java

@@ -1,7 +1,9 @@
-package com.win.module.wms.controller.productdismantleRecordMain.vo;
+package com.win.module.wms.controller.productdismantleRecord.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 @Schema(description = "管理后台 - 制品拆解记录主更新 Request VO")
 @Data

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

@@ -1,43 +1,40 @@
-package com.win.module.wms.controller.dismantleRequest;
+package com.win.module.wms.controller.productdismantleRequest;
 
+import com.win.framework.common.pojo.CommonResult;
+import com.win.framework.common.pojo.PageResult;
+import com.win.framework.excel.core.util.ExcelUtils;
+import com.win.framework.operatelog.core.annotations.OperateLog;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.dismantleRequest.vo.*;
+import com.win.module.wms.controller.productdismantleRequest.vo.*;
-import org.springframework.web.bind.annotation.*;
+import com.win.module.wms.convert.productdismantleRequest.ProductdismantleRequestDetailbConvert;
-import javax.annotation.Resource;
+import com.win.module.wms.dal.dataobject.productdismantleRequest.ProductdismantleRequestDetailbDO;
-import org.springframework.validation.annotation.Validated;
+import com.win.module.wms.service.productdismantleRequest.ProductdismantleRequestDetailbService;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
-import javax.validation.*;
+import javax.annotation.Resource;
-import javax.servlet.http.*;
+import javax.servlet.http.HttpServletResponse;
-import java.util.*;
+import javax.validation.Valid;
 import java.io.IOException;
+import java.util.Collection;
+import java.util.List;
 
-import com.win.framework.common.pojo.PageResult;
-import com.win.framework.common.pojo.CommonResult;
 import static com.win.framework.common.pojo.CommonResult.success;
-
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
-import com.win.framework.excel.core.util.ExcelUtils;
-
-import com.win.framework.operatelog.core.annotations.OperateLog;
-import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-import com.win.module.wms.controller.dismantleRequest.vo.*;
-import com.win.module.wms.dal.dataobject.dismantleRequest.DismantleRequestDetailbDO;
-import com.win.module.wms.convert.dismantleRequest.DismantleRequestDetailbConvert;
-import com.win.module.wms.service.dismantleRequest.DismantleRequestDetailbService;
 
 @Tag(name = "管理后台 - 制品拆解申请子")
 @RestController
 @RequestMapping("/wms/dismantle-request-detailb")
 @Validated
-public class DismantleRequestDetailbController {
+public class ProductdismantleRequestDetailbController {
 
     @Resource
-    private DismantleRequestDetailbService dismantleRequestDetailbService;
+    private ProductdismantleRequestDetailbService productdismantleRequestDetailbService;
 
     @Resource
     private AdminUserApi userApi;
@@ -45,15 +42,15 @@ public class DismantleRequestDetailbController {
     @PostMapping("/create")
     @Operation(summary = "创建制品拆解申请子")
     @PreAuthorize("@ss.hasPermission('wms:dismantle-request-detailb:create')")
-    public CommonResult<Long> createDismantleRequestDetailb(@Valid @RequestBody DismantleRequestDetailbCreateReqVO createReqVO) {
+    public CommonResult<Long> createDismantleRequestDetailb(@Valid @RequestBody ProductdismantleRequestDetailbCreateReqVO createReqVO) {
-        return success(dismantleRequestDetailbService.createDismantleRequestDetailb(createReqVO));
+        return success(productdismantleRequestDetailbService.createDismantleRequestDetailb(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新制品拆解申请子")
     @PreAuthorize("@ss.hasPermission('wms:dismantle-request-detailb:update')")
-    public CommonResult<Boolean> updateDismantleRequestDetailb(@Valid @RequestBody DismantleRequestDetailbUpdateReqVO updateReqVO) {
+    public CommonResult<Boolean> updateDismantleRequestDetailb(@Valid @RequestBody ProductdismantleRequestDetailbUpdateReqVO updateReqVO) {
-        dismantleRequestDetailbService.updateDismantleRequestDetailb(updateReqVO);
+        productdismantleRequestDetailbService.updateDismantleRequestDetailb(updateReqVO);
         return success(true);
     }
 
@@ -62,7 +59,7 @@ public class DismantleRequestDetailbController {
     @Parameter(name = "id", description = "编号", required = true)
     @PreAuthorize("@ss.hasPermission('wms:dismantle-request-detailb:delete')")
     public CommonResult<Boolean> deleteDismantleRequestDetailb(@RequestParam("id") Long id) {
-        dismantleRequestDetailbService.deleteDismantleRequestDetailb(id);
+        productdismantleRequestDetailbService.deleteDismantleRequestDetailb(id);
         return success(true);
     }
 
@@ -70,43 +67,43 @@ public class DismantleRequestDetailbController {
     @Operation(summary = "获得制品拆解申请子")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('wms:dismantle-request-detailb:query')")
-    public CommonResult<DismantleRequestDetailbRespVO> getDismantleRequestDetailb(@RequestParam("id") Long id) {
+    public CommonResult<ProductdismantleRequestDetailbRespVO> getDismantleRequestDetailb(@RequestParam("id") Long id) {
-        DismantleRequestDetailbDO dismantleRequestDetailb = dismantleRequestDetailbService.getDismantleRequestDetailb(id);
+        ProductdismantleRequestDetailbDO dismantleRequestDetailb = productdismantleRequestDetailbService.getDismantleRequestDetailb(id);
-        return success(DismantleRequestDetailbConvert.INSTANCE.convert(dismantleRequestDetailb));
+        return success(ProductdismantleRequestDetailbConvert.INSTANCE.convert(dismantleRequestDetailb));
     }
 
     @GetMapping("/list")
     @Operation(summary = "获得制品拆解申请子列表")
     @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
     @PreAuthorize("@ss.hasPermission('wms:dismantle-request-detailb:query')")
-    public CommonResult<List<DismantleRequestDetailbRespVO>> getDismantleRequestDetailbList(@RequestParam("ids") Collection<Long> ids) {
+    public CommonResult<List<ProductdismantleRequestDetailbRespVO>> getDismantleRequestDetailbList(@RequestParam("ids") Collection<Long> ids) {
-        List<DismantleRequestDetailbDO> list = dismantleRequestDetailbService.getDismantleRequestDetailbList(ids);
+        List<ProductdismantleRequestDetailbDO> list = productdismantleRequestDetailbService.getDismantleRequestDetailbList(ids);
-        return success(DismantleRequestDetailbConvert.INSTANCE.convertList(list));
+        return success(ProductdismantleRequestDetailbConvert.INSTANCE.convertList(list));
     }
 
     @GetMapping("/page")
     @Operation(summary = "获得制品拆解申请子分页")
     @PreAuthorize("@ss.hasPermission('wms:dismantle-request-detailb:query')")
-    public CommonResult<PageResult<DismantleRequestDetailbRespVO>> getDismantleRequestDetailbPage(@Valid DismantleRequestDetailbPageReqVO pageVO) {
+    public CommonResult<PageResult<ProductdismantleRequestDetailbRespVO>> getDismantleRequestDetailbPage(@Valid ProductdismantleRequestDetailbPageReqVO pageVO) {
-        PageResult<DismantleRequestDetailbDO> pageResult = dismantleRequestDetailbService.getDismantleRequestDetailbPage(pageVO);
+        PageResult<ProductdismantleRequestDetailbDO> pageResult = productdismantleRequestDetailbService.getDismantleRequestDetailbPage(pageVO);
-        return success(DismantleRequestDetailbConvert.INSTANCE.convertPage(pageResult));
+        return success(ProductdismantleRequestDetailbConvert.INSTANCE.convertPage(pageResult));
     }
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出制品拆解申请子 Excel")
     @PreAuthorize("@ss.hasPermission('wms:dismantle-request-detailb:export')")
     @OperateLog(type = EXPORT)
-    public void exportDismantleRequestDetailbExcel(@Valid DismantleRequestDetailbExportReqVO exportReqVO,
+    public void exportDismantleRequestDetailbExcel(@Valid ProductdismantleRequestDetailbExportReqVO exportReqVO,
               HttpServletResponse response) throws IOException {
-        List<DismantleRequestDetailbDO> list = dismantleRequestDetailbService.getDismantleRequestDetailbList(exportReqVO);
+        List<ProductdismantleRequestDetailbDO> list = productdismantleRequestDetailbService.getDismantleRequestDetailbList(exportReqVO);
         // 导出 Excel
-        List<DismantleRequestDetailbExcelVO> datas = DismantleRequestDetailbConvert.INSTANCE.convertList02(list);
+        List<ProductdismantleRequestDetailbExcelVO> datas = ProductdismantleRequestDetailbConvert.INSTANCE.convertList02(list);
-        for(DismantleRequestDetailbExcelVO vo : datas) {
+        for(ProductdismantleRequestDetailbExcelVO vo : datas) {
             AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
             //后端创建个字段作为前端展示的虚拟字段
             vo.setCreator(user.getNickname());
         }
-        ExcelUtils.write(response, "制品拆解申请子.xls", "数据", DismantleRequestDetailbExcelVO.class, datas);
+        ExcelUtils.write(response, "制品拆解申请子.xls", "数据", ProductdismantleRequestDetailbExcelVO.class, datas);
     }
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/vo/DismantleRequestDetailbBaseVO.java → win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbBaseVO.java

@@ -1,13 +1,12 @@
-package com.win.module.wms.controller.dismantleRequest.vo;
+package com.win.module.wms.controller.productdismantleRequest.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
-import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
+
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import javax.validation.constraints.*;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
@@ -16,7 +15,7 @@ import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY
  * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
  */
 @Data
-public class DismantleRequestDetailbBaseVO {
+public class ProductdismantleRequestDetailbBaseVO {
 
     @Schema(description = "id", example = "id")
     private Long id;

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

@@ -0,0 +1,14 @@
+package com.win.module.wms.controller.productdismantleRequest.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+@Schema(description = "管理后台 - 制品拆解申请子创建 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ProductdismantleRequestDetailbCreateReqVO extends ProductdismantleRequestDetailbBaseVO {
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/vo/DismantleRequestDetailbExcelVO.java → win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbExcelVO.java

@@ -1,15 +1,12 @@
-package com.win.module.wms.controller.dismantleRequest.vo;
+package com.win.module.wms.controller.productdismantleRequest.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.win.framework.excel.core.annotations.DictFormat;
 import com.win.framework.excel.core.convert.DictConvert;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 
 
 /**
@@ -18,7 +15,7 @@ import com.win.framework.excel.core.convert.DictConvert;
  * @author 超级管理员
  */
 @Data
-public class DismantleRequestDetailbExcelVO {
+public class ProductdismantleRequestDetailbExcelVO {
 
     @ExcelProperty("工序代码")
     private String processCode;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/vo/DismantleRequestDetailbExportReqVO.java → win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbExportReqVO.java

@@ -1,19 +1,17 @@
-package com.win.module.wms.controller.dismantleRequest.vo;
+package com.win.module.wms.controller.productdismantleRequest.vo;
 
-import lombok.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
-import com.win.framework.common.pojo.PageParam;
 import java.time.LocalDateTime;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @Schema(description = "管理后台 - 制品拆解申请子 Excel 导出 Request VO，参数和 DismantleRequestDetailbPageReqVO 是一致的")
 @Data
-public class DismantleRequestDetailbExportReqVO {
+public class ProductdismantleRequestDetailbExportReqVO {
 
     @Schema(description = "工序代码")
     private String processCode;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/vo/DismantleRequestDetailbPageReqVO.java → win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbPageReqVO.java

@@ -1,12 +1,13 @@
-package com.win.module.wms.controller.dismantleRequest.vo;
+package com.win.module.wms.controller.productdismantleRequest.vo;
 
-import lombok.*;
-
-import java.math.BigDecimal;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.win.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -15,7 +16,7 @@ import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-public class DismantleRequestDetailbPageReqVO extends PageParam {
+public class ProductdismantleRequestDetailbPageReqVO extends PageParam {
 
     @Schema(description = "工序代码")
     private String processCode;

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

@@ -0,0 +1,14 @@
+package com.win.module.wms.controller.productdismantleRequest.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+@Schema(description = "管理后台 - 制品拆解申请子 Response VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ProductdismantleRequestDetailbRespVO extends ProductdismantleRequestDetailbBaseVO {
+
+}

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

@@ -0,0 +1,14 @@
+package com.win.module.wms.controller.productdismantleRequest.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+@Schema(description = "管理后台 - 制品拆解申请子更新 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ProductdismantleRequestDetailbUpdateReqVO extends ProductdismantleRequestDetailbBaseVO {
+
+}

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

@@ -8,9 +8,9 @@ import com.win.framework.operatelog.core.annotations.OperateLog;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.productrepairRequest.vo.*;
-import com.win.module.wms.convert.productrepairRequest.ConsumereRequestDetailbConvert;
+import com.win.module.wms.convert.productrepairRequest.ProductrepairRequestDetailbConvert;
-import com.win.module.wms.dal.dataobject.productrepairRequest.ConsumereRequestDetailbDO;
+import com.win.module.wms.dal.dataobject.productrepairRequest.ProductrepairRequestDetailbDO;
-import com.win.module.wms.service.productrepairRequest.ConsumereRequestDetailbService;
+import com.win.module.wms.service.productrepairRequest.ProductrepairRequestDetailbService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -32,10 +32,10 @@ import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 @RestController
 @RequestMapping("/wms/consumere-request-detailb")
 @Validated
-public class ConsumereRequestDetailbController {
+public class ProductrepairRequestDetailbController {
 
     @Resource
-    private ConsumereRequestDetailbService consumereRequestDetailbService;
+    private ProductrepairRequestDetailbService productrepairRequestDetailbService;
 
     @Resource
     private AdminUserApi userApi;
@@ -43,15 +43,15 @@ public class ConsumereRequestDetailbController {
     @PostMapping("/create")
     @Operation(summary = "创建制品返修申请子")
     @PreAuthorize("@ss.hasPermission('wms:consumere-request-detailb:create')")
-    public CommonResult<String> createConsumereRequestDetailb(@Valid @RequestBody ConsumereRequestDetailbCreateReqVO createReqVO) {
+    public CommonResult<String> createConsumereRequestDetailb(@Valid @RequestBody ProductrepairRequestDetailbCreateReqVO createReqVO) {
-        return success(consumereRequestDetailbService.createConsumereRequestDetailb(createReqVO));
+        return success(productrepairRequestDetailbService.createConsumereRequestDetailb(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新制品返修申请子")
     @PreAuthorize("@ss.hasPermission('wms:consumere-request-detailb:update')")
-    public CommonResult<Boolean> updateConsumereRequestDetailb(@Valid @RequestBody ConsumereRequestDetailbUpdateReqVO updateReqVO) {
+    public CommonResult<Boolean> updateConsumereRequestDetailb(@Valid @RequestBody ProductrepairRequestDetailbUpdateReqVO updateReqVO) {
-        consumereRequestDetailbService.updateConsumereRequestDetailb(updateReqVO);
+        productrepairRequestDetailbService.updateConsumereRequestDetailb(updateReqVO);
         return success(true);
     }
 
@@ -60,7 +60,7 @@ public class ConsumereRequestDetailbController {
     @Parameter(name = "id", description = "编号", required = true)
     @PreAuthorize("@ss.hasPermission('wms:consumere-request-detailb:delete')")
     public CommonResult<Boolean> deleteConsumereRequestDetailb(@RequestParam("id") String id) {
-        consumereRequestDetailbService.deleteConsumereRequestDetailb(id);
+        productrepairRequestDetailbService.deleteConsumereRequestDetailb(id);
         return success(true);
     }
 
@@ -68,34 +68,34 @@ public class ConsumereRequestDetailbController {
     @Operation(summary = "获得制品返修申请子")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('wms:consumere-request-detailb:query')")
-    public CommonResult<ConsumereRequestDetailbRespVO> getConsumereRequestDetailb(@RequestParam("id") String id) {
+    public CommonResult<ProductrepairRequestDetailbRespVO> getConsumereRequestDetailb(@RequestParam("id") String id) {
-        ConsumereRequestDetailbDO consumereRequestDetailb = consumereRequestDetailbService.getConsumereRequestDetailb(id);
+        ProductrepairRequestDetailbDO consumereRequestDetailb = productrepairRequestDetailbService.getConsumereRequestDetailb(id);
-        return success(ConsumereRequestDetailbConvert.INSTANCE.convert(consumereRequestDetailb));
+        return success(ProductrepairRequestDetailbConvert.INSTANCE.convert(consumereRequestDetailb));
     }
 
     @GetMapping("/list")
     @Operation(summary = "获得制品返修申请子列表")
     @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
     @PreAuthorize("@ss.hasPermission('wms:consumere-request-detailb:query')")
-    public CommonResult<List<ConsumereRequestDetailbRespVO>> getConsumereRequestDetailbList(@RequestParam("ids") Collection<String> ids) {
+    public CommonResult<List<ProductrepairRequestDetailbRespVO>> getConsumereRequestDetailbList(@RequestParam("ids") Collection<String> ids) {
-        List<ConsumereRequestDetailbDO> list = consumereRequestDetailbService.getConsumereRequestDetailbList(ids);
+        List<ProductrepairRequestDetailbDO> list = productrepairRequestDetailbService.getConsumereRequestDetailbList(ids);
-        return success(ConsumereRequestDetailbConvert.INSTANCE.convertList(list));
+        return success(ProductrepairRequestDetailbConvert.INSTANCE.convertList(list));
     }
 
     @GetMapping("/page")
     @Operation(summary = "获得制品返修申请子分页")
     @PreAuthorize("@ss.hasPermission('wms:consumere-request-detailb:query')")
-    public CommonResult<PageResult<ConsumereRequestDetailbRespVO>> getConsumereRequestDetailbPage(@Valid ConsumereRequestDetailbPageReqVO pageVO) {
+    public CommonResult<PageResult<ProductrepairRequestDetailbRespVO>> getConsumereRequestDetailbPage(@Valid ProductrepairRequestDetailbPageReqVO pageVO) {
-        PageResult<ConsumereRequestDetailbDO> pageResult = consumereRequestDetailbService.getConsumereRequestDetailbPage(pageVO);
+        PageResult<ProductrepairRequestDetailbDO> pageResult = productrepairRequestDetailbService.getConsumereRequestDetailbPage(pageVO);
-        return success(ConsumereRequestDetailbConvert.INSTANCE.convertPage(pageResult));
+        return success(ProductrepairRequestDetailbConvert.INSTANCE.convertPage(pageResult));
     }
     @PostMapping("/senior")
     @Operation(summary = "高级搜索获得制品返修申请子分页")
     @PreAuthorize("@ss.hasPermission('wms:consumere:query')")
-    public CommonResult<PageResult<ConsumereRequestDetailbRespVO>> getConsumereSenior(@Valid @RequestBody CustomConditions conditions) {
+    public CommonResult<PageResult<ProductrepairRequestDetailbRespVO>> getConsumereSenior(@Valid @RequestBody CustomConditions conditions) {
-        PageResult<ConsumereRequestDetailbDO> pageResult = consumereRequestDetailbService.getConsumereRequestDetailbSenior(conditions);
+        PageResult<ProductrepairRequestDetailbDO> pageResult = productrepairRequestDetailbService.getConsumereRequestDetailbSenior(conditions);
-        PageResult<ConsumereRequestDetailbRespVO> result = ConsumereRequestDetailbConvert.INSTANCE.convertPage(pageResult);
+        PageResult<ProductrepairRequestDetailbRespVO> result = ProductrepairRequestDetailbConvert.INSTANCE.convertPage(pageResult);
-        for(ConsumereRequestDetailbRespVO vo : result.getList()) {
+        for(ProductrepairRequestDetailbRespVO vo : result.getList()) {
             AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
             //后端创建个字段作为前端展示的虚拟字段
             vo.setCreator(user.getNickname());
@@ -106,17 +106,17 @@ public class ConsumereRequestDetailbController {
     @Operation(summary = "导出制品返修申请子 Excel")
     @PreAuthorize("@ss.hasPermission('wms:consumere-request-detailb:export')")
     @OperateLog(type = EXPORT)
-    public void exportConsumereRequestDetailbExcel(@Valid ConsumereRequestDetailbExportReqVO exportReqVO,
+    public void exportConsumereRequestDetailbExcel(@Valid ProductrepairRequestDetailbExportReqVO exportReqVO,
               HttpServletResponse response) throws IOException {
-        List<ConsumereRequestDetailbDO> list = consumereRequestDetailbService.getConsumereRequestDetailbList(exportReqVO);
+        List<ProductrepairRequestDetailbDO> list = productrepairRequestDetailbService.getConsumereRequestDetailbList(exportReqVO);
         // 导出 Excel
-        List<ConsumereRequestDetailbExcelVO> datas = ConsumereRequestDetailbConvert.INSTANCE.convertList02(list);
+        List<ProductrepairRequestDetailbExcelVO> datas = ProductrepairRequestDetailbConvert.INSTANCE.convertList02(list);
-        for(ConsumereRequestDetailbExcelVO vo : datas) {
+        for(ProductrepairRequestDetailbExcelVO vo : datas) {
             AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
             //后端创建个字段作为前端展示的虚拟字段
             vo.setCreator(user.getNickname());
         }
-        ExcelUtils.write(response, "制品返修申请子.xls", "数据", ConsumereRequestDetailbExcelVO.class, datas);
+        ExcelUtils.write(response, "制品返修申请子.xls", "数据", ProductrepairRequestDetailbExcelVO.class, datas);
     }
 
 }

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

@@ -14,7 +14,7 @@ import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY
  * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
  */
 @Data
-public class ConsumereRequestDetailbBaseVO {
+public class ProductrepairRequestDetailbBaseVO {
 
     @Schema(description = "id", example = "id")
     private Long id;

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

@@ -9,6 +9,6 @@ import lombok.ToString;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-public class ConsumereRequestDetailbCreateReqVO extends ConsumereRequestDetailbBaseVO {
+public class ProductrepairRequestDetailbCreateReqVO extends ProductrepairRequestDetailbBaseVO {
 
 }

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

@@ -14,7 +14,7 @@ import java.time.LocalDateTime;
  * @author 超级管理员
  */
 @Data
-public class ConsumereRequestDetailbExcelVO {
+public class ProductrepairRequestDetailbExcelVO {
 
     @ExcelProperty("库存状态")
     private String inventoryStatus;

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

@@ -10,7 +10,7 @@ import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY
 
 @Schema(description = "管理后台 - 制品返修申请子 Excel 导出 Request VO，参数和 ConsumereRequestDetailbPageReqVO 是一致的")
 @Data
-public class ConsumereRequestDetailbExportReqVO {
+public class ProductrepairRequestDetailbExportReqVO {
 
     @Schema(description = "库存状态")
     private String inventoryStatus;

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

@@ -15,7 +15,7 @@ import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-public class ConsumereRequestDetailbPageReqVO extends PageParam {
+public class ProductrepairRequestDetailbPageReqVO extends PageParam {
 
     @Schema(description = "库存状态")
     private String inventoryStatus;

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

@@ -9,6 +9,6 @@ import lombok.ToString;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-public class ConsumereRequestDetailbRespVO extends ConsumereRequestDetailbBaseVO {
+public class ProductrepairRequestDetailbRespVO extends ProductrepairRequestDetailbBaseVO {
 
 }

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

@@ -9,6 +9,6 @@ import lombok.ToString;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-public class ConsumereRequestDetailbUpdateReqVO extends ConsumereRequestDetailbBaseVO {
+public class ProductrepairRequestDetailbUpdateReqVO extends ProductrepairRequestDetailbBaseVO {
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/dismantleRecord/DismantleRecordDetailbConvert.java

@@ -1,37 +0,0 @@
-package com.win.module.wms.convert.dismantleRecord;
-
-import java.util.*;
-
-import com.win.framework.common.pojo.PageResult;
-
-import com.win.module.wms.controller.dismantleRecord.vo.DismantleRecordDetailbCreateReqVO;
-import com.win.module.wms.controller.dismantleRecord.vo.DismantleRecordDetailbExcelVO;
-import com.win.module.wms.controller.dismantleRecord.vo.DismantleRecordDetailbRespVO;
-import com.win.module.wms.controller.dismantleRecord.vo.DismantleRecordDetailbUpdateReqVO;
-import org.mapstruct.Mapper;
-import org.mapstruct.factory.Mappers;
-import com.win.module.wms.dal.dataobject.dismantleRecord.DismantleRecordDetailbDO;
-
-/**
- * 制品拆解记录子 Convert
- *
- * @author 超级管理员
- */
-@Mapper
-public interface DismantleRecordDetailbConvert {
-
-    DismantleRecordDetailbConvert INSTANCE = Mappers.getMapper(DismantleRecordDetailbConvert.class);
-
-    DismantleRecordDetailbDO convert(DismantleRecordDetailbCreateReqVO bean);
-
-    DismantleRecordDetailbDO convert(DismantleRecordDetailbUpdateReqVO bean);
-
-    DismantleRecordDetailbRespVO convert(DismantleRecordDetailbDO bean);
-
-    List<DismantleRecordDetailbRespVO> convertList(List<DismantleRecordDetailbDO> list);
-
-    PageResult<DismantleRecordDetailbRespVO> convertPage(PageResult<DismantleRecordDetailbDO> page);
-
-    List<DismantleRecordDetailbExcelVO> convertList02(List<DismantleRecordDetailbDO> list);
-
-}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/dismantleRequest/DismantleRequestDetailbConvert.java

@@ -1,37 +0,0 @@
-package com.win.module.wms.convert.dismantleRequest;
-
-import java.util.*;
-
-import com.win.framework.common.pojo.PageResult;
-
-import com.win.module.wms.controller.dismantleRequest.vo.DismantleRequestDetailbCreateReqVO;
-import com.win.module.wms.controller.dismantleRequest.vo.DismantleRequestDetailbExcelVO;
-import com.win.module.wms.controller.dismantleRequest.vo.DismantleRequestDetailbRespVO;
-import com.win.module.wms.controller.dismantleRequest.vo.DismantleRequestDetailbUpdateReqVO;
-import org.mapstruct.Mapper;
-import org.mapstruct.factory.Mappers;
-import com.win.module.wms.dal.dataobject.dismantleRequest.DismantleRequestDetailbDO;
-
-/**
- * 制品拆解申请子 Convert
- *
- * @author 超级管理员
- */
-@Mapper
-public interface DismantleRequestDetailbConvert {
-
-    DismantleRequestDetailbConvert INSTANCE = Mappers.getMapper(DismantleRequestDetailbConvert.class);
-
-    DismantleRequestDetailbDO convert(DismantleRequestDetailbCreateReqVO bean);
-
-    DismantleRequestDetailbDO convert(DismantleRequestDetailbUpdateReqVO bean);
-
-    DismantleRequestDetailbRespVO convert(DismantleRequestDetailbDO bean);
-
-    List<DismantleRequestDetailbRespVO> convertList(List<DismantleRequestDetailbDO> list);
-
-    PageResult<DismantleRequestDetailbRespVO> convertPage(PageResult<DismantleRequestDetailbDO> page);
-
-    List<DismantleRequestDetailbExcelVO> convertList02(List<DismantleRequestDetailbDO> list);
-
-}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productdismantleRecord/ProductdismantleRecordDetailbConvert.java

@@ -0,0 +1,36 @@
+package com.win.module.wms.convert.productdismantleRecord;
+
+import com.win.framework.common.pojo.PageResult;
+import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordDetailbCreateReqVO;
+import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordDetailbExcelVO;
+import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordDetailbRespVO;
+import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordDetailbUpdateReqVO;
+import com.win.module.wms.dal.dataobject.productdismantleRecord.ProductdismantleRecordDetailbDO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+
+/**
+ * 制品拆解记录子 Convert
+ *
+ * @author 超级管理员
+ */
+@Mapper
+public interface ProductdismantleRecordDetailbConvert {
+
+    ProductdismantleRecordDetailbConvert INSTANCE = Mappers.getMapper(ProductdismantleRecordDetailbConvert.class);
+
+    ProductdismantleRecordDetailbDO convert(ProductdismantleRecordDetailbCreateReqVO bean);
+
+    ProductdismantleRecordDetailbDO convert(ProductdismantleRecordDetailbUpdateReqVO bean);
+
+    ProductdismantleRecordDetailbRespVO convert(ProductdismantleRecordDetailbDO bean);
+
+    List<ProductdismantleRecordDetailbRespVO> convertList(List<ProductdismantleRecordDetailbDO> list);
+
+    PageResult<ProductdismantleRecordDetailbRespVO> convertPage(PageResult<ProductdismantleRecordDetailbDO> page);
+
+    List<ProductdismantleRecordDetailbExcelVO> convertList02(List<ProductdismantleRecordDetailbDO> list);
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productdismantleRecordMain/ProductdismantleRecordMainConvert.java → win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productdismantleRecord/ProductdismantleRecordMainConvert.java

@@ -1,16 +1,15 @@
-package com.win.module.wms.convert.productdismantleRecordMain;
+package com.win.module.wms.convert.productdismantleRecord;
-
-import java.util.*;
 
 import com.win.framework.common.pojo.PageResult;
-
+import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordMainCreateReqVO;
-import com.win.module.wms.controller.productdismantleRecordMain.vo.ProductdismantleRecordMainCreateReqVO;
+import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordMainExcelVO;
-import com.win.module.wms.controller.productdismantleRecordMain.vo.ProductdismantleRecordMainExcelVO;
+import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordMainRespVO;
-import com.win.module.wms.controller.productdismantleRecordMain.vo.ProductdismantleRecordMainRespVO;
+import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordMainUpdateReqVO;
-import com.win.module.wms.controller.productdismantleRecordMain.vo.ProductdismantleRecordMainUpdateReqVO;
+import com.win.module.wms.dal.dataobject.productdismantleRecord.ProductdismantleRecordMainDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
-import com.win.module.wms.dal.dataobject.productdismantleRecordMain.ProductdismantleRecordMainDO;
+
+import java.util.List;
 
 /**
  * 制品拆解记录主 Convert

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productdismantleRequest/ProductdismantleRequestDetailbConvert.java

@@ -0,0 +1,36 @@
+package com.win.module.wms.convert.productdismantleRequest;
+
+import com.win.framework.common.pojo.PageResult;
+import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailbCreateReqVO;
+import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailbExcelVO;
+import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailbRespVO;
+import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailbUpdateReqVO;
+import com.win.module.wms.dal.dataobject.productdismantleRequest.ProductdismantleRequestDetailbDO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+
+/**
+ * 制品拆解申请子 Convert
+ *
+ * @author 超级管理员
+ */
+@Mapper
+public interface ProductdismantleRequestDetailbConvert {
+
+    ProductdismantleRequestDetailbConvert INSTANCE = Mappers.getMapper(ProductdismantleRequestDetailbConvert.class);
+
+    ProductdismantleRequestDetailbDO convert(ProductdismantleRequestDetailbCreateReqVO bean);
+
+    ProductdismantleRequestDetailbDO convert(ProductdismantleRequestDetailbUpdateReqVO bean);
+
+    ProductdismantleRequestDetailbRespVO convert(ProductdismantleRequestDetailbDO bean);
+
+    List<ProductdismantleRequestDetailbRespVO> convertList(List<ProductdismantleRequestDetailbDO> list);
+
+    PageResult<ProductdismantleRequestDetailbRespVO> convertPage(PageResult<ProductdismantleRequestDetailbDO> page);
+
+    List<ProductdismantleRequestDetailbExcelVO> convertList02(List<ProductdismantleRequestDetailbDO> list);
+
+}

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

@@ -1,36 +0,0 @@
-package com.win.module.wms.convert.productrepairRequest;
-
-import com.win.framework.common.pojo.PageResult;
-import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbCreateReqVO;
-import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbExcelVO;
-import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbRespVO;
-import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbUpdateReqVO;
-import com.win.module.wms.dal.dataobject.productrepairRequest.ConsumereRequestDetailbDO;
-import org.mapstruct.Mapper;
-import org.mapstruct.factory.Mappers;
-
-import java.util.List;
-
-/**
- * 制品返修申请子 Convert
- *
- * @author 超级管理员
- */
-@Mapper
-public interface ConsumereRequestDetailbConvert {
-
-    ConsumereRequestDetailbConvert INSTANCE = Mappers.getMapper(ConsumereRequestDetailbConvert.class);
-
-    ConsumereRequestDetailbDO convert(ConsumereRequestDetailbCreateReqVO bean);
-
-    ConsumereRequestDetailbDO convert(ConsumereRequestDetailbUpdateReqVO bean);
-
-    ConsumereRequestDetailbRespVO convert(ConsumereRequestDetailbDO bean);
-
-    List<ConsumereRequestDetailbRespVO> convertList(List<ConsumereRequestDetailbDO> list);
-
-    PageResult<ConsumereRequestDetailbRespVO> convertPage(PageResult<ConsumereRequestDetailbDO> page);
-
-    List<ConsumereRequestDetailbExcelVO> convertList02(List<ConsumereRequestDetailbDO> list);
-
-}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productrepairRequest/ProductrepairRequestDetailbConvert.java

@@ -0,0 +1,36 @@
+package com.win.module.wms.convert.productrepairRequest;
+
+import com.win.framework.common.pojo.PageResult;
+import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestDetailbCreateReqVO;
+import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestDetailbExcelVO;
+import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestDetailbRespVO;
+import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestDetailbUpdateReqVO;
+import com.win.module.wms.dal.dataobject.productrepairRequest.ProductrepairRequestDetailbDO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+
+/**
+ * 制品返修申请子 Convert
+ *
+ * @author 超级管理员
+ */
+@Mapper
+public interface ProductrepairRequestDetailbConvert {
+
+    ProductrepairRequestDetailbConvert INSTANCE = Mappers.getMapper(ProductrepairRequestDetailbConvert.class);
+
+    ProductrepairRequestDetailbDO convert(ProductrepairRequestDetailbCreateReqVO bean);
+
+    ProductrepairRequestDetailbDO convert(ProductrepairRequestDetailbUpdateReqVO bean);
+
+    ProductrepairRequestDetailbRespVO convert(ProductrepairRequestDetailbDO bean);
+
+    List<ProductrepairRequestDetailbRespVO> convertList(List<ProductrepairRequestDetailbDO> list);
+
+    PageResult<ProductrepairRequestDetailbRespVO> convertPage(PageResult<ProductrepairRequestDetailbDO> page);
+
+    List<ProductrepairRequestDetailbExcelVO> convertList02(List<ProductrepairRequestDetailbDO> list);
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/dismantleRecord/DismantleRecordDetailbDO.java → win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productdismantleRecord/ProductdismantleRecordDetailbDO.java

@@ -1,10 +1,10 @@
-package com.win.module.wms.dal.dataobject.dismantleRecord;
+package com.win.module.wms.dal.dataobject.productdismantleRecord;
 
-import lombok.*;
+import com.baomidou.mybatisplus.annotation.TableId;
-import java.util.*;
+import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
+import com.sun.xml.bind.v2.TODO;
-import com.baomidou.mybatisplus.annotation.*;
 import com.win.framework.mybatis.core.dataobject.BaseDO;
+import lombok.*;
 
 /**
  * 制品拆解记录子 DO
@@ -18,7 +18,7 @@ import com.win.framework.mybatis.core.dataobject.BaseDO;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class DismantleRecordDetailbDO extends BaseDO {
+public class ProductdismantleRecordDetailbDO extends BaseDO {
 
     /**
      * id

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productdismantleRecordMain/ProductdismantleRecordMainDO.java → win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productdismantleRecord/ProductdismantleRecordMainDO.java

@@ -1,14 +1,12 @@
-package com.win.module.wms.dal.dataobject.productdismantleRecordMain;
+package com.win.module.wms.dal.dataobject.productdismantleRecord;
 
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.sun.xml.bind.v2.TODO;
+import com.win.framework.mybatis.core.dataobject.BaseDO;
 import lombok.*;
-import java.util.*;
+
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
 import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
-import com.win.framework.mybatis.core.dataobject.BaseDO;
 
 /**
  * 制品拆解记录主 DO

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/dismantleRequest/DismantleRequestDetailbDO.java → win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productdismantleRequest/ProductdismantleRequestDetailbDO.java

@@ -1,12 +1,12 @@
-package com.win.module.wms.dal.dataobject.dismantleRequest;
+package com.win.module.wms.dal.dataobject.productdismantleRequest;
 
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.sun.xml.bind.v2.TODO;
+import com.win.framework.mybatis.core.dataobject.BaseDO;
 import lombok.*;
-import java.util.*;
+
-import java.time.LocalDateTime;
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
-import com.win.framework.mybatis.core.dataobject.BaseDO;
 
 /**
  * 制品拆解申请子 DO
@@ -20,7 +20,7 @@ import com.win.framework.mybatis.core.dataobject.BaseDO;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class DismantleRequestDetailbDO extends BaseDO {
+public class ProductdismantleRequestDetailbDO extends BaseDO {
 
     /**
      * id

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

@@ -19,7 +19,7 @@ import lombok.*;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class ConsumereRequestDetailbDO extends BaseDO {
+public class ProductrepairRequestDetailbDO extends BaseDO {
 
     /**
      * id

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/container/ContainerDetailMapper.java

@@ -2,11 +2,14 @@ package com.win.module.wms.dal.mysql.container;
 
 import java.util.*;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.win.framework.mybatis.core.mapper.BaseMapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.container.vo.ContainerDetailExportReqVO;
 import com.win.module.wms.controller.container.vo.ContainerDetailPageReqVO;
+import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO;
 import com.win.module.wms.dal.dataobject.container.ContainerDetailDO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -29,7 +32,9 @@ public interface ContainerDetailMapper extends BaseMapperX<ContainerDetailDO> {
                 .eqIfPresent(ContainerDetailDO::getQty, reqVO.getQty())
                 .orderByDesc(ContainerDetailDO::getId));
     }
-
+    default PageResult<ContainerDetailDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<ContainerDetailDO> selectList(ContainerDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ContainerDetailDO>()
                 .eqIfPresent(ContainerDetailDO::getContainerContentType, reqVO.getContainerContentType())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/container/ContainerMainMapper.java

@@ -2,11 +2,14 @@ package com.win.module.wms.dal.mysql.container;
 
 import java.util.*;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.win.framework.mybatis.core.mapper.BaseMapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.container.vo.ContainerMainExportReqVO;
 import com.win.module.wms.controller.container.vo.ContainerMainPageReqVO;
+import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO;
 import com.win.module.wms.dal.dataobject.container.ContainerMainDO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -27,7 +30,9 @@ public interface ContainerMainMapper extends BaseMapperX<ContainerMainDO> {
                 .eqIfPresent(ContainerMainDO::getOwnerCode, reqVO.getOwnerCode())
                 .orderByDesc(ContainerMainDO::getId));
     }
-
+    default PageResult<ContainerMainDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<ContainerMainDO> selectList(ContainerMainExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ContainerMainDO>()
                 .eqIfPresent(ContainerMainDO::getNumber, reqVO.getNumber())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countJob/CountJobDetailMapper.java

@@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.countJob;
 
 import java.util.*;
 
+import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.win.framework.mybatis.core.mapper.BaseMapperX;
+import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.countJob.vo.CountJobDetailExportReqVO;
 import com.win.module.wms.controller.countJob.vo.CountJobDetailPageReqVO;
 import com.win.module.wms.dal.dataobject.countJob.CountJobDetailDO;
@@ -39,7 +41,9 @@ public interface CountJobDetailMapper extends BaseMapperX<CountJobDetailDO> {
                 .eqIfPresent(CountJobDetailDO::getCreator, reqVO.getCreator())
                 .orderByDesc(CountJobDetailDO::getId));
     }
-
+    default PageResult<CountJobDetailDO> selectSenior(CustomConditions conditions) {
+        return selectPage(conditions, QueryWrapperUtils.structure(conditions));
+    }
     default List<CountJobDetailDO> selectList(CountJobDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<CountJobDetailDO>()
                 .eqIfPresent(CountJobDetailDO::getCountDetailNumber, reqVO.getCountDetailNumber())