From 8d37e6d8707b574810c71053b814537342667210 Mon Sep 17 00:00:00 2001 From: chenfang Date: Mon, 30 Oct 2023 15:26:51 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=BC=96=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/controller/dock/DockController.java | 24 ++++- .../documentSwitch/SwitchController.java | 21 ++++- .../documentSwitch/vo/SwitchRespVO.java | 7 ++ .../DocumentsettingController.java | 22 ++++- .../expectin/ExpectinController.java | 16 +++- .../expectin/vo/ExpectinRespVO.java | 8 ++ .../expectout/ExpectoutController.java | 16 +++- .../expectout/vo/ExpectoutRespVO.java | 8 ++ .../InspectJobDetailController.java | 15 ++- .../inspectJob/InspectJobMainController.java | 14 +++ .../InspectRecordDetailController.java | 16 +++- .../InspectRecordMainController.java | 14 +++ .../InspectRequestDetailController.java | 16 +++- .../InspectRequestMainController.java | 15 ++- .../vo/InspectRequestDetailRespVO.java | 8 ++ ...InventorychangeRecordDetailController.java | 15 ++- .../InventorychangeRecordMainController.java | 15 ++- ...nventorychangeRequestDetailController.java | 16 +++- .../InventorychangeRequestMainController.java | 16 +++- .../InventoryinitRecordDetailController.java | 15 ++- .../InventoryinitRecordMainController.java | 16 +++- .../InventoryinitRequestDetailController.java | 16 +++- .../InventoryinitRequestMainController.java | 16 +++- .../InventorymoveJobDetailController.java | 16 +++- .../InventorymoveJobMainController.java | 16 +++- .../InventorymoveRecordDetailController.java | 16 +++- .../InventorymoveRecordMainController.java | 17 +++- .../InventorymoveRequestDetailController.java | 17 +++- .../InventorymoveRequestMainController.java | 17 +++- .../issueJob/IssueJobDetailController.java | 17 +++- .../issueJob/IssueJobMainController.java | 15 ++- .../IssueRecordDetailController.java | 16 +++- .../IssueRecordMainController.java | 15 ++- .../IssueRequestDetailController.java | 16 +++- .../IssueRequestMainController.java | 18 +++- .../ItempackagingController.java | 33 ++++++- .../jobsetting/JobsettingController.java | 15 +++ .../labeltype/LabeltypeController.java | 15 ++- .../labeltype/vo/LabeltypeRespVO.java | 7 ++ .../location/LocationController.java | 32 ++++++- .../LocationcapacityController.java | 15 ++- .../vo/LocationcapacityRespVO.java | 7 ++ .../LocationgroupController.java | 23 ++++- ...flinesettlementRecordDetailController.java | 15 ++- ...OfflinesettlementRecordMainController.java | 15 ++- ...linesettlementRequestDetailController.java | 15 ++- ...fflinesettlementRequestMainController.java | 15 ++- ...nlinesettlementRecordDetailController.java | 15 ++- .../OnlinesettlementRecordMainController.java | 16 +++- ...linesettlementRequestDetailController.java | 16 +++- ...OnlinesettlementRequestMainController.java | 15 ++- .../wms/controller/owner/OwnerController.java | 23 ++++- .../module/wms/dal/mysql/dock/DockMapper.java | 6 +- .../mysql/documentSwitch/SwitchMapper.java | 6 ++ .../DocumentsettingMapper.java | 6 +- .../dal/mysql/expectin/ExpectinMapper.java | 6 +- .../dal/mysql/expectout/ExpectoutMapper.java | 6 +- .../inspectJob/InspectJobDetailMapper.java | 6 +- .../inspectJob/InspectJobMainMapper.java | 6 ++ .../InspectRecordDetailMapper.java | 6 +- .../InspectRecordMainMapper.java | 6 ++ .../InspectRequestDetailMapper.java | 6 ++ .../InspectRequestMainMapper.java | 6 +- .../InventorychangeRecordDetailMapper.java | 6 +- .../InventorychangeRecordMainMapper.java | 6 +- .../InventorychangeRequestDetailMapper.java | 6 +- .../InventorychangeRequestMainMapper.java | 6 +- .../InventoryinitRecordDetailMapper.java | 6 +- .../InventoryinitRecordMainMapper.java | 6 +- .../InventoryinitRequestDetailMapper.java | 6 +- .../InventoryinitRequestMainMapper.java | 6 +- .../InventorymoveJobDetailMapper.java | 6 +- .../InventorymoveJobMainMapper.java | 6 +- .../InventorymoveRecordDetailMapper.java | 6 +- .../InventorymoveRecordMainMapper.java | 6 +- .../InventorymoveRequestDetailMapper.java | 6 +- .../InventorymoveRequestMainMapper.java | 6 +- .../mysql/issueJob/IssueJobDetailMapper.java | 5 + .../mysql/issueJob/IssueJobMainMapper.java | 6 +- .../issueRecord/IssueRecordDetailMapper.java | 6 +- .../issueRecord/IssueRecordMainMapper.java | 6 +- .../IssueRequestDetailMapper.java | 6 +- .../issueRequest/IssueRequestMainMapper.java | 6 +- .../itempackaging/ItempackagingMapper.java | 6 +- .../mysql/jobsetting/JobsettingMapper.java | 6 +- .../dal/mysql/labeltype/LabeltypeMapper.java | 6 +- .../dal/mysql/location/LocationMapper.java | 6 +- .../LocationcapacityMapper.java | 6 +- .../locationgroup/LocationgroupMapper.java | 6 +- .../OfflinesettlementRecordDetailMapper.java | 6 +- .../OfflinesettlementRecordMainMapper.java | 6 +- .../OfflinesettlementRequestDetailMapper.java | 7 +- .../OfflinesettlementRequestMainMapper.java | 6 +- .../OnlinesettlementRecordDetailMapper.java | 6 +- .../OnlinesettlementRecordMainMapper.java | 6 +- .../OnlinesettlementRequestDetailMapper.java | 6 +- .../OnlinesettlementRequestMainMapper.java | 5 + .../wms/dal/mysql/owner/OwnerMapper.java | 6 +- .../wms/service/balance/BalanceService.java | 16 ++-- .../service/balance/BalanceServiceImpl.java | 40 ++++---- .../module/wms/service/dock/DockService.java | 10 ++ .../wms/service/dock/DockServiceImpl.java | 71 ++++++++++---- .../service/documentSwitch/SwitchService.java | 10 ++ .../documentSwitch/SwitchServiceImpl.java | 6 ++ .../DocumentsettingService.java | 8 ++ .../DocumentsettingServiceImpl.java | 93 ++++++++++++++---- .../wms/service/expectin/ExpectinService.java | 10 ++ .../service/expectin/ExpectinServiceImpl.java | 6 ++ .../service/expectout/ExpectoutService.java | 18 +++- .../expectout/ExpectoutServiceImpl.java | 16 ++-- .../inspectJob/InspectJobDetailService.java | 10 ++ .../InspectJobDetailServiceImpl.java | 6 ++ .../inspectJob/InspectJobMainService.java | 10 ++ .../inspectJob/InspectJobMainServiceImpl.java | 8 +- .../InspectRecordDetailService.java | 10 ++ .../InspectRecordDetailServiceImpl.java | 6 ++ .../InspectRecordMainService.java | 9 ++ .../InspectRecordMainServiceImpl.java | 6 ++ .../InspectRequestDetailService.java | 10 ++ .../InspectRequestDetailServiceImpl.java | 6 ++ .../InspectRequestMainService.java | 9 ++ .../InspectRequestMainServiceImpl.java | 6 +- .../InventorychangeRecordDetailService.java | 10 ++ ...nventorychangeRecordDetailServiceImpl.java | 6 +- .../InventorychangeRecordMainService.java | 10 ++ .../InventorychangeRecordMainServiceImpl.java | 6 +- .../InventorychangeRequestDetailService.java | 9 ++ ...ventorychangeRequestDetailServiceImpl.java | 6 +- .../InventorychangeRequestMainService.java | 8 ++ ...InventorychangeRequestMainServiceImpl.java | 6 +- .../InventoryinitRecordDetailService.java | 8 ++ .../InventoryinitRecordDetailServiceImpl.java | 6 +- .../InventoryinitRecordMainService.java | 10 ++ .../InventoryinitRecordMainServiceImpl.java | 6 +- .../InventoryinitRequestDetailService.java | 8 ++ ...InventoryinitRequestDetailServiceImpl.java | 6 +- .../InventoryinitRequestMainService.java | 8 ++ .../InventoryinitRequestMainServiceImpl.java | 6 +- .../InventorymoveJobDetailService.java | 9 ++ .../InventorymoveJobDetailServiceImpl.java | 7 +- .../InventorymoveJobMainService.java | 9 ++ .../InventorymoveJobMainServiceImpl.java | 6 +- .../InventorymoveRecordDetailService.java | 9 ++ .../InventorymoveRecordDetailServiceImpl.java | 6 +- .../InventorymoveRecordMainService.java | 9 ++ .../InventorymoveRecordMainServiceImpl.java | 7 +- .../InventorymoveRequestDetailService.java | 9 ++ ...InventorymoveRequestDetailServiceImpl.java | 8 +- .../InventorymoveRequestMainService.java | 9 ++ .../InventorymoveRequestMainServiceImpl.java | 7 +- .../issueJob/IssueJobDetailService.java | 9 ++ .../issueJob/IssueJobDetailServiceImpl.java | 7 +- .../service/issueJob/IssueJobMainService.java | 9 ++ .../issueJob/IssueJobMainServiceImpl.java | 8 +- .../issueRecord/IssueRecordDetailService.java | 9 ++ .../IssueRecordDetailServiceImpl.java | 6 +- .../issueRecord/IssueRecordMainService.java | 9 ++ .../IssueRecordMainServiceImpl.java | 6 +- .../IssueRequestDetailService.java | 9 ++ .../IssueRequestDetailServiceImpl.java | 6 +- .../issueRequest/IssueRequestMainService.java | 9 ++ .../IssueRequestMainServiceImpl.java | 5 + .../itempackaging/ItempackagingService.java | 9 ++ .../ItempackagingServiceImpl.java | 66 ++++++++++--- .../service/jobsetting/JobsettingService.java | 8 ++ .../jobsetting/JobsettingServiceImpl.java | 6 +- .../service/labeltype/LabeltypeService.java | 8 ++ .../labeltype/LabeltypeServiceImpl.java | 6 +- .../wms/service/location/LocationService.java | 12 ++- .../service/location/LocationServiceImpl.java | 94 ++++++++++++++----- .../LocationcapacityService.java | 9 ++ .../LocationcapacityServiceImpl.java | 5 + .../locationgroup/LocationgroupService.java | 10 ++ .../LocationgroupServiceImpl.java | 61 ++++++++---- .../OfflinesettlementRecordDetailService.java | 9 ++ ...linesettlementRecordDetailServiceImpl.java | 5 + .../OfflinesettlementRecordMainService.java | 9 ++ ...fflinesettlementRecordMainServiceImpl.java | 6 +- ...OfflinesettlementRequestDetailService.java | 9 ++ ...inesettlementRequestDetailServiceImpl.java | 5 + .../OfflinesettlementRequestMainService.java | 9 ++ ...flinesettlementRequestMainServiceImpl.java | 5 + .../OnlinesettlementRecordDetailService.java | 9 ++ ...linesettlementRecordDetailServiceImpl.java | 6 +- .../OnlinesettlementRecordMainService.java | 9 ++ ...OnlinesettlementRecordMainServiceImpl.java | 6 +- .../OnlinesettlementRequestDetailService.java | 9 ++ ...inesettlementRequestDetailServiceImpl.java | 6 +- .../OnlinesettlementRequestMainService.java | 9 ++ ...nlinesettlementRequestMainServiceImpl.java | 5 + .../wms/service/owner/OwnerService.java | 9 ++ .../wms/service/owner/OwnerServiceImpl.java | 58 +++++++++--- .../win/module/wms/until/job/JobUtils.java | 91 +++++++++++++----- 193 files changed, 2084 insertions(+), 298 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dock/DockController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dock/DockController.java index 163b857c..cfacc0b3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dock/DockController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dock/DockController.java @@ -1,6 +1,6 @@ package com.win.module.wms.controller.dock; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; @@ -29,10 +29,8 @@ import java.time.LocalDateTime; import java.time.ZoneOffset; import java.util.*; -import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.framework.common.pojo.CommonResult.success; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; -import static com.win.module.wms.enums.ErrorCodeConstants.*; @Tag(name = "管理后台 - 月台") @RestController @@ -98,6 +96,19 @@ public class DockController { return success(DockConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得月台分页") + @PreAuthorize("@ss.hasPermission('wms:dock:query')") + public CommonResult> getDockSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = dockService.getDockSenior(conditions); + PageResult result = DockConvert.INSTANCE.convertPage(pageResult); + for(DockRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出月台 Excel") @PreAuthorize("@ss.hasPermission('wms:dock:export')") @@ -112,7 +123,12 @@ public class DockController { //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } - ExcelUtils.write(response, "月台.xls", "数据", DockExcelVO.class, datas); + Map mapDropDown = new HashMap<>(); + String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.DOCK_TYPE); + mapDropDown.put(5, type); + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(10, available);; + ExcelUtils.write(response, "月台.xls", "数据", DockExcelVO.class, datas,mapDropDown); } @GetMapping("/get-import-template") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentSwitch/SwitchController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentSwitch/SwitchController.java index 1749e999..53a43dd5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentSwitch/SwitchController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentSwitch/SwitchController.java @@ -1,6 +1,8 @@ package com.win.module.wms.controller.documentSwitch; -import com.win.module.wms.controller.documentSwitch.vo.*; +import com.win.framework.common.pojo.CustomConditions; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -37,6 +39,9 @@ public class SwitchController { @Resource private SwitchService switchService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建单据开关") @PreAuthorize("@ss.hasPermission('wms:switch:create')") @@ -79,6 +84,20 @@ public class SwitchController { return success(SwitchConvert.INSTANCE.convertList(list)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得单据开关分页") + @PreAuthorize("@ss.hasPermission('wms:switch:query')") + public CommonResult> getSwitchSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = switchService.getSwitchSenior(conditions); + PageResult result = SwitchConvert.INSTANCE.convertPage(pageResult); + for(SwitchRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + @GetMapping("/page") @Operation(summary = "获得单据开关分页") @PreAuthorize("@ss.hasPermission('wms:switch:query')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentSwitch/vo/SwitchRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentSwitch/vo/SwitchRespVO.java index 757c9863..67ee1061 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentSwitch/vo/SwitchRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentSwitch/vo/SwitchRespVO.java @@ -3,6 +3,8 @@ package com.win.module.wms.controller.documentSwitch.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import java.time.LocalDateTime; + @Schema(description = "管理后台 - 单据开关 Response VO") @Data @EqualsAndHashCode(callSuper = true) @@ -12,4 +14,9 @@ public class SwitchRespVO extends SwitchBaseVO { @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "17760") private Long id; + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + private LocalDateTime createTime; + + @Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED) + private String creator; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentsetting/DocumentsettingController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentsetting/DocumentsettingController.java index cc8b9c10..af13eb4e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentsetting/DocumentsettingController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentsetting/DocumentsettingController.java @@ -1,6 +1,7 @@ package com.win.module.wms.controller.documentsetting; import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; @@ -94,6 +95,20 @@ public class DocumentsettingController { return success(DocumentsettingConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得单据设置分页") + @PreAuthorize("@ss.hasPermission('wms:documentsetting:query')") + public CommonResult> getDocumentsettingSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = documentsettingService.getDocumentsettingSenior(conditions); + PageResult result = DocumentsettingConvert.INSTANCE.convertPage(pageResult); + for(DocumentsettingRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + @GetMapping("/export-excel") @Operation(summary = "导出单据设置 Excel") @PreAuthorize("@ss.hasPermission('wms:documentsetting:export')") @@ -108,7 +123,12 @@ public class DocumentsettingController { //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } - ExcelUtils.write(response, "单据设置.xls", "数据", DocumentsettingExcelVO.class, datas); + Map mapDropDown = new HashMap<>(); + String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.DOCUMENT_TYPE); + mapDropDown.put(3, type); + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PACK_UNIT); + mapDropDown.put(10, available);; + ExcelUtils.write(response, "单据设置.xls", "数据", DocumentsettingExcelVO.class, datas,mapDropDown); } @GetMapping("/get-import-template") @Operation(summary = "获得导入单据设置模板") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/ExpectinController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/ExpectinController.java index 7954c44f..9cd137f3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/ExpectinController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/ExpectinController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.expectin; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.expectin.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,6 +92,20 @@ public class ExpectinController { return success(ExpectinConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得预计入库存分页") + @PreAuthorize("@ss.hasPermission('wms:expectin:query')") + public CommonResult> getExpectinSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = expectinService.getExpectinSenior(conditions); + PageResult result = ExpectinConvert.INSTANCE.convertPage(pageResult); + for(ExpectinRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + @GetMapping("/export-excel") @Operation(summary = "导出预计入库存 Excel") @PreAuthorize("@ss.hasPermission('wms:expectin:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/vo/ExpectinRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/vo/ExpectinRespVO.java index 8f665072..a487317d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/vo/ExpectinRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/vo/ExpectinRespVO.java @@ -3,10 +3,18 @@ package com.win.module.wms.controller.expectin.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import java.time.LocalDateTime; + @Schema(description = "管理后台 - 预计入库存 Response VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class ExpectinRespVO extends ExpectinBaseVO { + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + private LocalDateTime createTime; + + @Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED) + private String creator; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectout/ExpectoutController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectout/ExpectoutController.java index 97159844..35fcc3a6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectout/ExpectoutController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectout/ExpectoutController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.expectout; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.expectout.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,6 +92,20 @@ public class ExpectoutController { return success(ExpectoutConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得账期日历分页") + @PreAuthorize("@ss.hasPermission('wms:expectout:query')") + public CommonResult> getExpectoutSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = expectoutService.getExpectoutSenior(conditions); + PageResult result = ExpectoutConvert.INSTANCE.convertPage(pageResult); + for(ExpectoutRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + @GetMapping("/export-excel") @Operation(summary = "导出预计出库存 Excel") @PreAuthorize("@ss.hasPermission('wms:expectout:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectout/vo/ExpectoutRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectout/vo/ExpectoutRespVO.java index baf46bcd..793468cf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectout/vo/ExpectoutRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectout/vo/ExpectoutRespVO.java @@ -3,10 +3,18 @@ package com.win.module.wms.controller.expectout.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import java.time.LocalDateTime; + @Schema(description = "管理后台 - 预计出库存 Response VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class ExpectoutRespVO extends ExpectoutBaseVO { + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + private LocalDateTime createTime; + + @Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED) + private String creator; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobDetailController.java index b1ff2f49..74e59f55 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.inspectJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.inspectJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,6 +92,19 @@ public class InspectJobDetailController { return success(InspectJobDetailConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得检验任务子分页") + @PreAuthorize("@ss.hasPermission('wms:inspect-job-detail:query')") + public CommonResult> getInspectJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = inspectJobDetailService.getInspectJobDetailSenior(conditions); + PageResult result = InspectJobDetailConvert.INSTANCE.convertPage(pageResult); + for(InspectJobDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出检验任务子 Excel") @PreAuthorize("@ss.hasPermission('wms:inspect-job-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java index 851fa7aa..dd9e0a5d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.inspectJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.inspectJob.vo.*; @@ -91,6 +92,19 @@ public class InspectJobMainController { return success(InspectJobMainConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得检验任务主分页") + @PreAuthorize("@ss.hasPermission('wms:inspect-job-main:query')") + public CommonResult> getInspectJobMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = inspectJobMainService.getInspectJobMainSenior(conditions); + PageResult result = InspectJobMainConvert.INSTANCE.convertPage(pageResult); + for(InspectJobMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出检验任务主 Excel") @PreAuthorize("@ss.hasPermission('wms:inspect-job-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordDetailController.java index 3c7daf8a..2e55c7ae 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.inspectRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.inspectRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,6 +92,20 @@ public class InspectRecordDetailController { return success(InspectRecordDetailConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得检验记录子分页") + @PreAuthorize("@ss.hasPermission('wms:inspect-record-detail:query')") + public CommonResult> getInspectRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = inspectRecordDetailService.getInspectRecordDetailSenior(conditions); + PageResult result = InspectRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(InspectRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + @GetMapping("/export-excel") @Operation(summary = "导出检验记录子 Excel") @PreAuthorize("@ss.hasPermission('wms:inspect-record-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordMainController.java index d036f068..3f9753cf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.inspectRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.inspectRecord.vo.*; @@ -91,6 +92,19 @@ public class InspectRecordMainController { return success(InspectRecordMainConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得检验记录主分页") + @PreAuthorize("@ss.hasPermission('wms:inspect-record-main:query')") + public CommonResult> getInspectRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = inspectRecordMainService.getInspectRecordMainSenior(conditions); + PageResult result = InspectRecordMainConvert.INSTANCE.convertPage(pageResult); + for(InspectRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出检验记录主 Excel") @PreAuthorize("@ss.hasPermission('wms:inspect-record-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestDetailController.java index 9dfb2c6b..a5bbc6ce 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.inspectRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.inspectRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,6 +92,20 @@ public class InspectRequestDetailController { return success(InspectRequestDetailConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得检验申请子分页") + @PreAuthorize("@ss.hasPermission('wms:inspect-request-detail:query')") + public CommonResult> getInspectRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = inspectRequestDetailService.getInspectRequestDetailSenior(conditions); + PageResult result = InspectRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(InspectRequestDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + @GetMapping("/export-excel") @Operation(summary = "导出检验申请子 Excel") @PreAuthorize("@ss.hasPermission('wms:inspect-request-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestMainController.java index 94f80db6..e0541a86 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.inspectRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.inspectRequest.vo.*; @@ -89,7 +90,19 @@ public class InspectRequestMainController { PageResult pageResult = inspectRequestMainService.getInspectRequestMainPage(pageVO); return success(InspectRequestMainConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得检验申请主分页") + @PreAuthorize("@ss.hasPermission('wms:inspect-request-main:query')") + public CommonResult> getInspectRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = inspectRequestMainService.getInspectRequestMainSenior(conditions); + PageResult result = InspectRequestMainConvert.INSTANCE.convertPage(pageResult); + for(InspectRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出检验申请主 Excel") @PreAuthorize("@ss.hasPermission('wms:inspect-request-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailRespVO.java index 28d77f02..c4f7e591 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailRespVO.java @@ -3,10 +3,18 @@ package com.win.module.wms.controller.inspectRequest.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import java.time.LocalDateTime; + @Schema(description = "管理后台 - 检验申请子 Response VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class InspectRequestDetailRespVO extends InspectRequestDetailBaseVO { + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + private LocalDateTime createTime; + + @Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED) + private String creator; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/InventorychangeRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/InventorychangeRecordDetailController.java index 4242914f..70de96d9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/InventorychangeRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/InventorychangeRecordDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.inventorychangeRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.inventorychangeRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,6 +92,19 @@ public class InventorychangeRecordDetailController { return success(InventorychangeRecordDetailConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得库存修改记录子分页") + @PreAuthorize("@ss.hasPermission('wms:accountcalendar:query')") + public CommonResult> getInventorychangeRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = inventorychangeRecordDetailService.getInventorychangeRecordDetailSenior(conditions); + PageResult result = InventorychangeRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(InventorychangeRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出库存修改记录子 Excel") @PreAuthorize("@ss.hasPermission('wms:inventorychange-record-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/InventorychangeRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/InventorychangeRecordMainController.java index 0f428a89..571e7cd8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/InventorychangeRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/InventorychangeRecordMainController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.inventorychangeRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.inventorychangeRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,6 +92,19 @@ public class InventorychangeRecordMainController { return success(InventorychangeRecordMainConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得库存修改记录主分页") + @PreAuthorize("@ss.hasPermission('wms:inventorychange-record-main:query')") + public CommonResult> getInventorychangeRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = inventorychangeRecordMainService.getInventorychangeRecordMainSenior(conditions); + PageResult result = InventorychangeRecordMainConvert.INSTANCE.convertPage(pageResult); + for(InventorychangeRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出库存修改记录主 Excel") @PreAuthorize("@ss.hasPermission('wms:inventorychange-record-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/InventorychangeRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/InventorychangeRequestDetailController.java index 128a2134..af17c79a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/InventorychangeRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/InventorychangeRequestDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.inventorychangeRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.inventorychangeRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -91,7 +91,19 @@ public class InventorychangeRequestDetailController { PageResult pageResult = inventorychangeRequestDetailService.getInventorychangeRequestDetailPage(pageVO); return success(InventorychangeRequestDetailConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得库存修改申请子分页") + @PreAuthorize("@ss.hasPermission('wms:inventorychange-request-detail:query')") + public CommonResult> getInventorychangeRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = inventorychangeRequestDetailService.getInventorychangeRequestDetailSenior(conditions); + PageResult result = InventorychangeRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(InventorychangeRequestDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出库存修改申请子 Excel") @PreAuthorize("@ss.hasPermission('wms:inventorychange-request-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/InventorychangeRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/InventorychangeRequestMainController.java index 7c8f3c15..414df52c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/InventorychangeRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/InventorychangeRequestMainController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.inventorychangeRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.inventorychangeRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -91,7 +91,19 @@ public class InventorychangeRequestMainController { PageResult pageResult = inventorychangeRequestMainService.getInventorychangeRequestMainPage(pageVO); return success(InventorychangeRequestMainConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得库存修改申请主分页") + @PreAuthorize("@ss.hasPermission('wms:inventorychange-request-main:query')") + public CommonResult> getInventorychangeRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = inventorychangeRequestMainService.getInventorychangeRequestMainSenior(conditions); + PageResult result = InventorychangeRequestMainConvert.INSTANCE.convertPage(pageResult); + for(InventorychangeRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出库存修改申请主 Excel") @PreAuthorize("@ss.hasPermission('wms:inventorychange-request-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/InventoryinitRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/InventoryinitRecordDetailController.java index 542672aa..bfee1615 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/InventoryinitRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/InventoryinitRecordDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.inventoryinitRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.inventoryinitRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,6 +92,19 @@ public class InventoryinitRecordDetailController { return success(InventoryinitRecordDetailConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得库存初始化记录子分页") + @PreAuthorize("@ss.hasPermission('wms:inventoryinit-record-detail:query')") + public CommonResult> getInventoryinitRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = inventoryinitRecordDetailService.getInventoryinitRecordDetailSenior(conditions); + PageResult result = InventoryinitRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(InventoryinitRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出库存初始化记录子 Excel") @PreAuthorize("@ss.hasPermission('wms:inventoryinit-record-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/InventoryinitRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/InventoryinitRecordMainController.java index f34afe63..ab2989ab 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/InventoryinitRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/InventoryinitRecordMainController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.inventoryinitRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.inventoryinitRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -91,7 +91,19 @@ public class InventoryinitRecordMainController { PageResult pageResult = inventoryinitRecordMainService.getInventoryinitRecordMainPage(pageVO); return success(InventoryinitRecordMainConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得库存初始化记录主分页") + @PreAuthorize("@ss.hasPermission('wms:inventoryinit-record-main:query')") + public CommonResult> getInventoryinitRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = inventoryinitRecordMainService.getInventoryinitRecordMainSenior(conditions); + PageResult result = InventoryinitRecordMainConvert.INSTANCE.convertPage(pageResult); + for(InventoryinitRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出库存初始化记录主 Excel") @PreAuthorize("@ss.hasPermission('wms:inventoryinit-record-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/InventoryinitRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/InventoryinitRequestDetailController.java index 52960e84..f63866f5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/InventoryinitRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/InventoryinitRequestDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.inventoryinitRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.inventoryinitRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,6 +92,20 @@ public class InventoryinitRequestDetailController { return success(InventoryinitRequestDetailConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得库存初始化申请子分页") + @PreAuthorize("@ss.hasPermission('wms:inventoryinit-request-detail:query')") + public CommonResult> getInventoryinitRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = inventoryinitRequestDetailService.getInventoryinitRequestDetailSenior(conditions); + PageResult result = InventoryinitRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(InventoryinitRequestDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + @GetMapping("/export-excel") @Operation(summary = "导出库存初始化申请子 Excel") @PreAuthorize("@ss.hasPermission('wms:inventoryinit-request-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/InventoryinitRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/InventoryinitRequestMainController.java index bc9a9dbc..dd2e7ba6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/InventoryinitRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/InventoryinitRequestMainController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.inventoryinitRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.inventoryinitRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -91,7 +91,19 @@ public class InventoryinitRequestMainController { PageResult pageResult = inventoryinitRequestMainService.getInventoryinitRequestMainPage(pageVO); return success(InventoryinitRequestMainConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得库存初始化申请主分页") + @PreAuthorize("@ss.hasPermission('wms:accountcalendar:query')") + public CommonResult> getInventoryinitRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = inventoryinitRequestMainService.getInventoryinitRequestMainSenior(conditions); + PageResult result = InventoryinitRequestMainConvert.INSTANCE.convertPage(pageResult); + for(InventoryinitRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出库存初始化申请主 Excel") @PreAuthorize("@ss.hasPermission('wms:inventoryinit-request-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobDetailController.java index 7a7a523f..9777ad0f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.inventorymoveJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.inventorymoveJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -90,7 +90,19 @@ public class InventorymoveJobDetailController { PageResult pageResult = inventorymoveJobDetailService.getInventorymoveJobDetailPage(pageVO); return success(InventorymoveJobDetailConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得库存转移任务子分页") + @PreAuthorize("@ss.hasPermission('wms:inventorymove-job-detail:query')") + public CommonResult> getInventorymoveJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = inventorymoveJobDetailService.getInventorymoveJobDetailSenior(conditions); + PageResult result = InventorymoveJobDetailConvert.INSTANCE.convertPage(pageResult); + for(InventorymoveJobDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出库存转移任务子 Excel") @PreAuthorize("@ss.hasPermission('wms:inventorymove-job-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobMainController.java index e26e60e2..39ded59d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobMainController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.inventorymoveJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.inventorymoveJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,6 +92,20 @@ public class InventorymoveJobMainController { return success(InventorymoveJobMainConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得库存转移任务主分页") + @PreAuthorize("@ss.hasPermission('wms:inventorymove-job-main:query')") + public CommonResult> getInventorymoveJobMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = inventorymoveJobMainService.getInventorymoveJobMainSenior(conditions); + PageResult result = InventorymoveJobMainConvert.INSTANCE.convertPage(pageResult); + for(InventorymoveJobMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + @GetMapping("/export-excel") @Operation(summary = "导出库存转移任务主 Excel") @PreAuthorize("@ss.hasPermission('wms:inventorymove-job-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordDetailController.java index c95f0be8..e138ae9e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.inventorymoveRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.inventorymoveRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -94,6 +94,20 @@ public class InventorymoveRecordDetailController { return success(InventorymoveRecordDetailConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得库存转移记录子分页") + @PreAuthorize("@ss.hasPermission('wms:inventorymove-record-detail:query')") + public CommonResult> getInventorymoveRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = inventorymoveRecordDetailService.getInventorymoveRecordDetailSenior(conditions); + PageResult result = InventorymoveRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(InventorymoveRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + @GetMapping("/export-excel") @Operation(summary = "导出库存转移记录子 Excel") @PreAuthorize("@ss.hasPermission('wms:inventorymove-record-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordMainController.java index 88cc6211..eb8016c6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordMainController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.inventorymoveRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.inventorymoveRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -91,7 +91,20 @@ public class InventorymoveRecordMainController { PageResult pageResult = inventorymoveRecordMainService.getInventorymoveRecordMainPage(pageVO); return success(InventorymoveRecordMainConvert.INSTANCE.convertPage(pageResult)); } - + + @PostMapping("/senior") + @Operation(summary = "高级搜索获得库存转移记录主分页") + @PreAuthorize("@ss.hasPermission('wms:inventorymove-record-main:query')") + public CommonResult> getInventorymoveRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = inventorymoveRecordMainService.getInventorymoveRecordMainSenior(conditions); + PageResult result = InventorymoveRecordMainConvert.INSTANCE.convertPage(pageResult); + for(InventorymoveRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出库存转移记录主 Excel") @PreAuthorize("@ss.hasPermission('wms:inventorymove-record-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/InventorymoveRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/InventorymoveRequestDetailController.java index 585c24de..2d40239f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/InventorymoveRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/InventorymoveRequestDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.inventorymoveRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.inventorymoveRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -90,7 +90,20 @@ public class InventorymoveRequestDetailController { PageResult pageResult = inventorymoveRequestDetailService.getInventorymoveRequestDetailPage(pageVO); return success(InventorymoveRequestDetailConvert.INSTANCE.convertPage(pageResult)); } - + + @PostMapping("/senior") + @Operation(summary = "高级搜索获得库存转移申请子分页") + @PreAuthorize("@ss.hasPermission('wms:inventorymove-request-detail:query')") + public CommonResult> getInventorymoveRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = inventorymoveRequestDetailService.getInventorymoveRequestDetailSenior(conditions); + PageResult result = InventorymoveRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(InventorymoveRequestDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出库存转移申请子 Excel") @PreAuthorize("@ss.hasPermission('wms:inventorymove-request-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/InventorymoveRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/InventorymoveRequestMainController.java index 2a4bc880..50fd7ebe 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/InventorymoveRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/InventorymoveRequestMainController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.inventorymoveRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.inventorymoveRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -91,7 +91,20 @@ public class InventorymoveRequestMainController { PageResult pageResult = inventorymoveRequestMainService.getInventorymoveRequestMainPage(pageVO); return success(InventorymoveRequestMainConvert.INSTANCE.convertPage(pageResult)); } - + + @PostMapping("/senior") + @Operation(summary = "高级搜索获得库存转移申请主分页") + @PreAuthorize("@ss.hasPermission('wms:inventorymove-request-main:query')") + public CommonResult> getInventorymoveRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = inventorymoveRequestMainService.getInventorymoveRequestMainSenior(conditions); + PageResult result = InventorymoveRequestMainConvert.INSTANCE.convertPage(pageResult); + for(InventorymoveRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出库存转移申请主 Excel") @PreAuthorize("@ss.hasPermission('wms:inventorymove-request-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobDetailController.java index 2c0f9869..82e34c52 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.issueJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.issueJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -90,7 +90,20 @@ public class IssueJobDetailController { PageResult pageResult = issueJobDetailService.getIssueJobDetailPage(pageVO); return success(IssueJobDetailConvert.INSTANCE.convertPage(pageResult)); } - + + @PostMapping("/senior") + @Operation(summary = "高级搜索获得发料任务子分页") + @PreAuthorize("@ss.hasPermission('wms:issue-job-detail:query')") + public CommonResult> getIssueJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = issueJobDetailService.getIssueJobDetailSenior(conditions); + PageResult result = IssueJobDetailConvert.INSTANCE.convertPage(pageResult); + for(IssueJobDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出发料任务子 Excel") @PreAuthorize("@ss.hasPermission('wms:issue-job-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobMainController.java index 6d9fe2b7..dc32f486 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobMainController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.issueJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.issueJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,6 +92,19 @@ public class IssueJobMainController { return success(IssueJobMainConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得发料任务主分页分页") + @PreAuthorize("@ss.hasPermission('wms:accountcalendar:query')") + public CommonResult> getIssueJobMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = issueJobMainService.getIssueJobMainSenior(conditions); + PageResult result = IssueJobMainConvert.INSTANCE.convertPage(pageResult); + for(IssueJobMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出发料任务主 Excel") @PreAuthorize("@ss.hasPermission('wms:issue-job-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/IssueRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/IssueRecordDetailController.java index b5107747..cf251b29 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/IssueRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/IssueRecordDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.issueRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.issueRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -90,7 +90,19 @@ public class IssueRecordDetailController { PageResult pageResult = issueRecordDetailService.getIssueRecordDetailPage(pageVO); return success(IssueRecordDetailConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得发料记录子分页") + @PreAuthorize("@ss.hasPermission('wms:issue-record-detail:query')") + public CommonResult> getIssueRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = issueRecordDetailService.getIssueRecordDetailSenior(conditions); + PageResult result = IssueRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(IssueRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出发料记录子 Excel") @PreAuthorize("@ss.hasPermission('wms:issue-record-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/IssueRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/IssueRecordMainController.java index 10dd6b8c..d3711b7e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/IssueRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/IssueRecordMainController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.issueRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.issueRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,6 +92,19 @@ public class IssueRecordMainController { return success(IssueRecordMainConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得发料记录主分页") + @PreAuthorize("@ss.hasPermission('wms:issue-record-main:query')") + public CommonResult> getIssueRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = issueRecordMainService.getIssueRecordMainSenior(conditions); + PageResult result = IssueRecordMainConvert.INSTANCE.convertPage(pageResult); + for(IssueRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出发料记录主 Excel") @PreAuthorize("@ss.hasPermission('wms:issue-record-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/IssueRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/IssueRequestDetailController.java index 3c4f227d..257ab3c6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/IssueRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/IssueRequestDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.issueRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.issueRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,6 +92,20 @@ public class IssueRequestDetailController { return success(IssueRequestDetailConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得发料申请子分页") + @PreAuthorize("@ss.hasPermission('wms:issue-request-detail:query')") + public CommonResult> getIssueRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = issueRequestDetailService.getIssueRequestDetailSenior(conditions); + PageResult result = IssueRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(IssueRequestDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + @GetMapping("/export-excel") @Operation(summary = "导出发料申请子 Excel") @PreAuthorize("@ss.hasPermission('wms:issue-request-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/IssueRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/IssueRequestMainController.java index a1e5f78e..cb39848c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/IssueRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/IssueRequestMainController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.issueRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.issueRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -91,7 +91,21 @@ public class IssueRequestMainController { PageResult pageResult = issueRequestMainService.getIssueRequestMainPage(pageVO); return success(IssueRequestMainConvert.INSTANCE.convertPage(pageResult)); } - + + @PostMapping("/senior") + @Operation(summary = "高级搜索获得发料申请主分页") + @PreAuthorize("@ss.hasPermission('wms:issue-request-main:query')") + public CommonResult> getIssueRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = issueRequestMainService.getIssueRequestMainSenior(conditions); + PageResult result = IssueRequestMainConvert.INSTANCE.convertPage(pageResult); + for(IssueRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + @GetMapping("/export-excel") @Operation(summary = "导出发料申请主 Excel") @PreAuthorize("@ss.hasPermission('wms:issue-request-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/ItempackagingController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/ItempackagingController.java index 895aff75..2b3d3b8a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/ItempackagingController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/ItempackagingController.java @@ -1,6 +1,7 @@ package com.win.module.wms.controller.itempackaging; import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; @@ -86,13 +87,26 @@ public class ItempackagingController { } @GetMapping("/page") - @Operation(summary = "获得物品包装信息 分页") + @Operation(summary = "获得物品包装信息分页") @PreAuthorize("@ss.hasPermission('wms:itempackaging:query')") public CommonResult> getItempackagingPage(@Valid ItempackagingPageReqVO pageVO) { PageResult pageResult = itempackagingService.getItempackagingPage(pageVO); return success(ItempackagingConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品包装信息分页") + @PreAuthorize("@ss.hasPermission('wms:itempackaging:query')") + public CommonResult> getItempackagingSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = itempackagingService.getItempackagingSenior(conditions); + PageResult result = ItempackagingConvert.INSTANCE.convertPage(pageResult); + for(ItempackagingRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出物品包装信息 Excel") @PreAuthorize("@ss.hasPermission('wms:itempackaging:export')") @@ -107,7 +121,22 @@ public class ItempackagingController { //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } - ExcelUtils.write(response, "物品包装信息 .xls", "数据", ItempackagingExcelVO.class, datas); + Map mapDropDown = new HashMap<>(); + String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); + mapDropDown.put(1, uom); + String[] description = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); + mapDropDown.put(2, description);; + String[] altPackUnit1 = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); + mapDropDown.put(5, altPackUnit1);; + String[] altPackUnit2 = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); + mapDropDown.put(7, altPackUnit2);; + String[] altPackUnit3 = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); + mapDropDown.put(9, altPackUnit3);; + String[] altPackUnit4 = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); + mapDropDown.put(11, altPackUnit4);; + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(13, available);; + ExcelUtils.write(response, "物品包装信息 .xls", "数据", ItempackagingExcelVO.class, datas,mapDropDown); } @GetMapping("/get-import-template") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/jobsetting/JobsettingController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/jobsetting/JobsettingController.java index 6524c936..158e8ef8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/jobsetting/JobsettingController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/jobsetting/JobsettingController.java @@ -1,6 +1,7 @@ package com.win.module.wms.controller.jobsetting; import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; @@ -111,6 +112,20 @@ public class JobsettingController { ExcelUtils.write(response, "任务设置.xls", "数据", JobsettingExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得任务设置分页") + @PreAuthorize("@ss.hasPermission('wms:jobsetting:query')") + public CommonResult> getJobsettingSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = jobsettingService.getJobsettingSenior(conditions); + PageResult result = JobsettingConvert.INSTANCE.convertPage(pageResult); + for(JobsettingRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + @GetMapping("/get-import-template") @Operation(summary = "获得导入任务设置模板") public void importTemplate(HttpServletResponse response) throws IOException { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labeltype/LabeltypeController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labeltype/LabeltypeController.java index e0ca7166..986d9f0a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labeltype/LabeltypeController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labeltype/LabeltypeController.java @@ -1,6 +1,7 @@ package com.win.module.wms.controller.labeltype; import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; @@ -88,7 +89,19 @@ public class LabeltypeController { PageResult pageResult = labeltypeService.getLabeltypePage(pageVO); return success(LabeltypeConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得标签定义分页") + @PreAuthorize("@ss.hasPermission('wms:labeltypeService:query')") + public CommonResult> getLabeltypeSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = labeltypeService.getLabeltypeSenior(conditions); + PageResult result = LabeltypeConvert.INSTANCE.convertPage(pageResult); + for(LabeltypeRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出标签定义 Excel") @PreAuthorize("@ss.hasPermission('wms:labeltypeService:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labeltype/vo/LabeltypeRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labeltype/vo/LabeltypeRespVO.java index 2c289263..b8f632e4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labeltype/vo/LabeltypeRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labeltype/vo/LabeltypeRespVO.java @@ -3,6 +3,8 @@ package com.win.module.wms.controller.labeltype.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import java.time.LocalDateTime; + @Schema(description = "管理后台 - 标签定义 Response VO") @Data @EqualsAndHashCode(callSuper = true) @@ -12,4 +14,9 @@ public class LabeltypeRespVO extends LabeltypeBaseVO { @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "5848") private Long id; + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + private LocalDateTime createTime; + + @Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED) + private String creator; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/LocationController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/LocationController.java index 94b74076..19d8e128 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/LocationController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/LocationController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.location; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.win.framework.common.exception.ErrorCode; import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; @@ -10,10 +10,7 @@ import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.location.vo.*; -import com.win.module.wms.controller.rule.vo.RuleRespVO; import com.win.module.wms.convert.location.LocationConvert; -import com.win.module.wms.dal.dataobject.balance.BalanceDO; -import com.win.module.wms.dal.dataobject.expectout.ExpectoutDO; import com.win.module.wms.dal.dataobject.location.LocationDO; import com.win.module.wms.dal.mysql.balance.BalanceMapper; import com.win.module.wms.dal.mysql.expectout.ExpectoutMapper; @@ -114,6 +111,20 @@ public class LocationController { return success(LocationConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得账期日历分页") + @PreAuthorize("@ss.hasPermission('wms:accountcalendar:query')") + public CommonResult> getLocationSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = locationService.getLocationSenior(conditions); + PageResult result = LocationConvert.INSTANCE.convertPage(pageResult); + for(LocationRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + @GetMapping("/export-excel") @Operation(summary = "导出库位 Excel") @PreAuthorize("@ss.hasPermission('wms:location:export')") @@ -128,7 +139,18 @@ public class LocationController { //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } - ExcelUtils.write(response, "库位.xls", "数据", LocationExcelVO.class, datas); + Map mapDropDown = new HashMap<>(); + String[] warehouseCode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.WAREHOUSE_TYPE); + mapDropDown.put(3, warehouseCode); + String[] areaCode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.AREA_TYPE); + mapDropDown.put(4, areaCode); + String[] erpLocationCode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.ERP_LOCATION); + mapDropDown.put(6, erpLocationCode); + String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LOCATION_TYPE); + mapDropDown.put(7, type); + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(18, available);; + ExcelUtils.write(response, "库位.xls", "数据", LocationExcelVO.class, datas,mapDropDown); } @GetMapping("/get-import-template") @Operation(summary = "获得导入库位模板") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationcapacity/LocationcapacityController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationcapacity/LocationcapacityController.java index 35a45950..884d3ca3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationcapacity/LocationcapacityController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationcapacity/LocationcapacityController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.locationcapacity; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.locationcapacity.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,6 +92,19 @@ public class LocationcapacityController { return success(LocationcapacityConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得库位容量分页") + @PreAuthorize("@ss.hasPermission('wms:locationcapacity:query')") + public CommonResult> getLocationcapacitySenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = locationcapacityService.getLocationcapacitySenior(conditions); + PageResult result = LocationcapacityConvert.INSTANCE.convertPage(pageResult); + for(LocationcapacityRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出库位容量 Excel") @PreAuthorize("@ss.hasPermission('wms:locationcapacity:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationcapacity/vo/LocationcapacityRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationcapacity/vo/LocationcapacityRespVO.java index a6e85f48..3bc46451 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationcapacity/vo/LocationcapacityRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationcapacity/vo/LocationcapacityRespVO.java @@ -3,10 +3,17 @@ package com.win.module.wms.controller.locationcapacity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import java.time.LocalDateTime; + @Schema(description = "管理后台 - 库位容量 Response VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class LocationcapacityRespVO extends LocationcapacityBaseVO { + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + private LocalDateTime createTime; + + @Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED) + private String creator; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationgroup/LocationgroupController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationgroup/LocationgroupController.java index 8d48f29f..d9e114dd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationgroup/LocationgroupController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationgroup/LocationgroupController.java @@ -1,6 +1,7 @@ package com.win.module.wms.controller.locationgroup; import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; @@ -92,6 +93,19 @@ public class LocationgroupController { return success(LocationgroupConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得库位组分页") + @PreAuthorize("@ss.hasPermission('wms:locationgroup:query')") + public CommonResult> getLocationgroupSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = locationgroupService.getLocationgroupSenior(conditions); + PageResult result = LocationgroupConvert.INSTANCE.convertPage(pageResult); + for(LocationgroupRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出库位组 Excel") @PreAuthorize("@ss.hasPermission('wms:locationgroup:export')") @@ -106,7 +120,14 @@ public class LocationgroupController { //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } - ExcelUtils.write(response, "库位组.xls", "数据", LocationgroupExcelVO.class, datas); + Map mapDropDown = new HashMap<>(); + String[] warehouseCode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.WAREHOUSE_TYPE); + mapDropDown.put(3, warehouseCode); + String[] areaCode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.AREA_TYPE); + mapDropDown.put(4, areaCode); + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PACK_UNIT); + mapDropDown.put(5, available);; + ExcelUtils.write(response, "库位组.xls", "数据", LocationgroupExcelVO.class, datas,mapDropDown); } @GetMapping("/get-import-template") @Operation(summary = "获得导入库位组模板") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/OfflinesettlementRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/OfflinesettlementRecordDetailController.java index 36377d6d..40ea6a62 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/OfflinesettlementRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/OfflinesettlementRecordDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.offlinesettlementRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.offlinesettlementRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -91,6 +91,19 @@ public class OfflinesettlementRecordDetailController { return success(OfflinesettlementRecordDetailConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得下线结算记录子分页") + @PreAuthorize("@ss.hasPermission('wms:offlinesettlement-record-detail:query')") + public CommonResult> getOfflinesettlementRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = offlinesettlementRecordDetailService.getOfflinesettlementRecordDetailSenior(conditions); + PageResult result = OfflinesettlementRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(OfflinesettlementRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出下线结算记录子 Excel") @PreAuthorize("@ss.hasPermission('wms:offlinesettlement-record-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/OfflinesettlementRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/OfflinesettlementRecordMainController.java index c1ef89a9..237b3c44 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/OfflinesettlementRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/OfflinesettlementRecordMainController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.offlinesettlementRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.offlinesettlementRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,6 +92,19 @@ public class OfflinesettlementRecordMainController { return success(OfflinesettlementRecordMainConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得下线结算记录主分页") + @PreAuthorize("@ss.hasPermission('wms:offlinesettlement-record-main:query')") + public CommonResult> getOfflinesettlementRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = offlinesettlementRecordMainService.getOfflinesettlementRecordMainSenior(conditions); + PageResult result = OfflinesettlementRecordMainConvert.INSTANCE.convertPage(pageResult); + for(OfflinesettlementRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出下线结算记录主 Excel") @PreAuthorize("@ss.hasPermission('wms:offlinesettlement-record-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRequest/OfflinesettlementRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRequest/OfflinesettlementRequestDetailController.java index baa45795..d45f8774 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRequest/OfflinesettlementRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRequest/OfflinesettlementRequestDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.offlinesettlementRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.offlinesettlementRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,6 +92,19 @@ public class OfflinesettlementRequestDetailController { return success(OfflinesettlementRequestDetailConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得下线结算申请子分页") + @PreAuthorize("@ss.hasPermission('wms:offlinesettlement-request-detail:query')") + public CommonResult> getOfflinesettlementRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = offlinesettlementRequestDetailService.getOfflinesettlementRequestDetailSenior(conditions); + PageResult result = OfflinesettlementRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(OfflinesettlementRequestDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出下线结算申请子 Excel") @PreAuthorize("@ss.hasPermission('wms:offlinesettlement-request-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRequest/OfflinesettlementRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRequest/OfflinesettlementRequestMainController.java index 50adf550..f87da9a4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRequest/OfflinesettlementRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRequest/OfflinesettlementRequestMainController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.offlinesettlementRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.offlinesettlementRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,6 +92,19 @@ public class OfflinesettlementRequestMainController { return success(OfflinesettlementRequestMainConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得下线结算申请主分页") + @PreAuthorize("@ss.hasPermission('wms:offlinesettlement-request-main:query')") + public CommonResult> getOfflinesettlementRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = offlinesettlementRequestMainService.getOfflinesettlementRequestMainSenior(conditions); + PageResult result = OfflinesettlementRequestMainConvert.INSTANCE.convertPage(pageResult); + for(OfflinesettlementRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出下线结算申请主 Excel") @PreAuthorize("@ss.hasPermission('wms:offlinesettlement-request-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/OnlinesettlementRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/OnlinesettlementRecordDetailController.java index 0b3b0ef8..69b1c669 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/OnlinesettlementRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/OnlinesettlementRecordDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.onlinesettlementRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.onlinesettlementRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,6 +92,19 @@ public class OnlinesettlementRecordDetailController { return success(OnlinesettlementRecordDetailConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得上线结算记录子分页") + @PreAuthorize("@ss.hasPermission('wms:onlinesettlement-record-detail:query')") + public CommonResult> getOnlinesettlementRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = onlinesettlementRecordDetailService.getOnlinesettlementRecordDetailSenior(conditions); + PageResult result = OnlinesettlementRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(OnlinesettlementRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出上线结算记录子 Excel") @PreAuthorize("@ss.hasPermission('wms:onlinesettlement-record-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/OnlinesettlementRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/OnlinesettlementRecordMainController.java index ab781efc..2b07915e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/OnlinesettlementRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/OnlinesettlementRecordMainController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.onlinesettlementRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.onlinesettlementRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,6 +92,20 @@ public class OnlinesettlementRecordMainController { return success(OnlinesettlementRecordMainConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得上线结算记录主分页") + @PreAuthorize("@ss.hasPermission('wms:onlinesettlement-record-main:query')") + public CommonResult> getOnlinesettlementRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = onlinesettlementRecordMainService.getOnlinesettlementRecordMainSenior(conditions); + PageResult result = OnlinesettlementRecordMainConvert.INSTANCE.convertPage(pageResult); + for(OnlinesettlementRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + @GetMapping("/export-excel") @Operation(summary = "导出上线结算记录主 Excel") @PreAuthorize("@ss.hasPermission('wms:onlinesettlement-record-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRequest/OnlinesettlementRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRequest/OnlinesettlementRequestDetailController.java index 4849a238..7308e0ca 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRequest/OnlinesettlementRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRequest/OnlinesettlementRequestDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.onlinesettlementRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.onlinesettlementRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,6 +92,20 @@ public class OnlinesettlementRequestDetailController { return success(OnlinesettlementRequestDetailConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得上线结算申请子分页") + @PreAuthorize("@ss.hasPermission('wms:onlinesettlement-request-detail:query')") + public CommonResult> getOnlinesettlementRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = onlinesettlementRequestDetailService.getOnlinesettlementRequestDetailSenior(conditions); + PageResult result = OnlinesettlementRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(OnlinesettlementRequestDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + @GetMapping("/export-excel") @Operation(summary = "导出上线结算申请子 Excel") @PreAuthorize("@ss.hasPermission('wms:onlinesettlement-request-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRequest/OnlinesettlementRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRequest/OnlinesettlementRequestMainController.java index ecaf9821..000c3d43 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRequest/OnlinesettlementRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRequest/OnlinesettlementRequestMainController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.onlinesettlementRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.onlinesettlementRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -92,6 +92,19 @@ public class OnlinesettlementRequestMainController { return success(OnlinesettlementRequestMainConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得上线结算申请主分页") + @PreAuthorize("@ss.hasPermission('wms:onlinesettlement-request-main:query')") + public CommonResult> getOnlinesettlementRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = onlinesettlementRequestMainService.getOnlinesettlementRequestMainSenior(conditions); + PageResult result = OnlinesettlementRequestMainConvert.INSTANCE.convertPage(pageResult); + for(OnlinesettlementRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出上线结算申请主 Excel") @PreAuthorize("@ss.hasPermission('wms:onlinesettlement-request-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/owner/OwnerController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/owner/OwnerController.java index f9955b09..012d6523 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/owner/OwnerController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/owner/OwnerController.java @@ -1,6 +1,7 @@ package com.win.module.wms.controller.owner; import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; @@ -94,6 +95,19 @@ public class OwnerController { return success(OwnerConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得货主分页") + @PreAuthorize("@ss.hasPermission('wms:owner:query')") + public CommonResult> getOwnerSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = ownerService.getOwnerSenior(conditions); + PageResult result = OwnerConvert.INSTANCE.convertPage(pageResult); + for(OwnerRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出货主 Excel") @PreAuthorize("@ss.hasPermission('wms:owner:export')") @@ -108,7 +122,14 @@ public class OwnerController { //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } - ExcelUtils.write(response, "货主.xls", "数据", OwnerExcelVO.class, datas); + Map mapDropDown = new HashMap<>(); + String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY); + mapDropDown.put(11, currency); + String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.OWNER_TYPE); + mapDropDown.put(13, type);; + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(14, available);; + ExcelUtils.write(response, "货主.xls", "数据", OwnerExcelVO.class, datas,mapDropDown); } @GetMapping("/get-import-template") @Operation(summary = "获得导入货主模板") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/dock/DockMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/dock/DockMapper.java index bcd94e53..cc340543 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/dock/DockMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/dock/DockMapper.java @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.dock; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.mapper.BaseMapperX; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.dock.vo.DockExportReqVO; import com.win.module.wms.controller.dock.vo.DockPageReqVO; import com.win.module.wms.dal.dataobject.dock.DockDO; @@ -38,7 +40,9 @@ public interface DockMapper extends BaseMapperX { .eqIfPresent(DockDO::getCreator, reqVO.getCreator()) .orderByDesc(DockDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(DockExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(DockDO::getCode, reqVO.getCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/documentSwitch/SwitchMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/documentSwitch/SwitchMapper.java index 63d4b9ae..65baf3b5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/documentSwitch/SwitchMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/documentSwitch/SwitchMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.documentSwitch; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.documentSwitch.vo.SwitchExportReqVO; import com.win.module.wms.controller.documentSwitch.vo.SwitchPageReqVO; import com.win.module.wms.dal.dataobject.documentSwitch.SwitchDO; @@ -27,6 +29,10 @@ public interface SwitchMapper extends BaseMapperX { .orderByDesc(SwitchDO::getId)); } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(SwitchExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(SwitchDO::getCode, reqVO.getCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/documentsetting/DocumentsettingMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/documentsetting/DocumentsettingMapper.java index 84f8a392..e255ece2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/documentsetting/DocumentsettingMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/documentsetting/DocumentsettingMapper.java @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.documentsetting; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.mapper.BaseMapperX; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.documentsetting.vo.DocumentsettingExportReqVO; import com.win.module.wms.controller.documentsetting.vo.DocumentsettingPageReqVO; import com.win.module.wms.dal.dataobject.documentsetting.DocumentsettingDO; @@ -39,7 +41,9 @@ public interface DocumentsettingMapper extends BaseMapperX { .eqIfPresent(DocumentsettingDO::getIsSoftDeleted, reqVO.getIsSoftDeleted()) .orderByDesc(DocumentsettingDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(DocumentsettingExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(DocumentsettingDO::getCode, reqVO.getCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/expectin/ExpectinMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/expectin/ExpectinMapper.java index 8b981803..a3a25eeb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/expectin/ExpectinMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/expectin/ExpectinMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.expectin; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.expectin.vo.ExpectinExportReqVO; import com.win.module.wms.controller.expectin.vo.ExpectinPageReqVO; import com.win.module.wms.dal.dataobject.expectin.ExpectinDO; @@ -32,7 +34,9 @@ public interface ExpectinMapper extends BaseMapperX { .eqIfPresent(ExpectinDO::getOwnerCode, reqVO.getOwnerCode()) .orderByDesc(ExpectinDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ExpectinExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ExpectinDO::getJobNumber, reqVO.getJobNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/expectout/ExpectoutMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/expectout/ExpectoutMapper.java index ddc5b874..fbc257c1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/expectout/ExpectoutMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/expectout/ExpectoutMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.expectout; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.expectout.vo.ExpectoutExportReqVO; import com.win.module.wms.controller.expectout.vo.ExpectoutPageReqVO; import com.win.module.wms.dal.dataobject.expectout.ExpectoutDO; @@ -33,7 +35,9 @@ public interface ExpectoutMapper extends BaseMapperX { .eqIfPresent(ExpectoutDO::getOwnerCode, reqVO.getOwnerCode()) .orderByDesc(ExpectoutDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ExpectoutExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ExpectoutDO::getJobNumber, reqVO.getJobNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectJob/InspectJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectJob/InspectJobDetailMapper.java index d3764393..37dafd94 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectJob/InspectJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectJob/InspectJobDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inspectJob; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailExportReqVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.inspectJob.InspectJobDetailDO; @@ -37,7 +39,9 @@ public interface InspectJobDetailMapper extends BaseMapperX .eqIfPresent(InspectJobDetailDO::getUom, reqVO.getUom()) .orderByDesc(InspectJobDetailDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(InspectJobDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(InspectJobDetailDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectJob/InspectJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectJob/InspectJobMainMapper.java index 186ac391..18b303a0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectJob/InspectJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectJob/InspectJobMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inspectJob; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.inspectJob.vo.InspectJobMainExportReqVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobMainPageReqVO; import com.win.module.wms.dal.dataobject.inspectJob.InspectJobMainDO; @@ -69,6 +71,10 @@ public interface InspectJobMainMapper extends BaseMapperX { .orderByDesc(InspectJobMainDO::getId)); } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(InspectJobMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(InspectJobMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRecord/InspectRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRecord/InspectRecordDetailMapper.java index 768f6d5b..ee22d652 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRecord/InspectRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRecord/InspectRecordDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inspectRecord; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailExportReqVO; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordDetailDO; @@ -53,7 +55,9 @@ public interface InspectRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(InspectRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(InspectRecordDetailDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRecord/InspectRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRecord/InspectRecordMainMapper.java index 24aeceda..e47c0f9e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRecord/InspectRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRecord/InspectRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inspectRecord; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainExportReqVO; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.inspectRecord.InspectRecordMainDO; @@ -60,6 +62,10 @@ public interface InspectRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(InspectRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(InspectRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRequest/InspectRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRequest/InspectRequestDetailMapper.java index e42b84d6..5c0c97a3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRequest/InspectRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRequest/InspectRequestDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inspectRequest; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailExportReqVO; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestDetailDO; @@ -36,6 +38,10 @@ public interface InspectRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(InspectRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(InspectRequestDetailDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRequest/InspectRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRequest/InspectRequestMainMapper.java index fb812a6c..be64ad21 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRequest/InspectRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inspectRequest/InspectRequestMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inspectRequest; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestMainExportReqVO; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestMainDO; @@ -53,7 +55,9 @@ public interface InspectRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(InspectRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(InspectRequestMainDO::getPurchaseReceiptRecordNumber, reqVO.getPurchaseReceiptRecordNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorychangeRecord/InventorychangeRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorychangeRecord/InventorychangeRecordDetailMapper.java index 3aa4982e..305147e8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorychangeRecord/InventorychangeRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorychangeRecord/InventorychangeRecordDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inventorychangeRecord; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.inventorychangeRecord.vo.InventorychangeRecordDetailExportReqVO; import com.win.module.wms.controller.inventorychangeRecord.vo.InventorychangeRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.inventorychangeRecord.InventorychangeRecordDetailDO; @@ -59,7 +61,9 @@ public interface InventorychangeRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(InventorychangeRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(InventorychangeRecordDetailDO::getLocationCode, reqVO.getLocationCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorychangeRecord/InventorychangeRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorychangeRecord/InventorychangeRecordMainMapper.java index 68226d7a..7f456250 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorychangeRecord/InventorychangeRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorychangeRecord/InventorychangeRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inventorychangeRecord; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.inventorychangeRecord.vo.InventorychangeRecordMainExportReqVO; import com.win.module.wms.controller.inventorychangeRecord.vo.InventorychangeRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.inventorychangeRecord.InventorychangeRecordMainDO; @@ -39,7 +41,9 @@ public interface InventorychangeRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(InventorychangeRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(InventorychangeRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorychangeRequest/InventorychangeRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorychangeRequest/InventorychangeRequestDetailMapper.java index e45b1742..c9de03c5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorychangeRequest/InventorychangeRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorychangeRequest/InventorychangeRequestDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inventorychangeRequest; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.inventorychangeRequest.vo.InventorychangeRequestDetailExportReqVO; import com.win.module.wms.controller.inventorychangeRequest.vo.InventorychangeRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.inventorychangeRequest.InventorychangeRequestDetailDO; @@ -58,7 +60,9 @@ public interface InventorychangeRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(InventorychangeRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(InventorychangeRequestDetailDO::getLocationGroupCode, reqVO.getLocationGroupCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorychangeRequest/InventorychangeRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorychangeRequest/InventorychangeRequestMainMapper.java index 3ed16700..462f310c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorychangeRequest/InventorychangeRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorychangeRequest/InventorychangeRequestMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inventorychangeRequest; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.inventorychangeRequest.vo.InventorychangeRequestMainExportReqVO; import com.win.module.wms.controller.inventorychangeRequest.vo.InventorychangeRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.inventorychangeRequest.InventorychangeRequestMainDO; @@ -38,7 +40,9 @@ public interface InventorychangeRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(InventorychangeRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(InventorychangeRequestMainDO::getWarehouseCode, reqVO.getWarehouseCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventoryinitRecord/InventoryinitRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventoryinitRecord/InventoryinitRecordDetailMapper.java index 1e43bc43..c0b6dc64 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventoryinitRecord/InventoryinitRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventoryinitRecord/InventoryinitRecordDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inventoryinitRecord; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.inventoryinitRecord.vo.InventoryinitRecordDetailExportReqVO; import com.win.module.wms.controller.inventoryinitRecord.vo.InventoryinitRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.inventoryinitRecord.InventoryinitRecordDetailDO; @@ -52,7 +54,9 @@ public interface InventoryinitRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(InventoryinitRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(InventoryinitRecordDetailDO::getOwnerCode, reqVO.getOwnerCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventoryinitRecord/InventoryinitRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventoryinitRecord/InventoryinitRecordMainMapper.java index 8a8e13df..b8f8ce37 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventoryinitRecord/InventoryinitRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventoryinitRecord/InventoryinitRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inventoryinitRecord; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.inventoryinitRecord.vo.InventoryinitRecordMainExportReqVO; import com.win.module.wms.controller.inventoryinitRecord.vo.InventoryinitRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.inventoryinitRecord.InventoryinitRecordMainDO; @@ -39,7 +41,9 @@ public interface InventoryinitRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(InventoryinitRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(InventoryinitRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventoryinitRequest/InventoryinitRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventoryinitRequest/InventoryinitRequestDetailMapper.java index e43594d8..1e4a71d2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventoryinitRequest/InventoryinitRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventoryinitRequest/InventoryinitRequestDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inventoryinitRequest; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.inventoryinitRequest.vo.InventoryinitRequestDetailExportReqVO; import com.win.module.wms.controller.inventoryinitRequest.vo.InventoryinitRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.inventoryinitRequest.InventoryinitRequestDetailDO; @@ -49,7 +51,9 @@ public interface InventoryinitRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(InventoryinitRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(InventoryinitRequestDetailDO::getOwnerCode, reqVO.getOwnerCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventoryinitRequest/InventoryinitRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventoryinitRequest/InventoryinitRequestMainMapper.java index 42ca5f28..d3a151f7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventoryinitRequest/InventoryinitRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventoryinitRequest/InventoryinitRequestMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inventoryinitRequest; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.inventoryinitRequest.vo.InventoryinitRequestMainExportReqVO; import com.win.module.wms.controller.inventoryinitRequest.vo.InventoryinitRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.inventoryinitRequest.InventoryinitRequestMainDO; @@ -38,7 +40,9 @@ public interface InventoryinitRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(InventoryinitRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(InventoryinitRequestMainDO::getWarehouseCode, reqVO.getWarehouseCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveJob/InventorymoveJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveJob/InventorymoveJobDetailMapper.java index 56bd0fa6..7a65e9c9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveJob/InventorymoveJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveJob/InventorymoveJobDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inventorymoveJob; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobDetailExportReqVO; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.inventorymoveJob.InventorymoveJobDetailDO; @@ -43,7 +45,9 @@ public interface InventorymoveJobDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(InventorymoveJobDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(InventorymoveJobDetailDO::getItemCode, reqVO.getItemCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveJob/InventorymoveJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveJob/InventorymoveJobMainMapper.java index 7bf8eba9..17988377 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveJob/InventorymoveJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveJob/InventorymoveJobMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inventorymoveJob; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobMainExportReqVO; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobMainPageReqVO; import com.win.module.wms.dal.dataobject.inventorymoveJob.InventorymoveJobMainDO; @@ -60,7 +62,9 @@ public interface InventorymoveJobMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(InventorymoveJobMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(InventorymoveJobMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRecord/InventorymoveRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRecord/InventorymoveRecordDetailMapper.java index 3bfb8cb5..19a62444 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRecord/InventorymoveRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRecord/InventorymoveRecordDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inventorymoveRecord; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.inventorymoveRecord.vo.InventorymoveRecordDetailExportReqVO; import com.win.module.wms.controller.inventorymoveRecord.vo.InventorymoveRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.inventorymoveRecord.InventorymoveRecordDetailDO; @@ -53,7 +55,9 @@ public interface InventorymoveRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(InventorymoveRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(InventorymoveRecordDetailDO::getOnTheWayLocationCode, reqVO.getOnTheWayLocationCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRecord/InventorymoveRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRecord/InventorymoveRecordMainMapper.java index 49c8b29d..03577d0a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRecord/InventorymoveRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRecord/InventorymoveRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inventorymoveRecord; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.inventorymoveRecord.vo.InventorymoveRecordMainExportReqVO; import com.win.module.wms.controller.inventorymoveRecord.vo.InventorymoveRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.inventorymoveRecord.InventorymoveRecordMainDO; @@ -46,7 +48,9 @@ public interface InventorymoveRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(InventorymoveRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(InventorymoveRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRequest/InventorymoveRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRequest/InventorymoveRequestDetailMapper.java index 1613ae46..1a3342bc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRequest/InventorymoveRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRequest/InventorymoveRequestDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inventorymoveRequest; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.inventorymoveRequest.vo.InventorymoveRequestDetailExportReqVO; import com.win.module.wms.controller.inventorymoveRequest.vo.InventorymoveRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.inventorymoveRequest.InventorymoveRequestDetailDO; @@ -47,7 +49,9 @@ public interface InventorymoveRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(InventorymoveRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(InventorymoveRequestDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRequest/InventorymoveRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRequest/InventorymoveRequestMainMapper.java index 31c3eb17..b7b85c2d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRequest/InventorymoveRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveRequest/InventorymoveRequestMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.inventorymoveRequest; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.inventorymoveRequest.vo.InventorymoveRequestMainExportReqVO; import com.win.module.wms.controller.inventorymoveRequest.vo.InventorymoveRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.inventorymoveRequest.InventorymoveRequestMainDO; @@ -44,7 +46,9 @@ public interface InventorymoveRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(InventorymoveRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(InventorymoveRequestMainDO::getNumber, reqVO.getNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueJob/IssueJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueJob/IssueJobDetailMapper.java index 718212df..31279cf4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueJob/IssueJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueJob/IssueJobDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.issueJob; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.issueJob.vo.IssueJobDetailExportReqVO; import com.win.module.wms.controller.issueJob.vo.IssueJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.issueJob.IssueJobDetailDO; @@ -49,6 +51,9 @@ public interface IssueJobDetailMapper extends BaseMapperX { .orderByDesc(IssueJobDetailDO::getId)); } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(IssueJobDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(IssueJobDetailDO::getProductionLineCode, reqVO.getProductionLineCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueJob/IssueJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueJob/IssueJobMainMapper.java index 7aeb6efb..297aacfa 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueJob/IssueJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueJob/IssueJobMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.issueJob; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.issueJob.vo.IssueJobMainExportReqVO; import com.win.module.wms.controller.issueJob.vo.IssueJobMainPageReqVO; import com.win.module.wms.dal.dataobject.issueJob.IssueJobMainDO; @@ -60,7 +62,9 @@ public interface IssueJobMainMapper extends BaseMapperX { .eqIfPresent(IssueJobMainDO::getAllowModifyBatch, reqVO.getAllowModifyBatch()) .orderByDesc(IssueJobMainDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(IssueJobMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(IssueJobMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRecord/IssueRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRecord/IssueRecordDetailMapper.java index 9dd1a73f..e22985ca 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRecord/IssueRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRecord/IssueRecordDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.issueRecord; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.issueRecord.vo.IssueRecordDetailExportReqVO; import com.win.module.wms.controller.issueRecord.vo.IssueRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.issueRecord.IssueRecordDetailDO; @@ -54,7 +56,9 @@ public interface IssueRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(IssueRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(IssueRecordDetailDO::getProductionLineCode, reqVO.getProductionLineCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRecord/IssueRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRecord/IssueRecordMainMapper.java index bcbffe77..4f95c186 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRecord/IssueRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRecord/IssueRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.issueRecord; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.issueRecord.vo.IssueRecordMainExportReqVO; import com.win.module.wms.controller.issueRecord.vo.IssueRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.issueRecord.IssueRecordMainDO; @@ -47,7 +49,9 @@ public interface IssueRecordMainMapper extends BaseMapperX { .eqIfPresent(IssueRecordMainDO::getAvailable, reqVO.getAvailable()) .orderByDesc(IssueRecordMainDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(IssueRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(IssueRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRequest/IssueRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRequest/IssueRequestDetailMapper.java index ed0a65de..69f49db5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRequest/IssueRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRequest/IssueRequestDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.issueRequest; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.issueRequest.vo.IssueRequestDetailExportReqVO; import com.win.module.wms.controller.issueRequest.vo.IssueRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.issueRequest.IssueRequestDetailDO; @@ -44,7 +46,9 @@ public interface IssueRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(IssueRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(IssueRequestDetailDO::getProductionLineCode, reqVO.getProductionLineCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRequest/IssueRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRequest/IssueRequestMainMapper.java index e3d975dc..f56eafe4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRequest/IssueRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueRequest/IssueRequestMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.issueRequest; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.issueRequest.vo.IssueRequestMainExportReqVO; import com.win.module.wms.controller.issueRequest.vo.IssueRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.issueRequest.IssueRequestMainDO; @@ -45,7 +47,9 @@ public interface IssueRequestMainMapper extends BaseMapperX .eqIfPresent(IssueRequestMainDO::getDirectCreateRecord, reqVO.getDirectCreateRecord()) .orderByDesc(IssueRequestMainDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(IssueRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(IssueRequestMainDO::getWorkshopCode, reqVO.getWorkshopCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/itempackaging/ItempackagingMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/itempackaging/ItempackagingMapper.java index 89a55c6b..1c1512fb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/itempackaging/ItempackagingMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/itempackaging/ItempackagingMapper.java @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.itempackaging; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.mapper.BaseMapperX; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.itempackaging.vo.ItempackagingExportReqVO; import com.win.module.wms.controller.itempackaging.vo.ItempackagingPageReqVO; import com.win.module.wms.dal.dataobject.itempackaging.ItempackagingDO; @@ -40,7 +42,9 @@ public interface ItempackagingMapper extends BaseMapperX { .eqIfPresent(ItempackagingDO::getCreator, reqVO.getCreator()) .orderByDesc(ItempackagingDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ItempackagingExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ItempackagingDO::getItemCode, reqVO.getItemCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/jobsetting/JobsettingMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/jobsetting/JobsettingMapper.java index 43bd082e..e20b0ee1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/jobsetting/JobsettingMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/jobsetting/JobsettingMapper.java @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.jobsetting; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.mapper.BaseMapperX; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.jobsetting.vo.JobsettingExportReqVO; import com.win.module.wms.controller.jobsetting.vo.JobsettingPageReqVO; import com.win.module.wms.dal.dataobject.jobsetting.JobsettingDO; @@ -41,7 +43,9 @@ public interface JobsettingMapper extends BaseMapperX { .eqIfPresent(JobsettingDO::getIsSoftDeleted, reqVO.getIsSoftDeleted()) .orderByDesc(JobsettingDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(JobsettingExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(JobsettingDO::getCode, reqVO.getCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/labeltype/LabeltypeMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/labeltype/LabeltypeMapper.java index f5db825b..fb3e94c5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/labeltype/LabeltypeMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/labeltype/LabeltypeMapper.java @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.labeltype; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.mapper.BaseMapperX; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.labeltype.vo.LabeltypeExportReqVO; import com.win.module.wms.controller.labeltype.vo.LabeltypePageReqVO; import com.win.module.wms.dal.dataobject.labeltype.LabeltypeDO; @@ -39,7 +41,9 @@ public interface LabeltypeMapper extends BaseMapperX { .eqIfPresent(LabeltypeDO::getIsCompress, reqVO.getIsCompress()) .orderByDesc(LabeltypeDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(LabeltypeExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(LabeltypeDO::getLabelType, reqVO.getLabelType()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/location/LocationMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/location/LocationMapper.java index f6e5236a..0516283d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/location/LocationMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/location/LocationMapper.java @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.location; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.mapper.BaseMapperX; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.location.vo.LocationExportReqVO; import com.win.module.wms.controller.location.vo.LocationPageReqVO; import com.win.module.wms.dal.dataobject.location.LocationDO; @@ -45,7 +47,9 @@ public interface LocationMapper extends BaseMapperX { .eqIfPresent(LocationDO::getCreator, reqVO.getCreator()) .orderByDesc(LocationDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(LocationExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(LocationDO::getCode, reqVO.getCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/locationcapacity/LocationcapacityMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/locationcapacity/LocationcapacityMapper.java index d5186fa8..2a1b35d1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/locationcapacity/LocationcapacityMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/locationcapacity/LocationcapacityMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.locationcapacity; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.locationcapacity.vo.LocationcapacityExportReqVO; import com.win.module.wms.controller.locationcapacity.vo.LocationcapacityPageReqVO; import com.win.module.wms.dal.dataobject.locationcapacity.LocationcapacityDO; @@ -28,7 +30,9 @@ public interface LocationcapacityMapper extends BaseMapperX .eqIfPresent(LocationcapacityDO::getIsInfinity, reqVO.getIsInfinity()) .orderByDesc(LocationcapacityDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(LocationcapacityExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(LocationcapacityDO::getLocationCode, reqVO.getLocationCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/locationgroup/LocationgroupMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/locationgroup/LocationgroupMapper.java index 25dc1377..a0bf6491 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/locationgroup/LocationgroupMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/locationgroup/LocationgroupMapper.java @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.locationgroup; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.mapper.BaseMapperX; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.locationgroup.vo.LocationgroupExportReqVO; import com.win.module.wms.controller.locationgroup.vo.LocationgroupPageReqVO; import com.win.module.wms.dal.dataobject.locationgroup.LocationgroupDO; @@ -33,7 +35,9 @@ public interface LocationgroupMapper extends BaseMapperX { .eqIfPresent(LocationgroupDO::getCreator, reqVO.getCreator()) .orderByDesc(LocationgroupDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(LocationgroupExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(LocationgroupDO::getCode, reqVO.getCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/offlinesettlementRecord/OfflinesettlementRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/offlinesettlementRecord/OfflinesettlementRecordDetailMapper.java index 042cd6b4..aaead8b6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/offlinesettlementRecord/OfflinesettlementRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/offlinesettlementRecord/OfflinesettlementRecordDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.offlinesettlementRecord; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.offlinesettlementRecord.vo.OfflinesettlementRecordDetailExportReqVO; import com.win.module.wms.controller.offlinesettlementRecord.vo.OfflinesettlementRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.offlinesettlementRecord.OfflinesettlementRecordDetailDO; @@ -41,7 +43,9 @@ public interface OfflinesettlementRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(OfflinesettlementRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(OfflinesettlementRecordDetailDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/offlinesettlementRecord/OfflinesettlementRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/offlinesettlementRecord/OfflinesettlementRecordMainMapper.java index 80456683..ba90fdec 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/offlinesettlementRecord/OfflinesettlementRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/offlinesettlementRecord/OfflinesettlementRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.offlinesettlementRecord; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.offlinesettlementRecord.vo.OfflinesettlementRecordMainExportReqVO; import com.win.module.wms.controller.offlinesettlementRecord.vo.OfflinesettlementRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.offlinesettlementRecord.OfflinesettlementRecordMainDO; @@ -39,7 +41,9 @@ public interface OfflinesettlementRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(OfflinesettlementRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(OfflinesettlementRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/offlinesettlementRequest/OfflinesettlementRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/offlinesettlementRequest/OfflinesettlementRequestDetailMapper.java index 2177d345..4a99e660 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/offlinesettlementRequest/OfflinesettlementRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/offlinesettlementRequest/OfflinesettlementRequestDetailMapper.java @@ -2,11 +2,14 @@ package com.win.module.wms.dal.mysql.offlinesettlementRequest; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.offlinesettlementRequest.vo.OfflinesettlementRequestDetailExportReqVO; import com.win.module.wms.controller.offlinesettlementRequest.vo.OfflinesettlementRequestDetailPageReqVO; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import com.win.module.wms.dal.dataobject.offlinesettlementRequest.OfflinesettlementRequestDetailDO; import org.apache.ibatis.annotations.Mapper; @@ -40,7 +43,9 @@ public interface OfflinesettlementRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(OfflinesettlementRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(OfflinesettlementRequestDetailDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/offlinesettlementRequest/OfflinesettlementRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/offlinesettlementRequest/OfflinesettlementRequestMainMapper.java index c3924853..2efbb592 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/offlinesettlementRequest/OfflinesettlementRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/offlinesettlementRequest/OfflinesettlementRequestMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.offlinesettlementRequest; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.offlinesettlementRequest.vo.OfflinesettlementRequestMainExportReqVO; import com.win.module.wms.controller.offlinesettlementRequest.vo.OfflinesettlementRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.offlinesettlementRequest.OfflinesettlementRequestMainDO; @@ -40,7 +42,9 @@ public interface OfflinesettlementRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(OfflinesettlementRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(OfflinesettlementRequestMainDO::getProductReceiptRecordNumber, reqVO.getProductReceiptRecordNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/onlinesettlementRecord/OnlinesettlementRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/onlinesettlementRecord/OnlinesettlementRecordDetailMapper.java index 807f6e40..0c1d5edb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/onlinesettlementRecord/OnlinesettlementRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/onlinesettlementRecord/OnlinesettlementRecordDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.onlinesettlementRecord; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.onlinesettlementRecord.vo.OnlinesettlementRecordDetailExportReqVO; import com.win.module.wms.controller.onlinesettlementRecord.vo.OnlinesettlementRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.onlinesettlementRecord.OnlinesettlementRecordDetailDO; @@ -41,7 +43,9 @@ public interface OnlinesettlementRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(OnlinesettlementRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(OnlinesettlementRecordDetailDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/onlinesettlementRecord/OnlinesettlementRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/onlinesettlementRecord/OnlinesettlementRecordMainMapper.java index f9962504..efc7bd7b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/onlinesettlementRecord/OnlinesettlementRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/onlinesettlementRecord/OnlinesettlementRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.onlinesettlementRecord; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.onlinesettlementRecord.vo.OnlinesettlementRecordMainExportReqVO; import com.win.module.wms.controller.onlinesettlementRecord.vo.OnlinesettlementRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.onlinesettlementRecord.OnlinesettlementRecordMainDO; @@ -39,7 +41,9 @@ public interface OnlinesettlementRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(OnlinesettlementRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(OnlinesettlementRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/onlinesettlementRequest/OnlinesettlementRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/onlinesettlementRequest/OnlinesettlementRequestDetailMapper.java index b0988631..9b41805e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/onlinesettlementRequest/OnlinesettlementRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/onlinesettlementRequest/OnlinesettlementRequestDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.onlinesettlementRequest; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.onlinesettlementRequest.vo.OnlinesettlementRequestDetailExportReqVO; import com.win.module.wms.controller.onlinesettlementRequest.vo.OnlinesettlementRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.onlinesettlementRequest.OnlinesettlementRequestDetailDO; @@ -40,7 +42,9 @@ public interface OnlinesettlementRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(OnlinesettlementRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(OnlinesettlementRequestDetailDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/onlinesettlementRequest/OnlinesettlementRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/onlinesettlementRequest/OnlinesettlementRequestMainMapper.java index ee11583e..113b85a7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/onlinesettlementRequest/OnlinesettlementRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/onlinesettlementRequest/OnlinesettlementRequestMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.onlinesettlementRequest; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.onlinesettlementRequest.vo.OnlinesettlementRequestMainExportReqVO; import com.win.module.wms.controller.onlinesettlementRequest.vo.OnlinesettlementRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.onlinesettlementRequest.OnlinesettlementRequestMainDO; @@ -40,6 +42,9 @@ public interface OnlinesettlementRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(OnlinesettlementRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(OnlinesettlementRequestMainDO::getIssueRecordNumber, reqVO.getIssueRecordNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/owner/OwnerMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/owner/OwnerMapper.java index bea482a3..ecf719c1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/owner/OwnerMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/owner/OwnerMapper.java @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.owner; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.mapper.BaseMapperX; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.owner.vo.OwnerExportReqVO; import com.win.module.wms.controller.owner.vo.OwnerPageReqVO; import com.win.module.wms.dal.dataobject.owner.OwnerDO; @@ -42,7 +44,9 @@ public interface OwnerMapper extends BaseMapperX { .eqIfPresent(OwnerDO::getAvailable, reqVO.getAvailable()) .orderByDesc(OwnerDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(OwnerExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(OwnerDO::getCode, reqVO.getCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceService.java index 777cfd59..c9370db0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceService.java @@ -84,22 +84,22 @@ public interface BalanceService { * 跟据管理模式查询数量 * @author lianhongxi * @param itemcode 物品code - * @param inventorystatus 库存状态 + * @param inventoryStatus 库存状态 * @param locationcode 库位code * @return */ - public List selectNumber(String itemcode, String inventorystatus, String locationcode); + public List selectNumber(String itemcode, List inventoryStatus, String locationcode); /** * TB2----BY_BATCH * 跟据管理模式查询批次 * @author lianhongxi * @param itemcode 物品code * @param batch 批次 - * @param inventorystatus 库存状态 + * @param inventoryStatus 库存状态 * @param locationcode 库位code * @return */ - public List selectBatch(String itemcode, String batch, String inventorystatus, String locationcode); + public List selectBatch(String itemcode, String batch, List inventoryStatus, String locationcode); /** * TB2----BY_PACKAGING * 跟据管理模式查询包装号 @@ -107,20 +107,20 @@ public interface BalanceService { * @param itemcode 物品code * @param batch 批次 * @param packingnumber 包装号 - * @param inventorystatus 库存状态 + * @param inventoryStatus 库存状态 * @param locationcode 库位code * @return */ - public List selectPackaging(String itemcode, String packingnumber, String batch, String inventorystatus, String locationcode); + public List selectPackaging(String itemcode, String packingnumber, String batch, List inventoryStatus, String locationcode); /** * TB2----BY_UNIQUE_ID * 跟据管理模式查询唯一码 * @author lianhongxi * @param packingnumber 包装号 - * @param inventorystatus 库存状态 + * @param inventoryStatus 库存状态 * @param locationcode 库位code * @return */ - public List selectUniqueId(String packingnumber, String locationcode, String inventorystatus); + public List selectUniqueId(String packingnumber, String locationcode, List inventoryStatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java index c89893f9..a171b821 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java @@ -105,21 +105,21 @@ public class BalanceServiceImpl implements BalanceService { * 跟据管理模式查询数量 * @author lianhongxi * @param itemcode 物品code - * @param inventorystatus 库存状态 + * @param inventoryStatus 库存状态 * @param locationcode 库位code * @return */ @Override - public List selectNumber(String itemcode, String inventorystatus, String locationcode) { + public List selectNumber(String itemcode, List inventoryStatus, String locationcode) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("item_code", itemcode); - queryWrapper.eq("inventory_status", inventorystatus); + queryWrapper.eq("inventory_status", inventoryStatus); queryWrapper.eq("location_code", locationcode); List balanceDO = balanceMapper.selectList(queryWrapper); if (!balanceDO.isEmpty()) { return balanceDO; - } else { - throw new UtilException( "物料号" + itemcode + "库存状态" + inventorystatus + "在" + locationcode + "库位中未查找到库存记录"); + }else { + return null; } } @@ -129,22 +129,22 @@ public class BalanceServiceImpl implements BalanceService { * @author lianhongxi * @param itemcode 物品code * @param batch 批次 - * @param inventorystatus 库存状态 + * @param inventoryStatus 库存状态 * @param locationcode 库位code * @return */ @Override - public List selectBatch(String itemcode, String batch, String inventorystatus, String locationcode) { + public List selectBatch(String itemcode, String batch, List inventoryStatus, String locationcode) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("item_code", itemcode); queryWrapper.eq("batch", batch); - queryWrapper.eq("inventory_status", inventorystatus); + queryWrapper.eq("inventory_status", inventoryStatus); queryWrapper.eq("location_code", locationcode); List balanceDO = balanceMapper.selectList(queryWrapper); if (!balanceDO.isEmpty()) { return balanceDO; - } else { - throw new UtilException( "物料号" + itemcode + "批次" + batch + "库存状态" + inventorystatus + "在" + locationcode + "库位中未查找到库存记录"); + }else { + return null; } } @@ -157,23 +157,23 @@ public class BalanceServiceImpl implements BalanceService { * @param itemcode 物品code * @param packingnumber 包装号 * @param batch 批次 - * @param inventorystatus 库存状态 + * @param inventoryStatus 库存状态 * @param locationcode 库位code * @return */ @Override - public List selectPackaging(String itemcode, String packingnumber, String batch, String inventorystatus, String locationcode) { + public List selectPackaging(String itemcode, String packingnumber, String batch, List inventoryStatus, String locationcode) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("item_code", itemcode); queryWrapper.eq("packing_number", packingnumber); queryWrapper.eq("batch", batch); - queryWrapper.eq("inventory_status", inventorystatus); + queryWrapper.eq("inventory_status", inventoryStatus); queryWrapper.eq("location_code", locationcode); List balanceDO = balanceMapper.selectList(queryWrapper); if (!balanceDO.isEmpty()) { return balanceDO; - } else { - throw new UtilException( "物料号" + itemcode + "箱码" + packingnumber + "批次" + batch + "库存状态" + inventorystatus + "在" + locationcode + "库位中未查找到库存记录"); + }else { + return null; } } @@ -183,20 +183,20 @@ public class BalanceServiceImpl implements BalanceService { * @author lianhongxi * @param packingnumber 包装号 * @param locationcode 库位code - * @param inventorystatus 库存状态 + * @param inventoryStatus 库存状态 * @return */ @Override - public List selectUniqueId(String packingnumber, String locationcode, String inventorystatus) { + public List selectUniqueId(String packingnumber, String locationcode, List inventoryStatus) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("packing_number", packingnumber); - queryWrapper.eq("inventory_status", inventorystatus); + queryWrapper.in("inventory_status", inventoryStatus); queryWrapper.eq("location_code", locationcode); List balanceDO = balanceMapper.selectList(queryWrapper); if (!balanceDO.isEmpty()) { return balanceDO; - } else { - throw new UtilException( "唯一码" + packingnumber + "库存状态" + inventorystatus + "在" + locationcode + "库位中未查找到库存记录"); + }else { + return null; } } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockService.java index df6089a3..61b0e00d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockService.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.dock; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.dock.vo.*; import com.win.module.wms.dal.dataobject.dock.DockDO; @@ -61,6 +62,15 @@ public interface DockService { */ PageResult getDockPage(DockPageReqVO pageReqVO); + /** + * 获得用高级搜索月台分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getDockSenior(CustomConditions conditions); + + /** * 获得月台列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockServiceImpl.java index e3a73759..79c3ee21 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.google.common.annotations.VisibleForTesting; import com.win.framework.common.exception.ServiceException; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.datapermission.core.util.DataPermissionUtils; import com.win.module.wms.controller.dock.vo.*; @@ -78,6 +79,11 @@ public class DockServiceImpl implements DockService { return dockMapper.selectPage(pageReqVO); } + @Override + public PageResult getDockSenior(CustomConditions conditions) { + return dockMapper.selectSenior(conditions); + } + @Override public List getDockList(DockExportReqVO exportReqVO) { return dockMapper.selectList(exportReqVO); @@ -90,24 +96,56 @@ public class DockServiceImpl implements DockService { } List errorList = new ArrayList<>(); docks.forEach(dock -> { + String massage = ""; // 校验，判断是否有不符合的原因 - try { - if(mode != null){ - validateDockForCreateOrUpdate(null,dock.getCode(),dock.getType(),dock.getWarehouseCode(),dock.getDefaultLocationCode(),dock.getAvailable());} - } catch (ServiceException ex) { - errorList.add(dock); - return; + if(mode != null) { + try { + validateDockExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCodeExists(null,dock.getCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateTypeExists(dock.getType()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateWareHouseCodeExists(dock.getWarehouseCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateDefaultLocationCodeExists(dock.getDefaultLocationCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(dock.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } } - // 判断如果不存在，在进行插入 - DockDO existConfigurationSetting = null; - if (existConfigurationSetting == null&& mode != 3) { - dockMapper.insert(DockConvert.INSTANCE.convert(dock)); + if(StrUtil.isNotEmpty(massage)){ + massage.substring(0,massage.length()-1); + errorList.add(dock); } - else if (existConfigurationSetting != null && mode != 2) {// 如果存在，判断是否允许更新 - DockDO dockDO = DockConvert.INSTANCE.convert(dock); - dockDO.setId(existConfigurationSetting.getId()); - dockMapper.updateById(dockDO); + if(errorList == null){ + DockDO existConfigurationSetting = null; + if (existConfigurationSetting == null&& mode != 3) { + dockMapper.insert(DockConvert.INSTANCE.convert(dock)); + } + else if (existConfigurationSetting != null && mode != 2) {// 如果存在，判断是否允许更新 + DockDO dockDO = DockConvert.INSTANCE.convert(dock); + dockDO.setId(existConfigurationSetting.getId()); + dockMapper.updateById(dockDO); + } } + // 判断如果不存在，在进行插入 }); //错误不为空并非部分更新，手工回滚 if(!errorList.isEmpty() && !updatePart) { @@ -196,9 +234,4 @@ public class DockServiceImpl implements DockService { } } - - - - - } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/documentSwitch/SwitchService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/documentSwitch/SwitchService.java index 9193c3bd..01dcd581 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/documentSwitch/SwitchService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/documentSwitch/SwitchService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.documentSwitch; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.documentSwitch.vo.SwitchCreateReqVO; import com.win.module.wms.controller.documentSwitch.vo.SwitchExportReqVO; import com.win.module.wms.controller.documentSwitch.vo.SwitchPageReqVO; @@ -63,6 +64,15 @@ public interface SwitchService { */ PageResult getSwitchPage(SwitchPageReqVO pageReqVO); + /** + * 获得用高级搜索单据开关分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getSwitchSenior(CustomConditions conditions); + + /** * 获得单据开关列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/documentSwitch/SwitchServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/documentSwitch/SwitchServiceImpl.java index 7a9839bf..f2f892e0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/documentSwitch/SwitchServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/documentSwitch/SwitchServiceImpl.java @@ -1,6 +1,7 @@ package com.win.module.wms.service.documentSwitch; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.documentSwitch.vo.SwitchCreateReqVO; import com.win.module.wms.controller.documentSwitch.vo.SwitchExportReqVO; import com.win.module.wms.controller.documentSwitch.vo.SwitchPageReqVO; @@ -84,6 +85,11 @@ public class SwitchServiceImpl implements SwitchService { return switchMapper.selectList(exportReqVO); } + @Override + public PageResult getSwitchSenior(CustomConditions conditions) { + return switchMapper.selectSenior(conditions); + } + @Override public SwitchDO selectSwitchExist(String pcode){ QueryWrapper queryWrapper = new QueryWrapper(); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/documentsetting/DocumentsettingService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/documentsetting/DocumentsettingService.java index 7e09824f..d851320b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/documentsetting/DocumentsettingService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/documentsetting/DocumentsettingService.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.documentsetting; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.documentsetting.vo.*; import com.win.module.wms.dal.dataobject.documentsetting.DocumentsettingDO; @@ -60,6 +61,13 @@ public interface DocumentsettingService { * @return 单据设置分页 */ PageResult getDocumentsettingPage(DocumentsettingPageReqVO pageReqVO); + /** + * 获得用高级搜索单据设置分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getDocumentsettingSenior(CustomConditions conditions); /** * 获得单据设置列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/documentsetting/DocumentsettingServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/documentsetting/DocumentsettingServiceImpl.java index b67f2817..4df23dd0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/documentsetting/DocumentsettingServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/documentsetting/DocumentsettingServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.google.common.annotations.VisibleForTesting; import com.win.framework.common.exception.ServiceException; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.datapermission.core.util.DataPermissionUtils; import com.win.module.wms.controller.documentsetting.vo.*; @@ -87,6 +88,11 @@ public class DocumentsettingServiceImpl implements DocumentsettingService { return documentsettingMapper.selectList(exportReqVO); } + @Override + public PageResult getDocumentsettingSenior(CustomConditions conditions) { + return documentsettingMapper.selectSenior(conditions); + } + @Override public List documentSettingimportDocumentList(List documentsettings, Integer mode, Boolean updatePart) { if (CollUtil.isEmpty(documentsettings)) { @@ -95,24 +101,79 @@ public class DocumentsettingServiceImpl implements DocumentsettingService { List errorList = new ArrayList<>(); documentsettings.forEach(documentsetting -> { // 校验，判断是否有不符合的原因 - try { - if(mode != null){ - validateDocumentsettingForCreateOrUpdate(null,documentsetting.getCode(),documentsetting.getName(),documentsetting.getDescription(),documentsetting.getType() - ,documentsetting.getBusinessType(),documentsetting.getNumberPrefix(),documentsetting.getDateFormat(),documentsetting.getSerialLength(),documentsetting.getResetPeriod() - ,documentsetting.getAvailable());} - } catch (ServiceException ex) { - errorList.add(documentsetting); - return; + String massage = ""; + if(mode != null){ + try { + validateDocumentsettingExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCodeExists(null,documentsetting.getCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateNameExists(documentsetting.getName()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateDescriptionExists(documentsetting.getDescription()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateTypeExists(documentsetting.getType()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateBusinessTypeExists(documentsetting.getBusinessType()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateNumberPrefixExists(documentsetting.getNumberPrefix()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateDateFormatExists(documentsetting.getDateFormat()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateSerialLengthExists(documentsetting.getSerialLength()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateResetPeriodExists(documentsetting.getResetPeriod()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(documentsetting.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } } - // 判断如果不存在，在进行插入 - DocumentsettingDO existConfigurationSetting = null; - if (existConfigurationSetting == null&& mode != 3) { - documentsettingMapper.insert(DocumentsettingConvert.INSTANCE.convert(documentsetting)); + if(StrUtil.isNotEmpty(massage)){ + massage.substring(0,massage.length()-1); + errorList.add(documentsetting); } - else if (existConfigurationSetting != null && mode != 2) {// 如果存在，判断是否允许更新 - DocumentsettingDO documentsettingMapperDO = DocumentsettingConvert.INSTANCE.convert(documentsetting); - documentsettingMapperDO.setId(existConfigurationSetting.getId()); - documentsettingMapper.updateById(documentsettingMapperDO); + if(errorList == null){ + // 判断如果不存在，在进行插入 + DocumentsettingDO existConfigurationSetting = null; + if (existConfigurationSetting == null&& mode != 3) { + documentsettingMapper.insert(DocumentsettingConvert.INSTANCE.convert(documentsetting)); + } + else if (existConfigurationSetting != null && mode != 2) {// 如果存在，判断是否允许更新 + DocumentsettingDO documentsettingMapperDO = DocumentsettingConvert.INSTANCE.convert(documentsetting); + documentsettingMapperDO.setId(existConfigurationSetting.getId()); + documentsettingMapper.updateById(documentsettingMapperDO); + } } }); //错误不为空并非部分更新，手工回滚 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectin/ExpectinService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectin/ExpectinService.java index ab6b6b62..3fe7abbc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectin/ExpectinService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectin/ExpectinService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.expectin; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.expectin.vo.ExpectinCreateReqVO; import com.win.module.wms.controller.expectin.vo.ExpectinExportReqVO; import com.win.module.wms.controller.expectin.vo.ExpectinPageReqVO; @@ -63,6 +64,15 @@ public interface ExpectinService { */ PageResult getExpectinPage(ExpectinPageReqVO pageReqVO); + /** + * 获得用高级搜索预计入库存分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getExpectinSenior(CustomConditions conditions); + + /** * 获得预计入库存列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectin/ExpectinServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectin/ExpectinServiceImpl.java index 02603757..de1e270b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectin/ExpectinServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectin/ExpectinServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.expectin; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.expectin.vo.ExpectinCreateReqVO; import com.win.module.wms.controller.expectin.vo.ExpectinExportReqVO; import com.win.module.wms.controller.expectin.vo.ExpectinPageReqVO; @@ -78,6 +79,11 @@ public class ExpectinServiceImpl implements ExpectinService { return expectinMapper.selectPage(pageReqVO); } + @Override + public PageResult getExpectinSenior(CustomConditions conditions) { + return expectinMapper.selectSenior(conditions); + } + @Override public List getExpectinList(ExpectinExportReqVO exportReqVO) { return expectinMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutService.java index 994aef5e..526740f2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.expectout; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.expectout.vo.ExpectoutCreateReqVO; import com.win.module.wms.controller.expectout.vo.ExpectoutExportReqVO; import com.win.module.wms.controller.expectout.vo.ExpectoutPageReqVO; @@ -63,6 +64,15 @@ public interface ExpectoutService { */ PageResult getExpectoutPage(ExpectoutPageReqVO pageReqVO); + /** + * 获得用高级搜索预计出库存分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getExpectoutSenior(CustomConditions conditions); + + /** * 获得预计出库存列表, 用于 Excel 导出 * @@ -79,7 +89,7 @@ public interface ExpectoutService { * @param locationcode 库位code * @return */ - public List selectNumberNew(String itemcode, String inventorystatus, String locationcode); + public List selectNumberNew(String itemcode, List inventorystatus, String locationcode); /** * TB2----BY_BATCH * 跟据管理模式查询批次 @@ -90,7 +100,7 @@ public interface ExpectoutService { * @param locationcode 库位code * @return */ - public List selectBatchNew(String itemcode, String batch, String inventorystatus, String locationcode); + public List selectBatchNew(String itemcode, String batch, List inventorystatus, String locationcode); /** * TB2----BY_PACKAGING * 跟据管理模式查询包装号 @@ -102,7 +112,7 @@ public interface ExpectoutService { * @param locationcode 库位code * @return */ - public List selectPackingNew(String itemcode, String packingnumber, String batch, String inventorystatus, String locationcode); + public List selectPackingNew(String itemcode, String packingnumber, String batch, List inventorystatus, String locationcode); /** * TB2----BY_UNIQUE_ID * 跟据管理模式查询唯一码 @@ -112,6 +122,6 @@ public interface ExpectoutService { * @param locationcode 库位code * @return */ - public List selectUniqeIdNew(String packingnumber, String locationcode, String inventorystatus); + public List selectUniqeIdNew(String packingnumber, String locationcode, List inventorystatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutServiceImpl.java index 7d35d1f4..6e69b849 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutServiceImpl.java @@ -1,13 +1,12 @@ package com.win.module.wms.service.expectout; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.expectout.vo.ExpectoutCreateReqVO; import com.win.module.wms.controller.expectout.vo.ExpectoutExportReqVO; import com.win.module.wms.controller.expectout.vo.ExpectoutPageReqVO; import com.win.module.wms.controller.expectout.vo.ExpectoutUpdateReqVO; -import com.win.module.wms.controller.rule.vo.RuleRespVO; import com.win.module.wms.service.rule.RuleService; -import com.win.module.wms.service.rule.RuleServiceImpl; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -90,9 +89,14 @@ public class ExpectoutServiceImpl implements ExpectoutService { return expectoutMapper.selectList(exportReqVO); } + @Override + public PageResult getExpectoutSenior(CustomConditions conditions) { + return expectoutMapper.selectSenior(conditions); + } + //按数量查找 BY_BATCH @Override - public List selectNumberNew(String itemcode, String inventorystatus, String locationcode) { + public List selectNumberNew(String itemcode, List inventorystatus, String locationcode) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("item_code", itemcode); queryWrapper.eq("inventory_status", inventorystatus); @@ -107,7 +111,7 @@ public class ExpectoutServiceImpl implements ExpectoutService { //按批次查询 BY_BATCH @Override - public List selectBatchNew(String itemcode, String batch, String inventorystatus, String locationcode) { + public List selectBatchNew(String itemcode, String batch, List inventorystatus, String locationcode) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("item_code", itemcode); queryWrapper.eq("batch", batch); @@ -123,7 +127,7 @@ public class ExpectoutServiceImpl implements ExpectoutService { //按包裝 BY_PACKAGING @Override - public List selectPackingNew(String itemcode, String packingnumber, String batch, String inventorystatus, String locationcode) { + public List selectPackingNew(String itemcode, String packingnumber, String batch, List inventorystatus, String locationcode) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("item_code", itemcode); queryWrapper.eq("batch", batch); @@ -140,7 +144,7 @@ public class ExpectoutServiceImpl implements ExpectoutService { //按唯一码查询 BY_UNIQUE_ID @Override - public List selectUniqeIdNew(String packingnumber, String locationcode, String inventorystatus) { + public List selectUniqeIdNew(String packingnumber, String locationcode, List inventorystatus) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("packing_number", packingnumber); queryWrapper.eq("inventory_status", inventorystatus); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobDetailService.java index a8bc621d..e9a214f9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.inspectJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailCreateReqVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailExportReqVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailPageReqVO; @@ -63,6 +64,15 @@ public interface InspectJobDetailService { */ PageResult getInspectJobDetailPage(InspectJobDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索检验任务子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getInspectJobDetailSenior(CustomConditions conditions); + + /** * 获得检验任务子列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobDetailServiceImpl.java index cc022dec..3f17e55f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.inspectJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailCreateReqVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailExportReqVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobDetailPageReqVO; @@ -78,6 +79,11 @@ public class InspectJobDetailServiceImpl implements InspectJobDetailService { return inspectJobDetailMapper.selectPage(pageReqVO); } + @Override + public PageResult getInspectJobDetailSenior(CustomConditions conditions) { + return inspectJobDetailMapper.selectSenior(conditions); + } + @Override public List getInspectJobDetailList(InspectJobDetailExportReqVO exportReqVO) { return inspectJobDetailMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java index d6fc355c..06d67c0c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.inspectJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inspectJob.vo.InspectJobMainCreateReqVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobMainExportReqVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobMainPageReqVO; @@ -63,6 +64,15 @@ public interface InspectJobMainService { */ PageResult getInspectJobMainPage(InspectJobMainPageReqVO pageReqVO); + /** + * 获得用高级搜索检验任务主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getInspectJobMainSenior(CustomConditions conditions); + + /** * 获得检验任务主列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java index 05e86117..5e47d566 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java @@ -1,11 +1,11 @@ package com.win.module.wms.service.inspectJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inspectJob.vo.InspectJobMainCreateReqVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobMainExportReqVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobMainPageReqVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobMainUpdateReqVO; -import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -79,7 +79,11 @@ public class InspectJobMainServiceImpl implements InspectJobMainService { public PageResult getInspectJobMainPage(InspectJobMainPageReqVO pageReqVO) { return inspectJobMainMapper.selectPage(pageReqVO); } - + + @Override + public PageResult getInspectJobMainSenior(CustomConditions conditions) { + return inspectJobMainMapper.selectSenior(conditions); + } @Override public List getInspectJobMainList(InspectJobMainExportReqVO exportReqVO) { return inspectJobMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordDetailService.java index b863d34b..30e3934a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.inspectRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailCreateReqVO; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailExportReqVO; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailPageReqVO; @@ -63,6 +64,15 @@ public interface InspectRecordDetailService { */ PageResult getInspectRecordDetailPage(InspectRecordDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索检验记录子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getInspectRecordDetailSenior(CustomConditions conditions); + + /** * 获得检验记录子列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordDetailServiceImpl.java index b323f320..4364efbe 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.inspectRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailCreateReqVO; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailExportReqVO; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordDetailPageReqVO; @@ -78,6 +79,11 @@ public class InspectRecordDetailServiceImpl implements InspectRecordDetailServic return inspectRecordDetailMapper.selectPage(pageReqVO); } + @Override + public PageResult getInspectRecordDetailSenior(CustomConditions conditions) { + return inspectRecordDetailMapper.selectSenior(conditions); + } + @Override public List getInspectRecordDetailList(InspectRecordDetailExportReqVO exportReqVO) { return inspectRecordDetailMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordMainService.java index 9366a1a8..bceb9cbe 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.inspectRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainCreateReqVO; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainExportReqVO; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainPageReqVO; @@ -63,6 +64,14 @@ public interface InspectRecordMainService { */ PageResult getInspectRecordMainPage(InspectRecordMainPageReqVO pageReqVO); + /** + * 获得用高级搜索检验记录主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getInspectRecordMainSenior(CustomConditions conditions); + /** * 获得检验记录主列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordMainServiceImpl.java index 8a6edd67..1c5cf25a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRecord/InspectRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.inspectRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainCreateReqVO; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainExportReqVO; import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainPageReqVO; @@ -78,6 +79,11 @@ public class InspectRecordMainServiceImpl implements InspectRecordMainService { return inspectRecordMainMapper.selectPage(pageReqVO); } + @Override + public PageResult getInspectRecordMainSenior(CustomConditions conditions) { + return inspectRecordMainMapper.selectSenior(conditions); + } + @Override public List getInspectRecordMainList(InspectRecordMainExportReqVO exportReqVO) { return inspectRecordMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestDetailService.java index a532173e..271f2f04 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.inspectRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailCreateReqVO; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailExportReqVO; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailPageReqVO; @@ -63,6 +64,15 @@ public interface InspectRequestDetailService { */ PageResult getInspectRequestDetailPage(InspectRequestDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索检验申请子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getInspectRequestDetailSenior(CustomConditions conditions); + + /** * 获得检验申请子列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestDetailServiceImpl.java index aa3ee3f8..1a7a7af3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.inspectRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailCreateReqVO; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailExportReqVO; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailPageReqVO; @@ -78,6 +79,11 @@ public class InspectRequestDetailServiceImpl implements InspectRequestDetailServ return inspectRequestDetailMapper.selectPage(pageReqVO); } + @Override + public PageResult getInspectRequestDetailSenior(CustomConditions conditions) { + return inspectRequestDetailMapper.selectSenior(conditions); + } + @Override public List getInspectRequestDetailList(InspectRequestDetailExportReqVO exportReqVO) { return inspectRequestDetailMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainService.java index 264e524a..8976d42c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.inspectRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestMainCreateReqVO; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestMainExportReqVO; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestMainPageReqVO; @@ -63,6 +64,14 @@ public interface InspectRequestMainService { */ PageResult getInspectRequestMainPage(InspectRequestMainPageReqVO pageReqVO); + /** + * 获得用高级搜索检验申请主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getInspectRequestMainSenior(CustomConditions conditions); + /** * 获得检验申请主列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java index 12167acc..ee28b26f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.inspectRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestMainCreateReqVO; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestMainExportReqVO; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestMainPageReqVO; @@ -77,7 +78,10 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService public PageResult getInspectRequestMainPage(InspectRequestMainPageReqVO pageReqVO) { return inspectRequestMainMapper.selectPage(pageReqVO); } - + @Override + public PageResult getInspectRequestMainSenior(CustomConditions conditions) { + return inspectRequestMainMapper.selectSenior(conditions); + } @Override public List getInspectRequestMainList(InspectRequestMainExportReqVO exportReqVO) { return inspectRequestMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRecord/InventorychangeRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRecord/InventorychangeRecordDetailService.java index 13a753ae..2dc07508 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRecord/InventorychangeRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRecord/InventorychangeRecordDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.inventorychangeRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventorychangeRecord.vo.InventorychangeRecordDetailCreateReqVO; import com.win.module.wms.controller.inventorychangeRecord.vo.InventorychangeRecordDetailExportReqVO; import com.win.module.wms.controller.inventorychangeRecord.vo.InventorychangeRecordDetailPageReqVO; @@ -63,6 +64,15 @@ public interface InventorychangeRecordDetailService { */ PageResult getInventorychangeRecordDetailPage(InventorychangeRecordDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索库存修改记录子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getInventorychangeRecordDetailSenior(CustomConditions conditions); + + /** * 获得库存修改记录子列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRecord/InventorychangeRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRecord/InventorychangeRecordDetailServiceImpl.java index ef1b4289..60f5362e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRecord/InventorychangeRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRecord/InventorychangeRecordDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.inventorychangeRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventorychangeRecord.vo.InventorychangeRecordDetailCreateReqVO; import com.win.module.wms.controller.inventorychangeRecord.vo.InventorychangeRecordDetailExportReqVO; import com.win.module.wms.controller.inventorychangeRecord.vo.InventorychangeRecordDetailPageReqVO; @@ -77,7 +78,10 @@ public class InventorychangeRecordDetailServiceImpl implements InventorychangeRe public PageResult getInventorychangeRecordDetailPage(InventorychangeRecordDetailPageReqVO pageReqVO) { return inventorychangeRecordDetailMapper.selectPage(pageReqVO); } - + @Override + public PageResult getInventorychangeRecordDetailSenior(CustomConditions conditions) { + return inventorychangeRecordDetailMapper.selectSenior(conditions); + } @Override public List getInventorychangeRecordDetailList(InventorychangeRecordDetailExportReqVO exportReqVO) { return inventorychangeRecordDetailMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRecord/InventorychangeRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRecord/InventorychangeRecordMainService.java index c8440f9e..d31f510a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRecord/InventorychangeRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRecord/InventorychangeRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.inventorychangeRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventorychangeRecord.vo.InventorychangeRecordMainCreateReqVO; import com.win.module.wms.controller.inventorychangeRecord.vo.InventorychangeRecordMainExportReqVO; import com.win.module.wms.controller.inventorychangeRecord.vo.InventorychangeRecordMainPageReqVO; @@ -63,6 +64,15 @@ public interface InventorychangeRecordMainService { */ PageResult getInventorychangeRecordMainPage(InventorychangeRecordMainPageReqVO pageReqVO); + /** + * 获得用高级搜索库存修改记录主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getInventorychangeRecordMainSenior(CustomConditions conditions); + + /** * 获得库存修改记录主列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRecord/InventorychangeRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRecord/InventorychangeRecordMainServiceImpl.java index e7cae997..7c67b204 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRecord/InventorychangeRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRecord/InventorychangeRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.inventorychangeRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventorychangeRecord.vo.InventorychangeRecordMainCreateReqVO; import com.win.module.wms.controller.inventorychangeRecord.vo.InventorychangeRecordMainExportReqVO; import com.win.module.wms.controller.inventorychangeRecord.vo.InventorychangeRecordMainPageReqVO; @@ -77,7 +78,10 @@ public class InventorychangeRecordMainServiceImpl implements InventorychangeReco public PageResult getInventorychangeRecordMainPage(InventorychangeRecordMainPageReqVO pageReqVO) { return inventorychangeRecordMainMapper.selectPage(pageReqVO); } - + @Override + public PageResult getInventorychangeRecordMainSenior(CustomConditions conditions) { + return inventorychangeRecordMainMapper.selectSenior(conditions); + } @Override public List getInventorychangeRecordMainList(InventorychangeRecordMainExportReqVO exportReqVO) { return inventorychangeRecordMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestDetailService.java index 7ebf0cdd..969bd4bb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.inventorychangeRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventorychangeRequest.vo.InventorychangeRequestDetailCreateReqVO; import com.win.module.wms.controller.inventorychangeRequest.vo.InventorychangeRequestDetailExportReqVO; import com.win.module.wms.controller.inventorychangeRequest.vo.InventorychangeRequestDetailPageReqVO; @@ -63,6 +64,14 @@ public interface InventorychangeRequestDetailService { */ PageResult getInventorychangeRequestDetailPage(InventorychangeRequestDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索库存修改申请子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getInventorychangeRequestDetailSenior(CustomConditions conditions); + /** * 获得库存修改申请子列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestDetailServiceImpl.java index aa033541..b480a104 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.inventorychangeRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventorychangeRequest.vo.InventorychangeRequestDetailCreateReqVO; import com.win.module.wms.controller.inventorychangeRequest.vo.InventorychangeRequestDetailExportReqVO; import com.win.module.wms.controller.inventorychangeRequest.vo.InventorychangeRequestDetailPageReqVO; @@ -77,7 +78,10 @@ public class InventorychangeRequestDetailServiceImpl implements InventorychangeR public PageResult getInventorychangeRequestDetailPage(InventorychangeRequestDetailPageReqVO pageReqVO) { return inventorychangeRequestDetailMapper.selectPage(pageReqVO); } - + @Override + public PageResult getInventorychangeRequestDetailSenior(CustomConditions conditions) { + return inventorychangeRequestDetailMapper.selectSenior(conditions); + } @Override public List getInventorychangeRequestDetailList(InventorychangeRequestDetailExportReqVO exportReqVO) { return inventorychangeRequestDetailMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestMainService.java index 4718ac97..52db0695 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.inventorychangeRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventorychangeRequest.vo.InventorychangeRequestMainCreateReqVO; import com.win.module.wms.controller.inventorychangeRequest.vo.InventorychangeRequestMainExportReqVO; import com.win.module.wms.controller.inventorychangeRequest.vo.InventorychangeRequestMainPageReqVO; @@ -54,6 +55,13 @@ public interface InventorychangeRequestMainService { * @return 库存修改申请主列表 */ List getInventorychangeRequestMainList(Collection ids); + /** + * 获得用高级搜索库存修改申请主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getInventorychangeRequestMainSenior(CustomConditions conditions); /** * 获得库存修改申请主分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestMainServiceImpl.java index 89ce1e0c..0923192c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.inventorychangeRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventorychangeRequest.vo.InventorychangeRequestMainCreateReqVO; import com.win.module.wms.controller.inventorychangeRequest.vo.InventorychangeRequestMainExportReqVO; import com.win.module.wms.controller.inventorychangeRequest.vo.InventorychangeRequestMainPageReqVO; @@ -77,7 +78,10 @@ public class InventorychangeRequestMainServiceImpl implements InventorychangeReq public PageResult getInventorychangeRequestMainPage(InventorychangeRequestMainPageReqVO pageReqVO) { return inventorychangeRequestMainMapper.selectPage(pageReqVO); } - + @Override + public PageResult getInventorychangeRequestMainSenior(CustomConditions conditions) { + return inventorychangeRequestMainMapper.selectSenior(conditions); + } @Override public List getInventorychangeRequestMainList(InventorychangeRequestMainExportReqVO exportReqVO) { return inventorychangeRequestMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRecord/InventoryinitRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRecord/InventoryinitRecordDetailService.java index 7914b24e..ec30926e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRecord/InventoryinitRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRecord/InventoryinitRecordDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.inventoryinitRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventoryinitRecord.vo.InventoryinitRecordDetailCreateReqVO; import com.win.module.wms.controller.inventoryinitRecord.vo.InventoryinitRecordDetailExportReqVO; import com.win.module.wms.controller.inventoryinitRecord.vo.InventoryinitRecordDetailPageReqVO; @@ -62,6 +63,13 @@ public interface InventoryinitRecordDetailService { * @return 库存初始化记录子分页 */ PageResult getInventoryinitRecordDetailPage(InventoryinitRecordDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索库存初始化记录子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getInventoryinitRecordDetailSenior(CustomConditions conditions); /** * 获得库存初始化记录子列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRecord/InventoryinitRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRecord/InventoryinitRecordDetailServiceImpl.java index c5e102cc..b88c6b93 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRecord/InventoryinitRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRecord/InventoryinitRecordDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.inventoryinitRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventoryinitRecord.vo.InventoryinitRecordDetailCreateReqVO; import com.win.module.wms.controller.inventoryinitRecord.vo.InventoryinitRecordDetailExportReqVO; import com.win.module.wms.controller.inventoryinitRecord.vo.InventoryinitRecordDetailPageReqVO; @@ -77,7 +78,10 @@ public class InventoryinitRecordDetailServiceImpl implements InventoryinitRecord public PageResult getInventoryinitRecordDetailPage(InventoryinitRecordDetailPageReqVO pageReqVO) { return inventoryinitRecordDetailMapper.selectPage(pageReqVO); } - + @Override + public PageResult getInventoryinitRecordDetailSenior(CustomConditions conditions) { + return inventoryinitRecordDetailMapper.selectSenior(conditions); + } @Override public List getInventoryinitRecordDetailList(InventoryinitRecordDetailExportReqVO exportReqVO) { return inventoryinitRecordDetailMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRecord/InventoryinitRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRecord/InventoryinitRecordMainService.java index 70989904..c00349b2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRecord/InventoryinitRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRecord/InventoryinitRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.inventoryinitRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventoryinitRecord.vo.InventoryinitRecordMainCreateReqVO; import com.win.module.wms.controller.inventoryinitRecord.vo.InventoryinitRecordMainExportReqVO; import com.win.module.wms.controller.inventoryinitRecord.vo.InventoryinitRecordMainPageReqVO; @@ -63,6 +64,15 @@ public interface InventoryinitRecordMainService { */ PageResult getInventoryinitRecordMainPage(InventoryinitRecordMainPageReqVO pageReqVO); + /** + * 获得用高级搜索库存初始化记录主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getInventoryinitRecordMainSenior(CustomConditions conditions); + + /** * 获得库存初始化记录主列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRecord/InventoryinitRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRecord/InventoryinitRecordMainServiceImpl.java index 88222f8f..ef18a424 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRecord/InventoryinitRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRecord/InventoryinitRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.inventoryinitRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventoryinitRecord.vo.InventoryinitRecordMainCreateReqVO; import com.win.module.wms.controller.inventoryinitRecord.vo.InventoryinitRecordMainExportReqVO; import com.win.module.wms.controller.inventoryinitRecord.vo.InventoryinitRecordMainPageReqVO; @@ -77,7 +78,10 @@ public class InventoryinitRecordMainServiceImpl implements InventoryinitRecordMa public PageResult getInventoryinitRecordMainPage(InventoryinitRecordMainPageReqVO pageReqVO) { return inventoryinitRecordMainMapper.selectPage(pageReqVO); } - + @Override + public PageResult getInventoryinitRecordMainSenior(CustomConditions conditions) { + return inventoryinitRecordMainMapper.selectSenior(conditions); + } @Override public List getInventoryinitRecordMainList(InventoryinitRecordMainExportReqVO exportReqVO) { return inventoryinitRecordMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestDetailService.java index bf5f47aa..d45c7148 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.inventoryinitRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventoryinitRequest.vo.InventoryinitRequestDetailCreateReqVO; import com.win.module.wms.controller.inventoryinitRequest.vo.InventoryinitRequestDetailExportReqVO; import com.win.module.wms.controller.inventoryinitRequest.vo.InventoryinitRequestDetailPageReqVO; @@ -62,6 +63,13 @@ public interface InventoryinitRequestDetailService { * @return 库存初始化申请子分页 */ PageResult getInventoryinitRequestDetailPage(InventoryinitRequestDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索库存初始化申请子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getInventoryinitRequestDetailSenior(CustomConditions conditions); /** * 获得库存初始化申请子列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestDetailServiceImpl.java index d8b0052c..0a1d33ba 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.inventoryinitRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventoryinitRequest.vo.InventoryinitRequestDetailCreateReqVO; import com.win.module.wms.controller.inventoryinitRequest.vo.InventoryinitRequestDetailExportReqVO; import com.win.module.wms.controller.inventoryinitRequest.vo.InventoryinitRequestDetailPageReqVO; @@ -77,7 +78,10 @@ public class InventoryinitRequestDetailServiceImpl implements InventoryinitReque public PageResult getInventoryinitRequestDetailPage(InventoryinitRequestDetailPageReqVO pageReqVO) { return inventoryinitRequestDetailMapper.selectPage(pageReqVO); } - + @Override + public PageResult getInventoryinitRequestDetailSenior(CustomConditions conditions) { + return inventoryinitRequestDetailMapper.selectSenior(conditions); + } @Override public List getInventoryinitRequestDetailList(InventoryinitRequestDetailExportReqVO exportReqVO) { return inventoryinitRequestDetailMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestMainService.java index 874cf1ca..adaec648 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.inventoryinitRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventoryinitRequest.vo.InventoryinitRequestMainCreateReqVO; import com.win.module.wms.controller.inventoryinitRequest.vo.InventoryinitRequestMainExportReqVO; import com.win.module.wms.controller.inventoryinitRequest.vo.InventoryinitRequestMainPageReqVO; @@ -62,6 +63,13 @@ public interface InventoryinitRequestMainService { * @return 库存初始化申请主分页 */ PageResult getInventoryinitRequestMainPage(InventoryinitRequestMainPageReqVO pageReqVO); + /** + * 获得用高级搜索库存初始化申请主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getInventoryinitRequestMainSenior(CustomConditions conditions); /** * 获得库存初始化申请主列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestMainServiceImpl.java index b9d4d705..d76142ff 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventoryinitRequest/InventoryinitRequestMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.inventoryinitRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventoryinitRequest.vo.InventoryinitRequestMainCreateReqVO; import com.win.module.wms.controller.inventoryinitRequest.vo.InventoryinitRequestMainExportReqVO; import com.win.module.wms.controller.inventoryinitRequest.vo.InventoryinitRequestMainPageReqVO; @@ -77,7 +78,10 @@ public class InventoryinitRequestMainServiceImpl implements InventoryinitRequest public PageResult getInventoryinitRequestMainPage(InventoryinitRequestMainPageReqVO pageReqVO) { return inventoryinitRequestMainMapper.selectPage(pageReqVO); } - + @Override + public PageResult getInventoryinitRequestMainSenior(CustomConditions conditions) { + return inventoryinitRequestMainMapper.selectSenior(conditions); + } @Override public List getInventoryinitRequestMainList(InventoryinitRequestMainExportReqVO exportReqVO) { return inventoryinitRequestMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobDetailService.java index 5a7b9e6f..37a4d0f3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.inventorymoveJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobDetailCreateReqVO; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobDetailExportReqVO; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobDetailPageReqVO; @@ -62,6 +63,14 @@ public interface InventorymoveJobDetailService { * @return 库存转移任务子分页 */ PageResult getInventorymoveJobDetailPage(InventorymoveJobDetailPageReqVO pageReqVO); + + /** + * 获得用高级搜索库存转移任务子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getInventorymoveJobDetailSenior(CustomConditions conditions); /** * 获得库存转移任务子列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobDetailServiceImpl.java index d79f5722..37dcd65a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.inventorymoveJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobDetailCreateReqVO; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobDetailExportReqVO; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobDetailPageReqVO; @@ -77,7 +78,11 @@ public class InventorymoveJobDetailServiceImpl implements InventorymoveJobDetail public PageResult getInventorymoveJobDetailPage(InventorymoveJobDetailPageReqVO pageReqVO) { return inventorymoveJobDetailMapper.selectPage(pageReqVO); } - + + @Override + public PageResult getInventorymoveJobDetailSenior(CustomConditions conditions) { + return inventorymoveJobDetailMapper.selectSenior(conditions); + } @Override public List getInventorymoveJobDetailList(InventorymoveJobDetailExportReqVO exportReqVO) { return inventorymoveJobDetailMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainService.java index b8d90153..af2fbd4b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.inventorymoveJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobMainCreateReqVO; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobMainExportReqVO; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobMainPageReqVO; @@ -70,6 +71,14 @@ public interface InventorymoveJobMainService { * @return 库存转移任务主列表 */ List getInventorymoveJobMainList(InventorymoveJobMainExportReqVO exportReqVO); + + /** + * 获得用高级搜索库存转移任务主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getInventorymoveJobMainSenior(CustomConditions conditions); /** * 校验任务状态正确 *@author chenfang diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java index 44ce1a36..d54340bb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java @@ -1,11 +1,11 @@ package com.win.module.wms.service.inventorymoveJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobMainCreateReqVO; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobMainExportReqVO; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobMainPageReqVO; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobMainUpdateReqVO; -import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -85,6 +85,10 @@ public class InventorymoveJobMainServiceImpl implements InventorymoveJobMainServ return inventorymoveJobMainMapper.selectList(exportReqVO); } @Override + public PageResult getInventorymoveJobMainSenior(CustomConditions conditions) { + return inventorymoveJobMainMapper.selectSenior(conditions); + } + @Override public InventorymoveJobMainDO inventorymoveJobMainDoStatusRight(String pnumber, String pstatus) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("number",pnumber); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRecord/InventorymoveRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRecord/InventorymoveRecordDetailService.java index d9301018..ec5fa9b4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRecord/InventorymoveRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRecord/InventorymoveRecordDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.inventorymoveRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventorymoveRecord.vo.InventorymoveRecordDetailCreateReqVO; import com.win.module.wms.controller.inventorymoveRecord.vo.InventorymoveRecordDetailExportReqVO; import com.win.module.wms.controller.inventorymoveRecord.vo.InventorymoveRecordDetailPageReqVO; @@ -55,6 +56,14 @@ public interface InventorymoveRecordDetailService { */ List getInventorymoveRecordDetailList(Collection ids); + /** + * 获得用高级搜索库存转移记录子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getInventorymoveRecordDetailSenior(CustomConditions conditions); + /** * 获得库存转移记录子分页 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRecord/InventorymoveRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRecord/InventorymoveRecordDetailServiceImpl.java index 62adf1f7..b57784b0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRecord/InventorymoveRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRecord/InventorymoveRecordDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.inventorymoveRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventorymoveRecord.vo.InventorymoveRecordDetailCreateReqVO; import com.win.module.wms.controller.inventorymoveRecord.vo.InventorymoveRecordDetailExportReqVO; import com.win.module.wms.controller.inventorymoveRecord.vo.InventorymoveRecordDetailPageReqVO; @@ -72,7 +73,10 @@ public class InventorymoveRecordDetailServiceImpl implements InventorymoveRecord public List getInventorymoveRecordDetailList(Collection ids) { return inventorymoveRecordDetailMapper.selectBatchIds(ids); } - + @Override + public PageResult getInventorymoveRecordDetailSenior(CustomConditions conditions) { + return inventorymoveRecordDetailMapper.selectSenior(conditions); + } @Override public PageResult getInventorymoveRecordDetailPage(InventorymoveRecordDetailPageReqVO pageReqVO) { return inventorymoveRecordDetailMapper.selectPage(pageReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRecord/InventorymoveRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRecord/InventorymoveRecordMainService.java index 34752d7f..37618ee2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRecord/InventorymoveRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRecord/InventorymoveRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.inventorymoveRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventorymoveRecord.vo.InventorymoveRecordMainCreateReqVO; import com.win.module.wms.controller.inventorymoveRecord.vo.InventorymoveRecordMainExportReqVO; import com.win.module.wms.controller.inventorymoveRecord.vo.InventorymoveRecordMainPageReqVO; @@ -62,6 +63,14 @@ public interface InventorymoveRecordMainService { * @return 库存转移记录主分页 */ PageResult getInventorymoveRecordMainPage(InventorymoveRecordMainPageReqVO pageReqVO); + + /** + * 获得用高级搜索库存转移记录主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getInventorymoveRecordMainSenior(CustomConditions conditions); /** * 获得库存转移记录主列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRecord/InventorymoveRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRecord/InventorymoveRecordMainServiceImpl.java index 9f11b4d5..ae929318 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRecord/InventorymoveRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRecord/InventorymoveRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.inventorymoveRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventorymoveRecord.vo.InventorymoveRecordMainCreateReqVO; import com.win.module.wms.controller.inventorymoveRecord.vo.InventorymoveRecordMainExportReqVO; import com.win.module.wms.controller.inventorymoveRecord.vo.InventorymoveRecordMainPageReqVO; @@ -77,7 +78,11 @@ public class InventorymoveRecordMainServiceImpl implements InventorymoveRecordMa public PageResult getInventorymoveRecordMainPage(InventorymoveRecordMainPageReqVO pageReqVO) { return inventorymoveRecordMainMapper.selectPage(pageReqVO); } - + + @Override + public PageResult getInventorymoveRecordMainSenior(CustomConditions conditions) { + return inventorymoveRecordMainMapper.selectSenior(conditions); + } @Override public List getInventorymoveRecordMainList(InventorymoveRecordMainExportReqVO exportReqVO) { return inventorymoveRecordMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestDetailService.java index 332a569b..36c29d4c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.inventorymoveRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventorymoveRequest.vo.InventorymoveRequestDetailCreateReqVO; import com.win.module.wms.controller.inventorymoveRequest.vo.InventorymoveRequestDetailExportReqVO; import com.win.module.wms.controller.inventorymoveRequest.vo.InventorymoveRequestDetailPageReqVO; @@ -63,6 +64,14 @@ public interface InventorymoveRequestDetailService { */ PageResult getInventorymoveRequestDetailPage(InventorymoveRequestDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索库存转移申请子分页分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getInventorymoveRequestDetailSenior(CustomConditions conditions); + /** * 获得库存转移申请子列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestDetailServiceImpl.java index 80627fda..342fbbee 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.inventorymoveRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventorymoveRequest.vo.InventorymoveRequestDetailCreateReqVO; import com.win.module.wms.controller.inventorymoveRequest.vo.InventorymoveRequestDetailExportReqVO; import com.win.module.wms.controller.inventorymoveRequest.vo.InventorymoveRequestDetailPageReqVO; @@ -77,7 +78,12 @@ public class InventorymoveRequestDetailServiceImpl implements InventorymoveReque public PageResult getInventorymoveRequestDetailPage(InventorymoveRequestDetailPageReqVO pageReqVO) { return inventorymoveRequestDetailMapper.selectPage(pageReqVO); } - + + @Override + public PageResult getInventorymoveRequestDetailSenior(CustomConditions conditions) { + return inventorymoveRequestDetailMapper.selectSenior(conditions); + } + @Override public List getInventorymoveRequestDetailList(InventorymoveRequestDetailExportReqVO exportReqVO) { return inventorymoveRequestDetailMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainService.java index 2f3d1c7d..37e54d2e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.inventorymoveRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventorymoveRequest.vo.InventorymoveRequestMainCreateReqVO; import com.win.module.wms.controller.inventorymoveRequest.vo.InventorymoveRequestMainExportReqVO; import com.win.module.wms.controller.inventorymoveRequest.vo.InventorymoveRequestMainPageReqVO; @@ -63,6 +64,14 @@ public interface InventorymoveRequestMainService { */ PageResult getInventorymoveRequestMainPage(InventorymoveRequestMainPageReqVO pageReqVO); + /** + * 获得用高级搜索库存转移申请主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getInventorymoveRequestMainSenior(CustomConditions conditions); + /** * 获得库存转移申请主列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainServiceImpl.java index 5b14fdf7..3adcecec 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.inventorymoveRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.inventorymoveRequest.vo.InventorymoveRequestMainCreateReqVO; import com.win.module.wms.controller.inventorymoveRequest.vo.InventorymoveRequestMainExportReqVO; import com.win.module.wms.controller.inventorymoveRequest.vo.InventorymoveRequestMainPageReqVO; @@ -77,7 +78,11 @@ public class InventorymoveRequestMainServiceImpl implements InventorymoveRequest public PageResult getInventorymoveRequestMainPage(InventorymoveRequestMainPageReqVO pageReqVO) { return inventorymoveRequestMainMapper.selectPage(pageReqVO); } - + + @Override + public PageResult getInventorymoveRequestMainSenior(CustomConditions conditions) { + return inventorymoveRequestMainMapper.selectSenior(conditions); + } @Override public List getInventorymoveRequestMainList(InventorymoveRequestMainExportReqVO exportReqVO) { return inventorymoveRequestMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobDetailService.java index 92da83f1..c00a531a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.issueJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.issueJob.vo.IssueJobDetailCreateReqVO; import com.win.module.wms.controller.issueJob.vo.IssueJobDetailExportReqVO; import com.win.module.wms.controller.issueJob.vo.IssueJobDetailPageReqVO; @@ -63,6 +64,14 @@ public interface IssueJobDetailService { */ PageResult getIssueJobDetailPage(IssueJobDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索发料任务子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getIssueJobDetailSenior(CustomConditions conditions); + /** * 获得发料任务子列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobDetailServiceImpl.java index bb5f66ae..1f164b7c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.issueJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.issueJob.vo.IssueJobDetailCreateReqVO; import com.win.module.wms.controller.issueJob.vo.IssueJobDetailExportReqVO; import com.win.module.wms.controller.issueJob.vo.IssueJobDetailPageReqVO; @@ -72,7 +73,11 @@ public class IssueJobDetailServiceImpl implements IssueJobDetailService { public List getIssueJobDetailList(Collection ids) { return issueJobDetailMapper.selectBatchIds(ids); } - + + @Override + public PageResult getIssueJobDetailSenior(CustomConditions conditions) { + return issueJobDetailMapper.selectSenior(conditions); + } @Override public PageResult getIssueJobDetailPage(IssueJobDetailPageReqVO pageReqVO) { return issueJobDetailMapper.selectPage(pageReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainService.java index 7981f8b8..34291fc9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.issueJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.issueJob.vo.IssueJobMainCreateReqVO; import com.win.module.wms.controller.issueJob.vo.IssueJobMainExportReqVO; import com.win.module.wms.controller.issueJob.vo.IssueJobMainPageReqVO; @@ -63,6 +64,14 @@ public interface IssueJobMainService { */ PageResult getIssueJobMainPage(IssueJobMainPageReqVO pageReqVO); + /** + * 获得用高级搜索发料任务主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getIssueJobMainSenior(CustomConditions conditions); + /** * 获得发料任务主列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java index deb2791e..b6416a46 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java @@ -1,11 +1,11 @@ package com.win.module.wms.service.issueJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.issueJob.vo.IssueJobMainCreateReqVO; import com.win.module.wms.controller.issueJob.vo.IssueJobMainExportReqVO; import com.win.module.wms.controller.issueJob.vo.IssueJobMainPageReqVO; import com.win.module.wms.controller.issueJob.vo.IssueJobMainUpdateReqVO; -import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -79,7 +79,11 @@ public class IssueJobMainServiceImpl implements IssueJobMainService { public PageResult getIssueJobMainPage(IssueJobMainPageReqVO pageReqVO) { return issueJobMainMapper.selectPage(pageReqVO); } - + + @Override + public PageResult getIssueJobMainSenior(CustomConditions conditions) { + return issueJobMainMapper.selectSenior(conditions); + } @Override public List getIssueJobMainList(IssueJobMainExportReqVO exportReqVO) { return issueJobMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRecord/IssueRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRecord/IssueRecordDetailService.java index 7c1fd9fb..54fc99fc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRecord/IssueRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRecord/IssueRecordDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.issueRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.issueRecord.vo.IssueRecordDetailCreateReqVO; import com.win.module.wms.controller.issueRecord.vo.IssueRecordDetailExportReqVO; import com.win.module.wms.controller.issueRecord.vo.IssueRecordDetailPageReqVO; @@ -63,6 +64,14 @@ public interface IssueRecordDetailService { */ PageResult getIssueRecordDetailPage(IssueRecordDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索发料记录子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getIssueRecordDetailSenior(CustomConditions conditions); + /** * 获得发料记录子列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRecord/IssueRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRecord/IssueRecordDetailServiceImpl.java index 8da4ee60..849307f8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRecord/IssueRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRecord/IssueRecordDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.issueRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.issueRecord.vo.IssueRecordDetailCreateReqVO; import com.win.module.wms.controller.issueRecord.vo.IssueRecordDetailExportReqVO; import com.win.module.wms.controller.issueRecord.vo.IssueRecordDetailPageReqVO; @@ -77,7 +78,10 @@ public class IssueRecordDetailServiceImpl implements IssueRecordDetailService { public PageResult getIssueRecordDetailPage(IssueRecordDetailPageReqVO pageReqVO) { return issueRecordDetailMapper.selectPage(pageReqVO); } - + @Override + public PageResult getIssueRecordDetailSenior(CustomConditions conditions) { + return issueRecordDetailMapper.selectSenior(conditions); + } @Override public List getIssueRecordDetailList(IssueRecordDetailExportReqVO exportReqVO) { return issueRecordDetailMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRecord/IssueRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRecord/IssueRecordMainService.java index 12ceeb05..a97abbef 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRecord/IssueRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRecord/IssueRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.issueRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.issueRecord.vo.IssueRecordMainCreateReqVO; import com.win.module.wms.controller.issueRecord.vo.IssueRecordMainExportReqVO; import com.win.module.wms.controller.issueRecord.vo.IssueRecordMainPageReqVO; @@ -63,6 +64,14 @@ public interface IssueRecordMainService { */ PageResult getIssueRecordMainPage(IssueRecordMainPageReqVO pageReqVO); + /** + * 获得用高级搜索发料记录主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getIssueRecordMainSenior(CustomConditions conditions); + /** * 获得发料记录主列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRecord/IssueRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRecord/IssueRecordMainServiceImpl.java index 52b9507c..6598559e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRecord/IssueRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRecord/IssueRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.issueRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.issueRecord.vo.IssueRecordMainCreateReqVO; import com.win.module.wms.controller.issueRecord.vo.IssueRecordMainExportReqVO; import com.win.module.wms.controller.issueRecord.vo.IssueRecordMainPageReqVO; @@ -77,7 +78,10 @@ public class IssueRecordMainServiceImpl implements IssueRecordMainService { public PageResult getIssueRecordMainPage(IssueRecordMainPageReqVO pageReqVO) { return issueRecordMainMapper.selectPage(pageReqVO); } - + @Override + public PageResult getIssueRecordMainSenior(CustomConditions conditions) { + return issueRecordMainMapper.selectSenior(conditions); + } @Override public List getIssueRecordMainList(IssueRecordMainExportReqVO exportReqVO) { return issueRecordMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestDetailService.java index 05af0efb..60822cdc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.issueRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.issueRequest.vo.IssueRequestDetailCreateReqVO; import com.win.module.wms.controller.issueRequest.vo.IssueRequestDetailExportReqVO; import com.win.module.wms.controller.issueRequest.vo.IssueRequestDetailPageReqVO; @@ -63,6 +64,14 @@ public interface IssueRequestDetailService { */ PageResult getIssueRequestDetailPage(IssueRequestDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索发料申请子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getIssueRequestDetailSenior(CustomConditions conditions); + /** * 获得发料申请子列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestDetailServiceImpl.java index 50a38c2c..202525a3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.issueRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.issueRequest.vo.IssueRequestDetailCreateReqVO; import com.win.module.wms.controller.issueRequest.vo.IssueRequestDetailExportReqVO; import com.win.module.wms.controller.issueRequest.vo.IssueRequestDetailPageReqVO; @@ -77,7 +78,10 @@ public class IssueRequestDetailServiceImpl implements IssueRequestDetailService public PageResult getIssueRequestDetailPage(IssueRequestDetailPageReqVO pageReqVO) { return issueRequestDetailMapper.selectPage(pageReqVO); } - + @Override + public PageResult getIssueRequestDetailSenior(CustomConditions conditions) { + return issueRequestDetailMapper.selectSenior(conditions); + } @Override public List getIssueRequestDetailList(IssueRequestDetailExportReqVO exportReqVO) { return issueRequestDetailMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainService.java index 97144eb3..fe7a7350 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.issueRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.issueRequest.vo.IssueRequestMainCreateReqVO; import com.win.module.wms.controller.issueRequest.vo.IssueRequestMainExportReqVO; import com.win.module.wms.controller.issueRequest.vo.IssueRequestMainPageReqVO; @@ -63,6 +64,14 @@ public interface IssueRequestMainService { */ PageResult getIssueRequestMainPage(IssueRequestMainPageReqVO pageReqVO); + /** + * 获得用高级搜索发料申请主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getIssueRequestMainSenior(CustomConditions conditions); + /** * 获得发料申请主列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainServiceImpl.java index 273b7e44..ef6a6e10 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.issueRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.issueRequest.vo.IssueRequestMainCreateReqVO; import com.win.module.wms.controller.issueRequest.vo.IssueRequestMainExportReqVO; import com.win.module.wms.controller.issueRequest.vo.IssueRequestMainPageReqVO; @@ -77,6 +78,10 @@ public class IssueRequestMainServiceImpl implements IssueRequestMainService { public PageResult getIssueRequestMainPage(IssueRequestMainPageReqVO pageReqVO) { return issueRequestMainMapper.selectPage(pageReqVO); } + @Override + public PageResult getIssueRequestMainSenior(CustomConditions conditions) { + return issueRequestMainMapper.selectSenior(conditions); + } @Override public List getIssueRequestMainList(IssueRequestMainExportReqVO exportReqVO) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingService.java index 4fd0153d..fbcfdd28 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingService.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.itempackaging; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.itempackaging.vo.*; import com.win.module.wms.dal.dataobject.itempackaging.ItempackagingDO; @@ -61,6 +62,14 @@ public interface ItempackagingService { */ PageResult getItempackagingPage(ItempackagingPageReqVO pageReqVO); + /** + * 获得用高级搜索物品包装信息分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getItempackagingSenior(CustomConditions conditions); + /** * 获得物品包装信息 列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingServiceImpl.java index 76223868..c485e65d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.google.common.annotations.VisibleForTesting; import com.win.framework.common.exception.ServiceException; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.datapermission.core.util.DataPermissionUtils; import com.win.module.wms.controller.itempackaging.vo.*; @@ -83,7 +84,10 @@ public class ItempackagingServiceImpl implements ItempackagingService { public List getItempackagingList(ItempackagingExportReqVO exportReqVO) { return itempackagingMapper.selectList(exportReqVO); } - + @Override + public PageResult getItempackagingSenior(CustomConditions conditions) { + return itempackagingMapper.selectSenior(conditions); + } @Override public List itempackagingimportDocumentList(List itempackagings, Integer mode, Boolean updatePart) { if (CollUtil.isEmpty(itempackagings)) { @@ -91,23 +95,55 @@ public class ItempackagingServiceImpl implements ItempackagingService { } List errorList = new ArrayList<>(); itempackagings.forEach(itempackaging -> { + String massage = ""; // 校验，判断是否有不符合的原因 - try { - if(mode != null){ - validateItempackagingForCreateOrUpdate(null,itempackaging.getItemCode(),itempackaging.getUom(),itempackaging.getStdPackUnit(),itempackaging.getStdPackQty(),itempackaging.getAvailable());} - } catch (ServiceException ex) { - errorList.add(itempackaging); - return; + if(mode != null){ + try { + validateItempackagingExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateItemCodeExists(null,itempackaging.getItemCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateUomExists(itempackaging.getUom()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateStdPackUnitExists(itempackaging.getStdPackUnit()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateStdPackQtyExists(itempackaging.getStdPackQty()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(itempackaging.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } } - // 判断如果不存在，在进行插入 - ItempackagingDO existConfigurationSetting = null; - if (existConfigurationSetting == null&& mode != 3) { - itempackagingMapper.insert(ItempackagingConvert.INSTANCE.convert(itempackaging)); + if(StrUtil.isNotEmpty(massage)){ + massage.substring(0,massage.length()-1); + errorList.add(itempackaging); } - else if (existConfigurationSetting != null && mode != 2) {// 如果存在，判断是否允许更新 - ItempackagingDO itempackagingMapperDO = ItempackagingConvert.INSTANCE.convert(itempackaging); - itempackagingMapperDO.setId(existConfigurationSetting.getId()); - itempackagingMapper.updateById(itempackagingMapperDO); + if(errorList == null){ + // 判断如果不存在，在进行插入 + ItempackagingDO existConfigurationSetting = null; + if (existConfigurationSetting == null&& mode != 3) { + itempackagingMapper.insert(ItempackagingConvert.INSTANCE.convert(itempackaging)); + } + else if (existConfigurationSetting != null && mode != 2) {// 如果存在，判断是否允许更新 + ItempackagingDO itempackagingMapperDO = ItempackagingConvert.INSTANCE.convert(itempackaging); + itempackagingMapperDO.setId(existConfigurationSetting.getId()); + itempackagingMapper.updateById(itempackagingMapperDO); + } } }); //错误不为空并非部分更新，手工回滚 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/jobsetting/JobsettingService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/jobsetting/JobsettingService.java index 84f011f0..43dba645 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/jobsetting/JobsettingService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/jobsetting/JobsettingService.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.jobsetting; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.jobsetting.vo.*; import com.win.module.wms.dal.dataobject.jobsetting.JobsettingDO; @@ -68,6 +69,13 @@ public interface JobsettingService { * @return 任务设置列表 */ List getJobsettingList(JobsettingExportReqVO exportReqVO); + /** + * 获得用高级搜索任务设置分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getJobsettingSenior(CustomConditions conditions); List importJobsettingList(List jobsettings, Integer mode, Boolean updatePart); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/jobsetting/JobsettingServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/jobsetting/JobsettingServiceImpl.java index aa7e170e..a08a7c39 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/jobsetting/JobsettingServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/jobsetting/JobsettingServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.google.common.annotations.VisibleForTesting; import com.win.framework.common.exception.ServiceException; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.datapermission.core.util.DataPermissionUtils; import com.win.module.wms.controller.jobsetting.vo.*; @@ -84,7 +85,10 @@ public class JobsettingServiceImpl implements JobsettingService { public List getJobsettingList(JobsettingExportReqVO exportReqVO) { return jobsettingMapper.selectList(exportReqVO); } - + @Override + public PageResult getJobsettingSenior(CustomConditions conditions) { + return jobsettingMapper.selectSenior(conditions); + } @Override public List importJobsettingList(List jobsettings, Integer mode, Boolean updatePart) { if (CollUtil.isEmpty(jobsettings)) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labeltype/LabeltypeService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labeltype/LabeltypeService.java index 3434b86d..fa2e7120 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labeltype/LabeltypeService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labeltype/LabeltypeService.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.labeltype; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.labeltype.vo.LabeltypeCreateReqVO; import com.win.module.wms.controller.labeltype.vo.LabeltypeExportReqVO; @@ -63,6 +64,13 @@ public interface LabeltypeService { * @return 标签定义分页 */ PageResult getLabeltypePage(LabeltypePageReqVO pageReqVO); + /** + * 获得用高级搜索标签定义分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getLabeltypeSenior(CustomConditions conditions); /** * 获得标签定义列表, 用于 Excel 导出 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labeltype/LabeltypeServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labeltype/LabeltypeServiceImpl.java index 1e2740f3..c64b9919 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labeltype/LabeltypeServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labeltype/LabeltypeServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.labeltype; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.labeltype.vo.LabeltypeCreateReqVO; import com.win.module.wms.controller.labeltype.vo.LabeltypeExportReqVO; @@ -79,7 +80,10 @@ public class LabeltypeServiceImpl implements LabeltypeService { public PageResult getLabeltypePage(LabeltypePageReqVO pageReqVO) { return labletypeMapper.selectPage(pageReqVO); } - + @Override + public PageResult getLabeltypeSenior(CustomConditions conditions) { + return labletypeMapper.selectSenior(conditions); + } @Override public List getLabeltypeList(LabeltypeExportReqVO exportReqVO) { return labletypeMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationService.java index 39aaa3d7..3e88c52a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationService.java @@ -1,13 +1,11 @@ package com.win.module.wms.service.location; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.location.vo.*; -import com.win.module.wms.controller.rule.vo.RuleRespVO; -import com.win.module.wms.dal.dataobject.balance.BalanceDO; import com.win.module.wms.dal.dataobject.location.LocationDO; import javax.validation.Valid; -import java.math.BigDecimal; import java.util.Collection; import java.util.List; @@ -64,6 +62,14 @@ public interface LocationService { */ PageResult getLocationPage(LocationPageReqVO pageReqVO); + /** + * 获得用高级搜索库位分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getLocationSenior(CustomConditions conditions); + /** * 获得库位列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java index ca3b6c57..f53e1269 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java @@ -4,17 +4,13 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.google.common.annotations.VisibleForTesting; -import com.win.framework.common.exception.ErrorCode; import com.win.framework.common.exception.ServiceException; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.datapermission.core.util.DataPermissionUtils; import com.win.module.wms.controller.location.vo.*; -import com.win.module.wms.controller.rule.vo.RuleRespVO; import com.win.module.wms.convert.location.LocationConvert; -import com.win.module.wms.dal.dataobject.balance.BalanceDO; -import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.location.LocationDO; -import com.win.module.wms.dal.dataobject.expectout.ExpectoutDO; import com.win.module.wms.dal.mysql.balance.BalanceMapper; import com.win.module.wms.dal.mysql.expectout.ExpectoutMapper; import com.win.module.wms.dal.mysql.location.LocationMapper; @@ -22,7 +18,6 @@ import com.win.module.wms.service.rule.RuleService; import org.springframework.stereotype.Service; import org.springframework.transaction.interceptor.TransactionAspectSupport; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; import javax.annotation.Resource; import java.math.BigDecimal; @@ -105,6 +100,10 @@ public class LocationServiceImpl implements LocationService { return locationMapper.selectList(exportReqVO); } + @Override + public PageResult getLocationSenior(CustomConditions conditions) { + return locationMapper.selectSenior(conditions); + } @Override public List importLocationList(List locations, Integer mode, Boolean updatePart) { if (CollUtil.isEmpty(locations)) { @@ -112,25 +111,76 @@ public class LocationServiceImpl implements LocationService { } List errorList = new ArrayList<>(); locations.forEach(location -> { + String massage = ""; + // 校验，判断是否有不符合的原因 - try { - if(mode != null){ - validateLocationForCreateOrUpdate(null,location.getCode(),location.getAreaCode(),location.getWarehouseCode() - ,location.getLocationGroupCode(),location.getErpLocationCode(),location.getType(),location.getPickPriority() - ,location.getUserGroupCode(),location.getAvailable());} - } catch (ServiceException ex) { - errorList.add(location); - return; + if(mode != null){ + try { + validateLocationExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCodeExists(null,location.getCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateWarehouseCodeExists(location.getWarehouseCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAreaCodeExists(location.getAreaCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateErpLocationCodeExists(location.getErpLocationCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateLocationGroupCodeExists(location.getUserGroupCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateTypeExists(location.getType()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validatePickPriorityExists(location.getPickPriority()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateUserGroupCodeExists(location.getUserGroupCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(location.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } } - // 判断如果不存在，在进行插入 - LocationDO existConfigurationSetting = null; - if (existConfigurationSetting == null&& mode != 3) { - locationMapper.insert(LocationConvert.INSTANCE.convert(location)); + if(StrUtil.isNotEmpty(massage)){ + massage.substring(0,massage.length()-1); + errorList.add(location); } - else if (existConfigurationSetting != null && mode != 2) {// 如果存在，判断是否允许更新 - LocationDO locationDO = LocationConvert.INSTANCE.convert(location); - locationDO.setId(existConfigurationSetting.getId()); - locationMapper.updateById(locationDO); + if(errorList == null){ + // 判断如果不存在，在进行插入 + LocationDO existConfigurationSetting = null; + if (existConfigurationSetting == null&& mode != 3) { + locationMapper.insert(LocationConvert.INSTANCE.convert(location)); + } + else if (existConfigurationSetting != null && mode != 2) {// 如果存在，判断是否允许更新 + LocationDO locationDO = LocationConvert.INSTANCE.convert(location); + locationDO.setId(existConfigurationSetting.getId()); + locationMapper.updateById(locationDO); + } } }); //错误不为空并非部分更新，手工回滚 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/locationcapacity/LocationcapacityService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/locationcapacity/LocationcapacityService.java index f00803ad..db427886 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/locationcapacity/LocationcapacityService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/locationcapacity/LocationcapacityService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.locationcapacity; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.locationcapacity.vo.LocationcapacityCreateReqVO; import com.win.module.wms.controller.locationcapacity.vo.LocationcapacityExportReqVO; import com.win.module.wms.controller.locationcapacity.vo.LocationcapacityPageReqVO; @@ -63,6 +64,14 @@ public interface LocationcapacityService { */ PageResult getLocationcapacityPage(LocationcapacityPageReqVO pageReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getLocationcapacitySenior(CustomConditions conditions); + /** * 获得库位容量列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/locationcapacity/LocationcapacityServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/locationcapacity/LocationcapacityServiceImpl.java index 0b384c44..aad118e4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/locationcapacity/LocationcapacityServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/locationcapacity/LocationcapacityServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.locationcapacity; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.locationcapacity.vo.LocationcapacityCreateReqVO; import com.win.module.wms.controller.locationcapacity.vo.LocationcapacityExportReqVO; import com.win.module.wms.controller.locationcapacity.vo.LocationcapacityPageReqVO; @@ -81,6 +82,10 @@ public class LocationcapacityServiceImpl implements LocationcapacityService { return locationcapacityMapper.selectPage(pageReqVO); } + @Override + public PageResult getLocationcapacitySenior(CustomConditions conditions) { + return locationcapacityMapper.selectSenior(conditions); + } @Override public List getLocationcapacityList(LocationcapacityExportReqVO exportReqVO) { return locationcapacityMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/locationgroup/LocationgroupService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/locationgroup/LocationgroupService.java index 66d3c308..bb6bae5c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/locationgroup/LocationgroupService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/locationgroup/LocationgroupService.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.locationgroup; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.locationgroup.vo.*; import com.win.module.wms.dal.dataobject.locationgroup.LocationgroupDO; @@ -61,6 +62,15 @@ public interface LocationgroupService { */ PageResult getLocationgroupPage(LocationgroupPageReqVO pageReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getLocationgroupSenior(CustomConditions conditions); + + /** * 获得库位组列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/locationgroup/LocationgroupServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/locationgroup/LocationgroupServiceImpl.java index 21d5d814..ee11cc1c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/locationgroup/LocationgroupServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/locationgroup/LocationgroupServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.google.common.annotations.VisibleForTesting; import com.win.framework.common.exception.ServiceException; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.datapermission.core.util.DataPermissionUtils; import com.win.module.wms.controller.locationgroup.vo.*; @@ -83,7 +84,10 @@ public class LocationgroupServiceImpl implements LocationgroupService { public List getLocationgroupList(LocationgroupExportReqVO exportReqVO) { return locationgroupMapper.selectList(exportReqVO); } - + @Override + public PageResult getLocationgroupSenior(CustomConditions conditions) { + return locationgroupMapper.selectSenior(conditions); + } @Override public List importLocationGroupList(List locationGroups, Integer mode, Boolean updatePart) { if (CollUtil.isEmpty(locationGroups)) { @@ -92,23 +96,48 @@ public class LocationgroupServiceImpl implements LocationgroupService { List errorList = new ArrayList<>(); locationGroups.forEach(locationGroup -> { // 校验，判断是否有不符合的原因 - try { - if(mode != null){ - validateLocationForCreateOrUpdate(null,locationGroup.getCode(),locationGroup.getAreaCode(), - locationGroup.getWarehouseCode(),locationGroup.getAvailable());} - } catch (ServiceException ex) { - errorList.add(locationGroup); - return; + String massage = ""; + if(mode != null){ + try { + validateLocationgroupExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCodeExists(null,locationGroup.getCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateWarehouseCodeExists(locationGroup.getWarehouseCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAreaCodeExists(locationGroup.getAreaCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(locationGroup.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } } - // 判断如果不存在，在进行插入 - LocationgroupDO existConfigurationSetting = null; - if (existConfigurationSetting == null&& mode != 3) { - locationgroupMapper.insert(LocationConvert.INSTANCE.convert(locationGroup)); + if(StrUtil.isNotEmpty(massage)){ + massage.substring(0,massage.length()-1); + errorList.add(locationGroup); } - else if (existConfigurationSetting != null && mode != 2) {// 如果存在，判断是否允许更新 - LocationgroupDO locationgroupDO = LocationConvert.INSTANCE.convert(locationGroup); - locationgroupDO.setId(existConfigurationSetting.getId()); - locationgroupMapper.updateById(locationgroupDO); + if(errorList == null){ + LocationgroupDO existConfigurationSetting = null; + if (existConfigurationSetting == null&& mode != 3) { + locationgroupMapper.insert(LocationConvert.INSTANCE.convert(locationGroup)); + } + else if (existConfigurationSetting != null && mode != 2) {// 如果存在，判断是否允许更新 + LocationgroupDO locationgroupDO = LocationConvert.INSTANCE.convert(locationGroup); + locationgroupDO.setId(existConfigurationSetting.getId()); + locationgroupMapper.updateById(locationgroupDO); + } } }); //错误不为空并非部分更新，手工回滚 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRecord/OfflinesettlementRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRecord/OfflinesettlementRecordDetailService.java index 114a7e99..d888dee1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRecord/OfflinesettlementRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRecord/OfflinesettlementRecordDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.offlinesettlementRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.offlinesettlementRecord.vo.OfflinesettlementRecordDetailCreateReqVO; import com.win.module.wms.controller.offlinesettlementRecord.vo.OfflinesettlementRecordDetailExportReqVO; import com.win.module.wms.controller.offlinesettlementRecord.vo.OfflinesettlementRecordDetailPageReqVO; @@ -63,6 +64,14 @@ public interface OfflinesettlementRecordDetailService { */ PageResult getOfflinesettlementRecordDetailPage(OfflinesettlementRecordDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索下线结算记录子分页 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getOfflinesettlementRecordDetailSenior(CustomConditions conditions); + /** * 获得下线结算记录子列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRecord/OfflinesettlementRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRecord/OfflinesettlementRecordDetailServiceImpl.java index d0a4420c..16f7dda2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRecord/OfflinesettlementRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRecord/OfflinesettlementRecordDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.offlinesettlementRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.offlinesettlementRecord.vo.OfflinesettlementRecordDetailCreateReqVO; import com.win.module.wms.controller.offlinesettlementRecord.vo.OfflinesettlementRecordDetailExportReqVO; import com.win.module.wms.controller.offlinesettlementRecord.vo.OfflinesettlementRecordDetailPageReqVO; @@ -73,6 +74,10 @@ public class OfflinesettlementRecordDetailServiceImpl implements Offlinesettleme return offlinesettlementRecordDetailMapper.selectBatchIds(ids); } + @Override + public PageResult getOfflinesettlementRecordDetailSenior(CustomConditions conditions) { + return offlinesettlementRecordDetailMapper.selectSenior(conditions); + } @Override public PageResult getOfflinesettlementRecordDetailPage(OfflinesettlementRecordDetailPageReqVO pageReqVO) { return offlinesettlementRecordDetailMapper.selectPage(pageReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRecord/OfflinesettlementRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRecord/OfflinesettlementRecordMainService.java index d31e58d8..33838e2e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRecord/OfflinesettlementRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRecord/OfflinesettlementRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.offlinesettlementRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.offlinesettlementRecord.vo.OfflinesettlementRecordMainCreateReqVO; import com.win.module.wms.controller.offlinesettlementRecord.vo.OfflinesettlementRecordMainExportReqVO; import com.win.module.wms.controller.offlinesettlementRecord.vo.OfflinesettlementRecordMainPageReqVO; @@ -63,6 +64,14 @@ public interface OfflinesettlementRecordMainService { */ PageResult getOfflinesettlementRecordMainPage(OfflinesettlementRecordMainPageReqVO pageReqVO); + /** + * 获得用高级搜索下线结算记录主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getOfflinesettlementRecordMainSenior(CustomConditions conditions); + /** * 获得下线结算记录主列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRecord/OfflinesettlementRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRecord/OfflinesettlementRecordMainServiceImpl.java index 9e9b5b58..2123ae23 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRecord/OfflinesettlementRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRecord/OfflinesettlementRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.offlinesettlementRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.offlinesettlementRecord.vo.OfflinesettlementRecordMainCreateReqVO; import com.win.module.wms.controller.offlinesettlementRecord.vo.OfflinesettlementRecordMainExportReqVO; import com.win.module.wms.controller.offlinesettlementRecord.vo.OfflinesettlementRecordMainPageReqVO; @@ -77,7 +78,10 @@ public class OfflinesettlementRecordMainServiceImpl implements Offlinesettlement public PageResult getOfflinesettlementRecordMainPage(OfflinesettlementRecordMainPageReqVO pageReqVO) { return offlinesettlementRecordMainMapper.selectPage(pageReqVO); } - + @Override + public PageResult getOfflinesettlementRecordMainSenior(CustomConditions conditions) { + return offlinesettlementRecordMainMapper.selectSenior(conditions); + } @Override public List getOfflinesettlementRecordMainList(OfflinesettlementRecordMainExportReqVO exportReqVO) { return offlinesettlementRecordMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRequest/OfflinesettlementRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRequest/OfflinesettlementRequestDetailService.java index 484bee8e..ea0ddd1f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRequest/OfflinesettlementRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRequest/OfflinesettlementRequestDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.offlinesettlementRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.offlinesettlementRequest.vo.OfflinesettlementRequestDetailCreateReqVO; import com.win.module.wms.controller.offlinesettlementRequest.vo.OfflinesettlementRequestDetailExportReqVO; import com.win.module.wms.controller.offlinesettlementRequest.vo.OfflinesettlementRequestDetailPageReqVO; @@ -63,6 +64,14 @@ public interface OfflinesettlementRequestDetailService { */ PageResult getOfflinesettlementRequestDetailPage(OfflinesettlementRequestDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索下线结算申请子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getOfflinesettlementRequestDetailSenior(CustomConditions conditions); + /** * 获得下线结算申请子列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRequest/OfflinesettlementRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRequest/OfflinesettlementRequestDetailServiceImpl.java index 0c664e60..65765983 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRequest/OfflinesettlementRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRequest/OfflinesettlementRequestDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.offlinesettlementRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.offlinesettlementRequest.vo.OfflinesettlementRequestDetailCreateReqVO; import com.win.module.wms.controller.offlinesettlementRequest.vo.OfflinesettlementRequestDetailExportReqVO; import com.win.module.wms.controller.offlinesettlementRequest.vo.OfflinesettlementRequestDetailPageReqVO; @@ -73,6 +74,10 @@ public class OfflinesettlementRequestDetailServiceImpl implements Offlinesettlem return offlinesettlementRequestDetailMapper.selectBatchIds(ids); } + @Override + public PageResult getOfflinesettlementRequestDetailSenior(CustomConditions conditions) { + return offlinesettlementRequestDetailMapper.selectSenior(conditions); + } @Override public PageResult getOfflinesettlementRequestDetailPage(OfflinesettlementRequestDetailPageReqVO pageReqVO) { return offlinesettlementRequestDetailMapper.selectPage(pageReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRequest/OfflinesettlementRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRequest/OfflinesettlementRequestMainService.java index 23e3b682..a53a2e55 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRequest/OfflinesettlementRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRequest/OfflinesettlementRequestMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.offlinesettlementRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.offlinesettlementRequest.vo.OfflinesettlementRequestMainCreateReqVO; import com.win.module.wms.controller.offlinesettlementRequest.vo.OfflinesettlementRequestMainExportReqVO; import com.win.module.wms.controller.offlinesettlementRequest.vo.OfflinesettlementRequestMainPageReqVO; @@ -63,6 +64,14 @@ public interface OfflinesettlementRequestMainService { */ PageResult getOfflinesettlementRequestMainPage(OfflinesettlementRequestMainPageReqVO pageReqVO); + /** + * 获得用高级搜索下线结算申请主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getOfflinesettlementRequestMainSenior(CustomConditions conditions); + /** * 获得下线结算申请主列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRequest/OfflinesettlementRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRequest/OfflinesettlementRequestMainServiceImpl.java index ed50ddee..2e33abd1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRequest/OfflinesettlementRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/offlinesettlementRequest/OfflinesettlementRequestMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.offlinesettlementRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.offlinesettlementRequest.vo.OfflinesettlementRequestMainCreateReqVO; import com.win.module.wms.controller.offlinesettlementRequest.vo.OfflinesettlementRequestMainExportReqVO; import com.win.module.wms.controller.offlinesettlementRequest.vo.OfflinesettlementRequestMainPageReqVO; @@ -73,6 +74,10 @@ public class OfflinesettlementRequestMainServiceImpl implements Offlinesettlemen return offlinesettlementRequestMainMapper.selectBatchIds(ids); } + @Override + public PageResult getOfflinesettlementRequestMainSenior(CustomConditions conditions) { + return offlinesettlementRequestMainMapper.selectSenior(conditions); + } @Override public PageResult getOfflinesettlementRequestMainPage(OfflinesettlementRequestMainPageReqVO pageReqVO) { return offlinesettlementRequestMainMapper.selectPage(pageReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRecord/OnlinesettlementRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRecord/OnlinesettlementRecordDetailService.java index c3e20099..f7080c15 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRecord/OnlinesettlementRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRecord/OnlinesettlementRecordDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.onlinesettlementRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.onlinesettlementRecord.vo.OnlinesettlementRecordDetailCreateReqVO; import com.win.module.wms.controller.onlinesettlementRecord.vo.OnlinesettlementRecordDetailExportReqVO; import com.win.module.wms.controller.onlinesettlementRecord.vo.OnlinesettlementRecordDetailPageReqVO; @@ -63,6 +64,14 @@ public interface OnlinesettlementRecordDetailService { */ PageResult getOnlinesettlementRecordDetailPage(OnlinesettlementRecordDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索上线结算记录子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getOnlinesettlementRecordDetailSenior(CustomConditions conditions); + /** * 获得上线结算记录子列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRecord/OnlinesettlementRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRecord/OnlinesettlementRecordDetailServiceImpl.java index 2fa6fc1e..6ce795c1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRecord/OnlinesettlementRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRecord/OnlinesettlementRecordDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.onlinesettlementRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.onlinesettlementRecord.vo.OnlinesettlementRecordDetailCreateReqVO; import com.win.module.wms.controller.onlinesettlementRecord.vo.OnlinesettlementRecordDetailExportReqVO; import com.win.module.wms.controller.onlinesettlementRecord.vo.OnlinesettlementRecordDetailPageReqVO; @@ -77,7 +78,10 @@ public class OnlinesettlementRecordDetailServiceImpl implements Onlinesettlement public PageResult getOnlinesettlementRecordDetailPage(OnlinesettlementRecordDetailPageReqVO pageReqVO) { return onlinesettlementRecordDetailMapper.selectPage(pageReqVO); } - + @Override + public PageResult getOnlinesettlementRecordDetailSenior(CustomConditions conditions) { + return onlinesettlementRecordDetailMapper.selectSenior(conditions); + } @Override public List getOnlinesettlementRecordDetailList(OnlinesettlementRecordDetailExportReqVO exportReqVO) { return onlinesettlementRecordDetailMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRecord/OnlinesettlementRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRecord/OnlinesettlementRecordMainService.java index 4aafb6dd..b8c1587a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRecord/OnlinesettlementRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRecord/OnlinesettlementRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.onlinesettlementRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.onlinesettlementRecord.vo.OnlinesettlementRecordMainCreateReqVO; import com.win.module.wms.controller.onlinesettlementRecord.vo.OnlinesettlementRecordMainExportReqVO; import com.win.module.wms.controller.onlinesettlementRecord.vo.OnlinesettlementRecordMainPageReqVO; @@ -55,6 +56,14 @@ public interface OnlinesettlementRecordMainService { */ List getOnlinesettlementRecordMainList(Collection ids); + /** + * 获得用高级搜索上线结算记录主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getOnlinesettlementRecordMainSenior(CustomConditions conditions); + /** * 获得上线结算记录主分页 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRecord/OnlinesettlementRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRecord/OnlinesettlementRecordMainServiceImpl.java index 79b4e68c..4c3ea744 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRecord/OnlinesettlementRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRecord/OnlinesettlementRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.onlinesettlementRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.onlinesettlementRecord.vo.OnlinesettlementRecordMainCreateReqVO; import com.win.module.wms.controller.onlinesettlementRecord.vo.OnlinesettlementRecordMainExportReqVO; import com.win.module.wms.controller.onlinesettlementRecord.vo.OnlinesettlementRecordMainPageReqVO; @@ -77,7 +78,10 @@ public class OnlinesettlementRecordMainServiceImpl implements OnlinesettlementRe public PageResult getOnlinesettlementRecordMainPage(OnlinesettlementRecordMainPageReqVO pageReqVO) { return onlinesettlementRecordMainMapper.selectPage(pageReqVO); } - + @Override + public PageResult getOnlinesettlementRecordMainSenior(CustomConditions conditions) { + return onlinesettlementRecordMainMapper.selectSenior(conditions); + } @Override public List getOnlinesettlementRecordMainList(OnlinesettlementRecordMainExportReqVO exportReqVO) { return onlinesettlementRecordMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRequest/OnlinesettlementRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRequest/OnlinesettlementRequestDetailService.java index a55a6578..086dcaa9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRequest/OnlinesettlementRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRequest/OnlinesettlementRequestDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.onlinesettlementRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.onlinesettlementRequest.vo.OnlinesettlementRequestDetailCreateReqVO; import com.win.module.wms.controller.onlinesettlementRequest.vo.OnlinesettlementRequestDetailExportReqVO; import com.win.module.wms.controller.onlinesettlementRequest.vo.OnlinesettlementRequestDetailPageReqVO; @@ -63,6 +64,14 @@ public interface OnlinesettlementRequestDetailService { */ PageResult getOnlinesettlementRequestDetailPage(OnlinesettlementRequestDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索上线结算申请子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getOnlinesettlementRequestDetailSenior(CustomConditions conditions); + /** * 获得上线结算申请子列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRequest/OnlinesettlementRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRequest/OnlinesettlementRequestDetailServiceImpl.java index cd28d276..7c1f0cb2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRequest/OnlinesettlementRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRequest/OnlinesettlementRequestDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.onlinesettlementRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.onlinesettlementRequest.vo.OnlinesettlementRequestDetailCreateReqVO; import com.win.module.wms.controller.onlinesettlementRequest.vo.OnlinesettlementRequestDetailExportReqVO; import com.win.module.wms.controller.onlinesettlementRequest.vo.OnlinesettlementRequestDetailPageReqVO; @@ -77,7 +78,10 @@ public class OnlinesettlementRequestDetailServiceImpl implements Onlinesettlemen public PageResult getOnlinesettlementRequestDetailPage(OnlinesettlementRequestDetailPageReqVO pageReqVO) { return onlinesettlementRequestDetailMapper.selectPage(pageReqVO); } - + @Override + public PageResult getOnlinesettlementRequestDetailSenior(CustomConditions conditions) { + return onlinesettlementRequestDetailMapper.selectSenior(conditions); + } @Override public List getOnlinesettlementRequestDetailList(OnlinesettlementRequestDetailExportReqVO exportReqVO) { return onlinesettlementRequestDetailMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRequest/OnlinesettlementRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRequest/OnlinesettlementRequestMainService.java index 83b6186d..41c59390 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRequest/OnlinesettlementRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRequest/OnlinesettlementRequestMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.onlinesettlementRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.onlinesettlementRequest.vo.OnlinesettlementRequestMainCreateReqVO; import com.win.module.wms.controller.onlinesettlementRequest.vo.OnlinesettlementRequestMainExportReqVO; import com.win.module.wms.controller.onlinesettlementRequest.vo.OnlinesettlementRequestMainPageReqVO; @@ -63,6 +64,14 @@ public interface OnlinesettlementRequestMainService { */ PageResult getOnlinesettlementRequestMainPage(OnlinesettlementRequestMainPageReqVO pageReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getOnlinesettlementRequestMainSenior(CustomConditions conditions); + /** * 获得上线结算申请主列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRequest/OnlinesettlementRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRequest/OnlinesettlementRequestMainServiceImpl.java index 4237e827..80836bb3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRequest/OnlinesettlementRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/onlinesettlementRequest/OnlinesettlementRequestMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.onlinesettlementRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.onlinesettlementRequest.vo.OnlinesettlementRequestMainCreateReqVO; import com.win.module.wms.controller.onlinesettlementRequest.vo.OnlinesettlementRequestMainExportReqVO; import com.win.module.wms.controller.onlinesettlementRequest.vo.OnlinesettlementRequestMainPageReqVO; @@ -78,6 +79,10 @@ public class OnlinesettlementRequestMainServiceImpl implements OnlinesettlementR return onlinesettlementRequestMainMapper.selectPage(pageReqVO); } + @Override + public PageResult getOnlinesettlementRequestMainSenior(CustomConditions conditions) { + return onlinesettlementRequestMainMapper.selectSenior(conditions); + } @Override public List getOnlinesettlementRequestMainList(OnlinesettlementRequestMainExportReqVO exportReqVO) { return onlinesettlementRequestMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/owner/OwnerService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/owner/OwnerService.java index 89c27baa..3deb2757 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/owner/OwnerService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/owner/OwnerService.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.owner; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.owner.vo.*; import com.win.module.wms.dal.dataobject.owner.OwnerDO; @@ -61,6 +62,14 @@ public interface OwnerService { */ PageResult getOwnerPage(OwnerPageReqVO pageReqVO); + /** + * 获得用高级搜索货主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getOwnerSenior(CustomConditions conditions); + /** * 获得货主列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/owner/OwnerServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/owner/OwnerServiceImpl.java index cdce5124..72245be3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/owner/OwnerServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/owner/OwnerServiceImpl.java @@ -4,10 +4,13 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.google.common.annotations.VisibleForTesting; import com.win.framework.common.exception.ServiceException; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.datapermission.core.util.DataPermissionUtils; import com.win.module.wms.controller.owner.vo.*; +import com.win.module.wms.convert.accountcalendar.AccountcalendarConvert; import com.win.module.wms.convert.owner.OwnerConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import com.win.module.wms.dal.dataobject.owner.OwnerDO; import com.win.module.wms.dal.mysql.owner.OwnerMapper; import org.springframework.stereotype.Service; @@ -80,7 +83,10 @@ public class OwnerServiceImpl implements OwnerService { public List getOwnerList(OwnerExportReqVO exportReqVO) { return ownerMapper.selectList(exportReqVO); } - + @Override + public PageResult getOwnerSenior(CustomConditions conditions) { + return ownerMapper.selectSenior(conditions); + } @Override public List importOwnerList(List owners, Integer mode, Boolean updatePart) { if (CollUtil.isEmpty(owners)) { @@ -88,23 +94,45 @@ public class OwnerServiceImpl implements OwnerService { } List errorList = new ArrayList<>(); owners.forEach(owner -> { + String massage = ""; // 校验，判断是否有不符合的原因 - try { - if(mode != null){ - validateLocationForCreateOrUpdate(null,owner.getCode(),owner.getShortName(),owner.getAvailable());} - } catch (ServiceException ex) { - errorList.add(owner); - return; + if(mode != null){ + try { + validateOwnerExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCodeExists(null,owner.getCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateShortNameExists(owner.getShortName()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(owner.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } } - // 判断如果不存在，在进行插入 - OwnerDO existConfigurationSetting = null; - if (existConfigurationSetting == null&& mode != 3) { - ownerMapper.insert(OwnerConvert.INSTANCE.convert(owner)); + if(StrUtil.isNotEmpty(massage)){ + massage.substring(0,massage.length()-1); + errorList.add(owner); } - else if (existConfigurationSetting != null && mode != 2) {// 如果存在，判断是否允许更新 - OwnerDO ownerDO = OwnerConvert.INSTANCE.convert(owner); - ownerDO.setId(existConfigurationSetting.getId()); - ownerMapper.updateById(ownerDO); + if(errorList == null){ + // 判断如果不存在，在进行插入 + OwnerDO existOwner = new OwnerDO(); + if (existOwner == null&& mode != 3) { + ownerMapper.insert(OwnerConvert.INSTANCE.convert(owner)); + } + else if (existOwner != null && mode != 2) {// 如果存在，判断是否允许更新 + OwnerDO ownerDO = OwnerConvert.INSTANCE.convert(owner); + ownerDO.setId(existOwner.getId()); + ownerMapper.updateById(ownerDO); + } } }); //错误不为空并非部分更新，手工回滚 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/until/job/JobUtils.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/until/job/JobUtils.java index e00fceb1..cc1528f0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/until/job/JobUtils.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/until/job/JobUtils.java @@ -379,10 +379,35 @@ public class JobUtils { } } + /** + * TB------TB4 + * 先获取管理模式，再根据管理模式查询库存余额，返回查询结果 + * @param itemcode 零件号 + * @param packingnumber 包装号 + * @param batch 批次 + * @param locationcode 库位号 + * @param inventoryStatus 入库库存状态 + * @return + */ + public List selectlocationReturnManagementAccuracyToBalance(String itemcode, String packingnumber, String batch, String locationcode, List inventoryStatus) { + RuleRespVO managementtRule = ruleService.management(null, null, null, null, null, null, itemcode, null, null, + null, locationcode, null, null); + List balanceDO = null; + if ("{\"ManagementPrecision\":\"BY_QUANTITY\"}".equals(managementtRule.getConfiguration())) { + balanceDO = balanceService.selectNumber(itemcode, inventoryStatus, locationcode); + }else if ("{\"ManagementPrecision\":\"BY_BATCH\"}".equals(managementtRule.getConfiguration())) { + balanceDO = balanceService.selectBatch(itemcode, batch, inventoryStatus, locationcode); + }else if("{\"ManagementPrecision\":\"BY_PACKAGING\"}".equals(managementtRule.getConfiguration())) { + balanceDO = balanceService.selectPackaging(itemcode, packingnumber, batch, inventoryStatus, locationcode); + }else if("{\"ManagementPrecision\":\"BY_UNIQUE_ID\"}".equals(managementtRule.getConfiguration())) { + balanceDO = balanceService.selectUniqueId(packingnumber, locationcode, inventoryStatus); + } + return balanceDO; + } /** * TB-------TB1 * 查询库存返回管理精度 - * + * 先获取管理模式，再根据管理模式查询库存余额，返回校验结果 * @param itemcode 零件号 * @param packingnumber 包装号 * @param batch 批次 @@ -391,18 +416,38 @@ public class JobUtils { * @return * @author lianhongxi */ - public List selectlocation(String itemcode, String packingnumber, String batch, String locationcode, String inventoryStatus) { + public List selectlocationReturnManagementAccuracy(String itemcode, String packingnumber, String batch, String locationcode, List inventoryStatus) { RuleRespVO managementtRule = ruleService.management(null, null, null, null, null, null, itemcode, null, null, null, locationcode, null, null); List balanceDO = null; if ("{\"ManagementPrecision\":\"BY_QUANTITY\"}".equals(managementtRule.getConfiguration())) { balanceDO = balanceService.selectNumber(itemcode, inventoryStatus, locationcode); - } else if ("{\"ManagementPrecision\":\"BY_BATCH\"}".equals(managementtRule.getConfiguration())) { + if(balanceDO == null){ + throw new UtilException( "物品代码" + itemcode + "库存状态" + inventoryStatus + "在" + locationcode + "库位中未查找到库存记录"); + }else { + return balanceDO; + } + }else if ("{\"ManagementPrecision\":\"BY_BATCH\"}".equals(managementtRule.getConfiguration())) { balanceDO = balanceService.selectBatch(itemcode, batch, inventoryStatus, locationcode); - } else if ("{\"ManagementPrecision\":\"BY_PACKAGING\"}".equals(managementtRule.getConfiguration())) { + if(balanceDO == null){ + throw new UtilException( "物品代码" + itemcode + "批次" + batch + "库存状态" + inventoryStatus + "在" + locationcode + "库位中未查找到库存记录"); + }else { + return balanceDO; + } + }else if("{\"ManagementPrecision\":\"BY_PACKAGING\"}".equals(managementtRule.getConfiguration())) { balanceDO = balanceService.selectPackaging(itemcode, packingnumber, batch, inventoryStatus, locationcode); - } else if ("{\"ManagementPrecision\":\"BY_UNIQUE_ID\"}".equals(managementtRule.getConfiguration())) { + if(balanceDO == null){ + throw new UtilException( "物品代码" + itemcode + "箱码" + packingnumber + "批次" + batch + "库存状态" + inventoryStatus + "在" + locationcode + "库位中未查找到库存记录"); + }else { + return balanceDO; + } + }else if("{\"ManagementPrecision\":\"BY_UNIQUE_ID\"}".equals(managementtRule.getConfiguration())) { balanceDO = balanceService.selectUniqueId(packingnumber, locationcode, inventoryStatus); + if(balanceDO == null){ + throw new UtilException( "唯一码" + packingnumber + "库存状态" + inventoryStatus + "在" + locationcode + "库位中未查找到库存记录"); + }else { + return balanceDO; + } } return balanceDO; } @@ -422,7 +467,7 @@ public class JobUtils { * @return * @author lianhongxi */ - public List selectLocatioNew(String itemcode, String packingnumber, String batch, String locationcode, String inventoryStatus) { + public List selectLocatioNew(String itemcode, String packingnumber, String batch, String locationcode, List inventoryStatus) { RuleRespVO managementtRule = ruleService.management(null, null, null, null, null, null, itemcode, null, null, null, locationcode, null, null); List expectoutDO = null; @@ -451,8 +496,8 @@ public class JobUtils { * @return * @author lianhongxi */ - public BigDecimal CountLocaltion(String itemcode, String packingnumber, String batch, String locationcode, String inventoryStatus) { - List balanceDO = selectlocation(itemcode, packingnumber, batch, locationcode, inventoryStatus); + public BigDecimal CountLocaltion(String itemcode, String packingnumber, String batch, String locationcode, List inventoryStatus) { + List balanceDO = selectlocationReturnManagementAccuracy(itemcode, packingnumber, batch, locationcode, inventoryStatus); List expectoutDO = selectLocatioNew(itemcode, packingnumber, batch, locationcode, inventoryStatus); BigDecimal esum = BigDecimal.valueOf(expectoutDO.stream().mapToDouble(expectoutDO1 -> expectoutDO1.getQty().doubleValue()).sum()); BigDecimal bsum = BigDecimal.valueOf(balanceDO.stream().mapToDouble(balanceDO1 -> balanceDO1.getQty().doubleValue()).sum()); @@ -472,7 +517,7 @@ public class JobUtils { * @return * @author lianhongxi */ - public String LocaltionExist(String itemcode, String packingnumber, String batch, String locationcode, String inventoryStatus, BigDecimal requstqty) { + public String LocaltionExist(String itemcode, String packingnumber, String batch, String locationcode, List inventoryStatus, BigDecimal requstqty) { BigDecimal enableqty = CountLocaltion(itemcode, packingnumber, batch, locationcode, inventoryStatus); if (requstqty.compareTo(enableqty) > 0) { throw exception(new ErrorCode(1256, "请求数量" + requstqty + "大于库存数量" + enableqty)); @@ -494,12 +539,12 @@ public class JobUtils { } //库存不应该存在 - public List locationNoExist(String itemcode, String packingnumber, String locationcode, String inventorystatus) { + public List locationNoExist(String itemcode, String packingnumber, String locationcode, List inventoryStatus) { RuleRespVO managementtRule = ruleService.management(null, null, null, null, null, null, itemcode, null, null, null, locationcode, null, null); List balanceDO = null; if ("{\"ManagementPrecision\":\"BY_UNIQUE_ID\"}".equals(managementtRule.getConfiguration())) { - balanceDO = balanceService.selectUniqueId(packingnumber, locationcode, inventorystatus); + balanceDO = balanceService.selectUniqueId(packingnumber, locationcode, inventoryStatus); return balanceDO; } else { throw exception(new ErrorCode(1256, "校验通过")); @@ -519,7 +564,7 @@ public class JobUtils { } //从库位未被其他任务占用，有可用库存 - public String locationExistnew(String itemcode, String packingnumber, String batch, String fromlocationcode, String inventoryStatus, BigDecimal requstqty) { + public String locationExistnew(String itemcode, String packingnumber, String batch, String fromlocationcode, List inventoryStatus, BigDecimal requstqty) { if (fromlocationcode.isEmpty()) { return "不需要其他校验"; } @@ -539,12 +584,12 @@ public class JobUtils { * @param pitemcode 零件号 * @param ppackingnumber 包装号 * @param pbatch 批次 - * @param pinventorystatus 入库库存状态 + * @param pinventoryStatus 入库库存状态 * @param plocationcode 库位号 * @return * @author lianhongxi */ - public List selectExpectort(String pitemcode, String ppackingnumber, String pbatch, String pinventorystatus, String plocationcode) { + public List selectExpectort(String pitemcode, String ppackingnumber, String pbatch, List pinventoryStatus, String plocationcode) { RuleRespVO management = ruleService.management(null, null, null, null, null, null, pitemcode, null, null, null, plocationcode, null, null); List expectoutDO = null; @@ -552,13 +597,13 @@ public class JobUtils { String[] splits = management.getConfiguration().split("\""); for (String split : splits) { if ("{\"ManagementPrecision\":\"BY_QUANTITY\"}".equals(management.getConfiguration())) { - expectoutService.selectNumberNew(pitemcode, pinventorystatus, plocationcode); + expectoutService.selectNumberNew(pitemcode, pinventoryStatus, plocationcode); } else if ("{\"ManagementPrecision\":\"BY_BATCH\"}".equals(management.getConfiguration())) { - expectoutDO = expectoutService.selectBatchNew(pitemcode, pbatch, pinventorystatus, plocationcode); + expectoutDO = expectoutService.selectBatchNew(pitemcode, pbatch, pinventoryStatus, plocationcode); } else if ("{\"ManagementPrecision\":\"BY_PACKAGING\"}".equals(management.getConfiguration())) { - expectoutDO = expectoutService.selectPackingNew(pitemcode, ppackingnumber, pbatch, pinventorystatus, plocationcode); + expectoutDO = expectoutService.selectPackingNew(pitemcode, ppackingnumber, pbatch, pinventoryStatus, plocationcode); } else if ("{\"ManagementPrecision\":\"BY_UNIQUE_ID\"}".equals(management.getConfiguration())) { - expectoutDO = expectoutService.selectUniqeIdNew(ppackingnumber, plocationcode, pinventorystatus); + expectoutDO = expectoutService.selectUniqeIdNew(ppackingnumber, plocationcode, pinventoryStatus); } return expectoutDO; } @@ -579,10 +624,10 @@ public class JobUtils { * @param inventoryStatus * @return */ - public List numAndJobIsSame(String itemCode, String packingNumber, String batch, String locationCode, String inventoryStatus) { + public List numAndJobIsSame(String itemCode, String packingNumber, String batch, String locationCode, List inventoryStatus) { List balanceDOList = new ArrayList<>(); try { - balanceDOList = selectlocation(itemCode, packingNumber, batch, locationCode, inventoryStatus); + balanceDOList = selectlocationReturnManagementAccuracy(itemCode, packingNumber, batch, locationCode, inventoryStatus); } catch (Exception e) { throw exception(new ErrorCode(1256, "接口调用异常,请重试")); } @@ -601,10 +646,10 @@ public class JobUtils { * @param inventoryStatus * @return */ - public List fromInventoryEffective(String itemCode, String packingNumber, String batch, String locationCode, String inventoryStatus) { + public List fromInventoryEffective(String itemCode, String packingNumber, String batch, String locationCode, List inventoryStatus) { List balanceDOList = new ArrayList<>(); try { - balanceDOList = selectlocation(itemCode, packingNumber, batch, locationCode, inventoryStatus); + balanceDOList = selectlocationReturnManagementAccuracy(itemCode, packingNumber, batch, locationCode, inventoryStatus); } catch (Exception e) { throw exception(new ErrorCode(1256, "接口调用异常,请重试")); } @@ -622,7 +667,7 @@ public class JobUtils { * @param inventoryStatus * @return */ - public Boolean fromInventoryEffectiveCustomer(String locationCode, String itemCode, String packingNumber, String batch, String inventoryStatus) { + public Boolean fromInventoryEffectiveCustomer(String locationCode, String itemCode, String packingNumber, String batch, List inventoryStatus) { Boolean returnRes = false; List balanceDOList = new ArrayList<>(); try {