diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java index a4d71891..be21c472 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java @@ -23,7 +23,6 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; - import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -31,7 +30,6 @@ import java.io.IOException; import java.time.LocalDateTime; import java.time.ZoneOffset; import java.util.*; - import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.framework.common.pojo.CommonResult.success; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/ProductscrapJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/ProductscrapJobDetailController.java index f9e45adc..9fc7cf74 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/ProductscrapJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/ProductscrapJobDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.productscrapJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productscrapJob.vo.*; @@ -91,7 +92,19 @@ public class ProductscrapJobDetailController { PageResult pageResult = productscrapJobDetailService.getProductscrapJobDetailPage(pageVO); return success(ProductscrapJobDetailConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:productscrap-job-detail:query')") + public CommonResult> getProductscrapJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productscrapJobDetailService.getProductscrapJobDetailSenior(conditions); + PageResult result = ProductscrapJobDetailConvert.INSTANCE.convertPage(pageResult); + for(ProductscrapJobDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出制品报废任务子 Excel") @PreAuthorize("@ss.hasPermission('wms:productscrap-job-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/ProductscrapJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/ProductscrapJobMainController.java index 394d2019..c4a62a71 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/ProductscrapJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/ProductscrapJobMainController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.productscrapJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainExcelVO; import com.win.module.wms.controller.productscrapJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -11,22 +11,16 @@ import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; - import javax.validation.*; import javax.servlet.http.*; import java.util.*; import java.io.IOException; - import com.win.framework.common.pojo.PageResult; import com.win.framework.common.pojo.CommonResult; import static com.win.framework.common.pojo.CommonResult.success; - import com.win.framework.excel.core.util.ExcelUtils; - import com.win.framework.operatelog.core.annotations.OperateLog; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.win.module.wms.controller.productscrapJob.vo.*; import com.win.module.wms.dal.dataobject.productscrapJob.ProductscrapJobMainDO; import com.win.module.wms.convert.productscrapJob.ProductscrapJobMainConvert; import com.win.module.wms.service.productscrapJob.ProductscrapJobMainService; @@ -42,7 +36,19 @@ public class ProductscrapJobMainController { @Resource private AdminUserApi userApi; - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:productscrap-job-main:query')") + public CommonResult> getProductscrapJobMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productscrapJobMainService.getProductscrapJobMainSenior(conditions); + PageResult result = ProductscrapJobMainConvert.INSTANCE.convertPage(pageResult); + for(ProductscrapJobMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @PostMapping("/create") @Operation(summary = "创建制品报废任务主") @PreAuthorize("@ss.hasPermission('wms:productscrap-job-main:create')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/ProductscrapRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/ProductscrapRecordDetailController.java index 03ba3916..f9357371 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/ProductscrapRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/ProductscrapRecordDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.productscrapRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productscrapRecord.vo.*; @@ -41,7 +42,19 @@ public class ProductscrapRecordDetailController { @Resource private AdminUserApi userApi; - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得创建制品报废记录子信息分页") + @PreAuthorize("@ss.hasPermission('wms:productscrap-record-detail:query')") + public CommonResult> getProductscrapRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productscrapRecordDetailService.getProductscrapRecordDetailSenior(conditions); + PageResult result = ProductscrapRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(ProductscrapRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @PostMapping("/create") @Operation(summary = "创建制品报废记录子") @PreAuthorize("@ss.hasPermission('wms:productscrap-record-detail:create')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/ProductscrapRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/ProductscrapRecordMainController.java index ded20bf4..4d3bc6a3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/ProductscrapRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/ProductscrapRecordMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.productscrapRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productscrapRecord.vo.*; @@ -48,7 +49,19 @@ public class ProductscrapRecordMainController { public CommonResult createProductscrapRecordMain(@Valid @RequestBody ProductscrapRecordMainCreateReqVO createReqVO) { return success(productscrapRecordMainService.createProductscrapRecordMain(createReqVO)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:ProductscrapRecordMain:query')") + public CommonResult> getProductscrapRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productscrapRecordMainService.getProductscrapRecordMainSenior(conditions); + PageResult result = ProductscrapRecordMainConvert.INSTANCE.convertPage(pageResult); + for(ProductscrapRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @PutMapping("/update") @Operation(summary = "更新制品报废记录主") @PreAuthorize("@ss.hasPermission('wms:productscrap-record-main:update')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/ProductscrapRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/ProductscrapRequestDetailController.java index 1b780959..4d7eb6f4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/ProductscrapRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/ProductscrapRequestDetailController.java @@ -1,5 +1,5 @@ package com.win.module.wms.controller.productscrapRequest; - +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productscrapRequest.vo.*; @@ -10,22 +10,16 @@ import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; - import javax.validation.*; import javax.servlet.http.*; import java.util.*; import java.io.IOException; - import com.win.framework.common.pojo.PageResult; import com.win.framework.common.pojo.CommonResult; import static com.win.framework.common.pojo.CommonResult.success; - import com.win.framework.excel.core.util.ExcelUtils; - import com.win.framework.operatelog.core.annotations.OperateLog; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.win.module.wms.controller.productscrapRequest.vo.*; import com.win.module.wms.dal.dataobject.productscrapRequest.ProductscrapRequestDetailDO; import com.win.module.wms.convert.productscrapRequest.ProductscrapRequestDetailConvert; import com.win.module.wms.service.productscrapRequest.ProductscrapRequestDetailService; @@ -91,7 +85,19 @@ public class ProductscrapRequestDetailController { PageResult pageResult = productscrapRequestDetailService.getProductscrapRequestDetailPage(pageVO); return success(ProductscrapRequestDetailConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:productscrap-request-detail:query')") + public CommonResult> getProductscrapRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productscrapRequestDetailService.getProductscrapRequestDetailSenior(conditions); + PageResult result = ProductscrapRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(ProductscrapRequestDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出制品报废申请子 Excel") @PreAuthorize("@ss.hasPermission('wms:productscrap-request-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/ProductscrapRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/ProductscrapRequestMainController.java index 994f69d6..6d98f3f7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/ProductscrapRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/ProductscrapRequestMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.productscrapRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productscrapRequest.vo.*; @@ -65,7 +66,19 @@ public class ProductscrapRequestMainController { productscrapRequestMainService.deleteProductscrapRequestMain(id); return success(true); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:productscrap-request-main:query')") + public CommonResult> getProductscrapRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productscrapRequestMainService.getProductscrapRequestMainSenior(conditions); + PageResult result = ProductscrapRequestMainConvert.INSTANCE.convertPage(pageResult); + for(ProductscrapRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/get") @Operation(summary = "获得制品报废申请主") @Parameter(name = "id", description = "编号", required = true, example = "1024") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/project/ProjectController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/project/ProjectController.java index 1bcd4b6b..05f79879 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/project/ProjectController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/project/ProjectController.java @@ -1,6 +1,7 @@ package com.win.module.wms.controller.project; import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; @@ -75,7 +76,19 @@ public class ProjectController { ProjectDO project = projectService.getProject(id); return success(ProjectConvert.INSTANCE.convert(project)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:project:query')") + public CommonResult> getProjectSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = projectService.getProjectSenior(conditions); + PageResult result = ProjectConvert.INSTANCE.convertPage(pageResult); + for(ProjectRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/list") @Operation(summary = "获得项目列表") @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/PurchaseDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/PurchaseDetailController.java index 476ad78a..d8513872 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/PurchaseDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/PurchaseDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.purchase; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.purchase.vo.*; @@ -91,7 +92,19 @@ public class PurchaseDetailController { PageResult pageResult = purchaseDetailService.getPurchaseDetailPage(pageVO); return success(PurchaseDetailConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得采购订单子信息分页") + @PreAuthorize("@ss.hasPermission('wms:purchase-detail:query')") + public CommonResult> getPurchaseDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = purchaseDetailService.getPurchaseDetailSenior(conditions); + PageResult result = PurchaseDetailConvert.INSTANCE.convertPage(pageResult); + for(PurchaseDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出采购订单子 Excel") @PreAuthorize("@ss.hasPermission('wms:purchase-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/PurchaseMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/PurchaseMainController.java index cc401a08..921b020a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/PurchaseMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/PurchaseMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.purchase; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.purchase.vo.*; @@ -55,7 +56,19 @@ public class PurchaseMainController { purchaseMainService.updatePurchaseMain(updateReqVO); return success(true); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:purchase-main:query')") + public CommonResult> getPurchaseMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = purchaseMainService.getPurchaseMainSenior(conditions); + PageResult result = PurchaseMainConvert.INSTANCE.convertPage(pageResult); + for(PurchaseMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @DeleteMapping("/delete") @Operation(summary = "删除采购订单主") @Parameter(name = "id", description = "编号", required = true) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/PurchasePlanDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/PurchasePlanDetailController.java index c4e1c710..2101a865 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/PurchasePlanDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/PurchasePlanDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.purchasePlan; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.purchasePlan.vo.*; @@ -55,7 +56,19 @@ public class PurchasePlanDetailController { purchasePlanDetailService.updatePurchasePlanDetail(updateReqVO); return success(true); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得要货计划子信息分页") + @PreAuthorize("@ss.hasPermission('wms:purchase-plan-detail:query')") + public CommonResult> getPurchasePlanDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = purchasePlanDetailService.getPurchasePlanDetailSenior(conditions); + PageResult result = PurchasePlanDetailConvert.INSTANCE.convertPage(pageResult); + for(PurchasePlanDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @DeleteMapping("/delete") @Operation(summary = "删除要货计划子") @Parameter(name = "id", description = "编号", required = true) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/PurchasePlanMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/PurchasePlanMainController.java index 980492b6..6fd4a09c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/PurchasePlanMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/PurchasePlanMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.purchasePlan; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.purchasePlan.vo.*; @@ -90,7 +91,19 @@ public class PurchasePlanMainController { PageResult pageResult = purchasePlanMainService.getPurchasePlanMainPage(pageVO); return success(PurchasePlanMainConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:purchase-plan-main:query')") + public CommonResult> getPurchasePlanMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = purchasePlanMainService.getPurchasePlanMainSenior(conditions); + PageResult result = PurchasePlanMainConvert.INSTANCE.convertPage(pageResult); + for(PurchasePlanMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出要货计划主 Excel") @PreAuthorize("@ss.hasPermission('wms:purchase-plan-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/PurchaseclaimRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/PurchaseclaimRecordDetailController.java index 9b61c463..85c3ca38 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/PurchaseclaimRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/PurchaseclaimRecordDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.purchaseclaimRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.purchaseclaimRecord.vo.*; @@ -48,7 +49,19 @@ public class PurchaseclaimRecordDetailController { public CommonResult createPurchaseclaimRecordDetail(@Valid @RequestBody PurchaseclaimRecordDetailCreateReqVO createReqVO) { return success(purchaseclaimRecordDetailService.createPurchaseclaimRecordDetail(createReqVO)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:PurchaseclaimRecordDetail:query')") + public CommonResult> getPurchaseclaimRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = purchaseclaimRecordDetailService.getPurchaseclaimRecordDetailSenior(conditions); + PageResult result = PurchaseclaimRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(PurchaseclaimRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @PutMapping("/update") @Operation(summary = "更新采购索赔记录子") @PreAuthorize("@ss.hasPermission('wms:purchaseclaim-record-detail:update')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/PurchaseclaimRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/PurchaseclaimRecordMainController.java index 8c975fd7..be2b389a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/PurchaseclaimRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/PurchaseclaimRecordMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.purchaseclaimRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.purchaseclaimRecord.vo.*; @@ -89,7 +90,19 @@ public class PurchaseclaimRecordMainController { PageResult pageResult = purchaseclaimRecordMainService.getPurchaseclaimRecordMainPage(pageVO); return success(PurchaseclaimRecordMainConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:purchaseclaim-record-main:query')") + public CommonResult> getPurchaseclaimRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = purchaseclaimRecordMainService.getPurchaseclaimRecordMainSenior(conditions); + PageResult result = PurchaseclaimRecordMainConvert.INSTANCE.convertPage(pageResult); + for(PurchaseclaimRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出采购索赔记录主 Excel") @PreAuthorize("@ss.hasPermission('wms:purchaseclaim-record-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/PurchaseclaimRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/PurchaseclaimRequestDetailController.java index c4898f56..7590f879 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/PurchaseclaimRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/PurchaseclaimRequestDetailController.java @@ -4,6 +4,7 @@ import com.win.framework.common.pojo.CommonResult; import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.purchaseclaimRequest.vo.PurchaseclaimRequestDetailCreateReqVO; import com.win.module.wms.controller.purchaseclaimRequest.vo.PurchaseclaimRequestDetailPageReqVO; import com.win.module.wms.controller.purchaseclaimRequest.vo.PurchaseclaimRequestDetailRespVO; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseprice/PurchasepriceController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseprice/PurchasepriceController.java index 90579b4c..1367e863 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseprice/PurchasepriceController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseprice/PurchasepriceController.java @@ -1,6 +1,7 @@ package com.win.module.wms.controller.purchaseprice; import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; @@ -49,7 +50,19 @@ public class PurchasepriceController { public CommonResult createPurchaseprice(@Valid @RequestBody PurchasepriceCreateReqVO createReqVO) { return success(purchasepriceService.createPurchaseprice(createReqVO)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得采购价格单信息分页") + @PreAuthorize("@ss.hasPermission('wms:purchaseprice:query')") + public CommonResult> getPurchasepriceSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = purchasepriceService.getPurchasepriceSenior(conditions); + PageResult result = PurchasepriceConvert.INSTANCE.convertPage(pageResult); + for(PurchasepriceRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @PutMapping("/update") @Operation(summary = "更新采购价格单") @PreAuthorize("@ss.hasPermission('wms:purchaseprice:update')") @@ -106,8 +119,12 @@ public class PurchasepriceController { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); - } - ExcelUtils.write(response, "采购价格单.xls", "数据", PurchasepriceExcelVO.class, datas); + } Map mapDropDown = new HashMap<>(); + String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY); + mapDropDown.put(2, currency); + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(4, available); + ExcelUtils.write(response, "采购价格单.xls", "数据", PurchasepriceExcelVO.class, datas,mapDropDown); } @GetMapping("/get-import-template") @Operation(summary = "获得导入采购价格单模板") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobDetailController.java index cc089c59..516e02d8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.purchasereceiptJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import org.springframework.web.bind.annotation.*; @@ -74,7 +75,19 @@ public class PurchasereceiptJobDetailController { PurchasereceiptJobDetailDO purchasereceiptJobDetail = purchasereceiptJobDetailService.getPurchasereceiptJobDetail(id); return success(PurchasereceiptJobDetailConvert.INSTANCE.convert(purchasereceiptJobDetail)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得采购收货任务子信息分页") + @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-detail:query')") + public CommonResult> getPurchasereceiptJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = purchasereceiptJobDetailService.getPurchasereceiptJobDetailSenior(conditions); + PageResult result = PurchasereceiptJobDetailConvert.INSTANCE.convertPage(pageResult); + for(PurchasereceiptJobDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/list") @Operation(summary = "获得采购收货任务子列表") @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java index 85152938..ba8d5cfd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.purchasereceiptJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import org.springframework.web.bind.annotation.*; @@ -91,7 +92,19 @@ public class PurchasereceiptJobMainController { PageResult pageResult = purchasereceiptJobMainService.getPurchasereceiptJobMainPage(pageVO); return success(PurchasereceiptJobMainConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得采购收货任务主信息分页") + @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:query')") + public CommonResult> getPurchasereceiptJobMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = purchasereceiptJobMainService.getPurchasereceiptJobMainSenior(conditions); + PageResult result = PurchasereceiptJobMainConvert.INSTANCE.convertPage(pageResult); + for(PurchasereceiptJobMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出采购收货任务主 Excel") @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordDetailController.java index 73b6a875..4f6da022 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.purchasereceiptRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.purchasereceiptRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -91,7 +91,19 @@ public class PurchasereceiptRecordDetailController { PageResult pageResult = purchasereceiptRecordDetailService.getPurchasereceiptRecordDetailPage(pageVO); return success(PurchasereceiptRecordDetailConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得采购收货记录子信息分页") + @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-record-detail:query')") + public CommonResult> getPurchasereceiptRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = purchasereceiptRecordDetailService.getPurchasereceiptRecordDetailSenior(conditions); + PageResult result = PurchasereceiptRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(PurchasereceiptRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出采购收货记录子 Excel") @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-record-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordMainController.java index 3b431bb7..0f2c78a0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.purchasereceiptRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.purchasereceiptRecord.vo.*; @@ -55,7 +56,19 @@ public class PurchasereceiptRecordMainController { purchasereceiptRecordMainService.updatePurchasereceiptRecordMain(updateReqVO); return success(true); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得采购收货记录主信息分页") + @PreAuthorize("@ss.hasPermission('wms:PurchasereceiptRecordMain:query')") + public CommonResult> getPurchasereceiptRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = purchasereceiptRecordMainService.getPurchasereceiptRecordMainSenior(conditions); + PageResult result = PurchasereceiptRecordMainConvert.INSTANCE.convertPage(pageResult); + for(PurchasereceiptRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @DeleteMapping("/delete") @Operation(summary = "删除采购收货记录主") @Parameter(name = "id", description = "编号", required = true) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestDetailController.java index ddcad895..f188a910 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.purchasereceiptRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.purchasereceiptRequest.vo.*; @@ -49,7 +50,19 @@ public class PurchasereceiptRequestDetailController { public CommonResult createPurchasereceiptRequestDetail(@Valid @RequestBody PurchasereceiptRequestDetailCreateReqVO createReqVO) { return success(purchasereceiptRequestDetailService.createPurchasereceiptRequestDetail(createReqVO)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:PurchasereceiptRequestDetail:query')") + public CommonResult> getPurchasereceiptRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = purchasereceiptRequestDetailService.getPurchasereceiptRequestDetailSenior(conditions); + PageResult result = PurchasereceiptRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(PurchasereceiptRequestDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @PutMapping("/update") @Operation(summary = "更新采购收货申请子") @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-request-detail:update')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestMainController.java index d5cad708..ba77fa8a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.purchasereceiptRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.purchasereceiptRequest.vo.*; @@ -65,7 +66,19 @@ public class PurchasereceiptRequestMainController { purchasereceiptRequestMainService.deletePurchasereceiptRequestMain(id); return success(true); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-request-main:query')") + public CommonResult> getPurchasereceiptRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = purchasereceiptRequestMainService.getPurchasereceiptRequestMainSenior(conditions); + PageResult result = PurchasereceiptRequestMainConvert.INSTANCE.convertPage(pageResult); + for(PurchasereceiptRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/get") @Operation(summary = "获得采购收货申请主") @Parameter(name = "id", description = "编号", required = true, example = "1024") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobDetailController.java index 80f471a8..ffc9e8c2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.purchasereturnJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestMainExcelVO; import com.win.module.wms.controller.purchasereturnJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -92,6 +92,19 @@ public class PurchasereturnJobDetailController { PageResult pageResult = purchasereturnJobDetailService.getPurchasereturnJobDetailPage(pageVO); return success(PurchasereturnJobDetailConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:PurchasereturnJobDetail:query')") + public CommonResult> getPurchasereturnJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = purchasereturnJobDetailService.getPurchasereturnJobDetailSenior(conditions); + PageResult result = PurchasereturnJobDetailConvert.INSTANCE.convertPage(pageResult); + for(PurchasereturnJobDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出采购退货任务子 Excel") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobMainController.java index 39f155e7..74ca1e1f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobMainController.java @@ -1,5 +1,8 @@ package com.win.module.wms.controller.purchasereturnJob; +import com.win.framework.common.pojo.CustomConditions; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.purchasereturnJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -32,7 +35,8 @@ import com.win.module.wms.service.purchasereturnJob.PurchasereturnJobMainService @RequestMapping("/wms/purchasereturn-job-main") @Validated public class PurchasereturnJobMainController { - + @Resource + private AdminUserApi userApi; @Resource private PurchasereturnJobMainService purchasereturnJobMainService; @@ -77,7 +81,19 @@ public class PurchasereturnJobMainController { List list = purchasereturnJobMainService.getPurchasereturnJobMainList(ids); return success(PurchasereturnJobMainConvert.INSTANCE.convertList(list)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:PurchasereturnJobMain:query')") + public CommonResult> getPurchasereturnJobMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = purchasereturnJobMainService.getPurchasereturnJobMainSenior(conditions); + PageResult result = PurchasereturnJobMainConvert.INSTANCE.convertPage(pageResult); + for(PurchasereturnJobMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/page") @Operation(summary = "获得采购退货任务主分页") @PreAuthorize("@ss.hasPermission('wms:purchasereturn-job-main:query')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailRespVO.java index 2bf6fa31..f11ebd52 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailRespVO.java @@ -8,5 +8,6 @@ import lombok.*; @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class PurchasereturnJobDetailRespVO extends PurchasereturnJobDetailBaseVO { - + @Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED) + private String creator; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/PurchasereturnRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/PurchasereturnRecordDetailController.java index 3fefb4f0..b3ad85ca 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/PurchasereturnRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/PurchasereturnRecordDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.purchasereturnRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.purchasereturnRecord.vo.*; @@ -48,7 +49,19 @@ public class PurchasereturnRecordDetailController { public CommonResult createPurchasereturnRecordDetail(@Valid @RequestBody PurchasereturnRecordDetailCreateReqVO createReqVO) { return success(purchasereturnRecordDetailService.createPurchasereturnRecordDetail(createReqVO)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得采购退货记录子信息分页") + @PreAuthorize("@ss.hasPermission('wms:PurchasereturnRecordDetail:query')") + public CommonResult> getPurchasereturnRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = purchasereturnRecordDetailService.getPurchasereturnRecordDetailSenior(conditions); + PageResult result = PurchasereturnRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(PurchasereturnRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @PutMapping("/update") @Operation(summary = "更新采购退货记录子") @PreAuthorize("@ss.hasPermission('wms:purchasereturn-record-detail:update')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/PurchasereturnRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/PurchasereturnRecordMainController.java index 42ee8099..4c1b9ee0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/PurchasereturnRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/PurchasereturnRecordMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.purchasereturnRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.purchasereturnRecord.vo.*; @@ -47,7 +48,19 @@ public class PurchasereturnRecordMainController { public CommonResult createPurchasereturnRecordMain(@Valid @RequestBody PurchasereturnRecordMainCreateReqVO createReqVO) { return success(purchasereturnRecordMainService.createPurchasereturnRecordMain(createReqVO)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:PurchasereturnRecordMain:query')") + public CommonResult> getPurchasereturnRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = purchasereturnRecordMainService.getPurchasereturnRecordMainSenior(conditions); + PageResult result = PurchasereturnRecordMainConvert.INSTANCE.convertPage(pageResult); + for(PurchasereturnRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @PutMapping("/update") @Operation(summary = "更新采购退货记录主") @PreAuthorize("@ss.hasPermission('wms:purchasereturn-record-main:update')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestDetailController.java index 9dedee3d..b3f493b8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.purchasereturnRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.purchasereturnRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -48,7 +48,19 @@ public class PurchasereturnRequestDetailController { public CommonResult createPurchasereturnRequestDetail(@Valid @RequestBody PurchasereturnRequestDetailCreateReqVO createReqVO) { return success(purchasereturnRequestDetailService.createPurchasereturnRequestDetail(createReqVO)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得采购退货申请子信息分页") + @PreAuthorize("@ss.hasPermission('wms:PurchasereturnRequestDetail:query')") + public CommonResult> getPurchasereturnRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = purchasereturnRequestDetailService.getPurchasereturnRequestDetailSenior(conditions); + PageResult result = PurchasereturnRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(PurchasereturnRequestDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @PutMapping("/update") @Operation(summary = "更新采购退货申请子") @PreAuthorize("@ss.hasPermission('wms:purchasereturn-request-detail:update')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestMainController.java index bd26965e..a24256fb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.purchasereturnRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.purchasereturnRequest.vo.*; @@ -90,6 +91,19 @@ public class PurchasereturnRequestMainController { PageResult pageResult = purchasereturnRequestMainService.getPurchasereturnRequestMainPage(pageVO); return success(PurchasereturnRequestMainConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:PurchasereturnRequestMain:query')") + public CommonResult> getPurchasereturnRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = purchasereturnRequestMainService.getPurchasereturnRequestMainSenior(conditions); + PageResult result = PurchasereturnRequestMainConvert.INSTANCE.convertPage(pageResult); + for(PurchasereturnRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出采购退货申请主 Excel") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobDetailController.java index 94ad9682..665836e2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.putawayJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.putawayJob.vo.*; @@ -91,7 +92,19 @@ public class PutawayJobDetailController { PageResult pageResult = putawayJobDetailService.getPutawayJobDetailPage(pageVO); return success(PutawayJobDetailConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:putaway-job-detail:query')") + public CommonResult> getPutawayJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = putawayJobDetailService.getPutawayJobDetailSenior(conditions); + PageResult result = PutawayJobDetailConvert.INSTANCE.convertPage(pageResult); + for(PutawayJobDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出上架任务子 Excel") @PreAuthorize("@ss.hasPermission('wms:putaway-job-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobMainController.java index 541696b9..115c5288 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.putawayJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.putawayJob.vo.*; @@ -47,7 +48,19 @@ public class PutawayJobMainController { public CommonResult createPutawayJobMain(@Valid @RequestBody PutawayJobMainCreateReqVO createReqVO) { return success(putawayJobMainService.createPutawayJobMain(createReqVO)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:PutawayJobMain:query')") + public CommonResult> getPutawayJobMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = putawayJobMainService.getPutawayJobMainSenior(conditions); + PageResult result = PutawayJobMainConvert.INSTANCE.convertPage(pageResult); + for(PutawayJobMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @PutMapping("/update") @Operation(summary = "更新上架任务主") @PreAuthorize("@ss.hasPermission('wms:putaway-job-main:update')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordDetailController.java index 61ebf829..d1cf0ed0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.putawayRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.putawayRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -65,6 +65,19 @@ public class PutawayRecordDetailController { putawayRecordDetailService.deletePutawayRecordDetail(id); return success(true); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:putaway-record-detail:query')") + public CommonResult> getPutawayRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = putawayRecordDetailService.getPutawayRecordDetailSenior(conditions); + PageResult result = PutawayRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(PutawayRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/get") @Operation(summary = "获得上架记录子") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordMainController.java index 82131623..6ebd2842 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.putawayRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.putawayRecord.vo.*; @@ -90,6 +91,19 @@ public class PutawayRecordMainController { PageResult pageResult = putawayRecordMainService.getPutawayRecordMainPage(pageVO); return success(PutawayRecordMainConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:PutawayRecordMain:query')") + public CommonResult> getPutawayRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = putawayRecordMainService.getPutawayRecordMainSenior(conditions); + PageResult result = PutawayRecordMainConvert.INSTANCE.convertPage(pageResult); + for(PutawayRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出上架记录主 Excel") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/PutawayRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/PutawayRequestDetailController.java index f2ba07be..bf2e1037 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/PutawayRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/PutawayRequestDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.putawayRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.putawayRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -91,7 +91,19 @@ public class PutawayRequestDetailController { PageResult pageResult = putawayRequestDetailService.getPutawayRequestDetailPage(pageVO); return success(PutawayRequestDetailConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得上架申请子信息分页") + @PreAuthorize("@ss.hasPermission('wms:putaway-request-detail:query')") + public CommonResult> getPutawayRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = putawayRequestDetailService.getPutawayRequestDetailSenior(conditions); + PageResult result = PutawayRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(PutawayRequestDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出上架申请子 Excel") @PreAuthorize("@ss.hasPermission('wms:putaway-request-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/PutawayRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/PutawayRequestMainController.java index a7fd6400..f0aaee10 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/PutawayRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/PutawayRequestMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.putawayRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.putawayRequest.vo.*; @@ -10,21 +11,16 @@ import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; - import javax.validation.*; import javax.servlet.http.*; import java.util.*; import java.io.IOException; - import com.win.framework.common.pojo.PageResult; import com.win.framework.common.pojo.CommonResult; import static com.win.framework.common.pojo.CommonResult.success; - import com.win.framework.excel.core.util.ExcelUtils; - import com.win.framework.operatelog.core.annotations.OperateLog; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - import com.win.module.wms.dal.dataobject.putawayRequest.PutawayRequestMainDO; import com.win.module.wms.convert.putawayRequest.PutawayRequestMainConvert; import com.win.module.wms.service.putawayRequest.PutawayRequestMainService; @@ -72,7 +68,19 @@ public class PutawayRequestMainController { PutawayRequestMainDO putawayRequestMain = putawayRequestMainService.getPutawayRequestMain(id); return success(PutawayRequestMainConvert.INSTANCE.convert(putawayRequestMain)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:PutawayRequestMain:query')") + public CommonResult> getPutawayRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = putawayRequestMainService.getPutawayRequestMainSenior(conditions); + PageResult result = PutawayRequestMainConvert.INSTANCE.convertPage(pageResult); + for(PutawayRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/list") @Operation(summary = "获得上架申请主列表") @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/recordsetting/RecordsettingController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/recordsetting/RecordsettingController.java index 78c0b6dd..973d7b05 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/recordsetting/RecordsettingController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/recordsetting/RecordsettingController.java @@ -1,6 +1,7 @@ package com.win.module.wms.controller.recordsetting; import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; @@ -20,7 +21,6 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; - import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -28,7 +28,6 @@ import java.io.IOException; import java.time.LocalDateTime; import java.time.ZoneOffset; import java.util.*; - import static com.win.framework.common.pojo.CommonResult.success; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @@ -58,7 +57,20 @@ public class RecordsettingController { recordsettingService.updateRecordsetting(updateReqVO); return success(true); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:recordsetting:query')") + public CommonResult> getRecordsettingSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = recordsettingService.getRecordsettingSenior(conditions); + PageResult result = RecordsettingConvert.INSTANCE.convertPage(pageResult); + for(RecordsettingRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + @DeleteMapping("/delete") @Operation(summary = "删除记录设置") @Parameter(name = "id", description = "编号", required = true) @@ -107,8 +119,13 @@ public class RecordsettingController { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); - } - ExcelUtils.write(response, "记录设置.xls", "数据", RecordsettingExcelVO.class, datas); + } Map mapDropDown = new HashMap<>(); + String[] interfaceType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.INTERFACE_TYPE); + mapDropDown.put(1, interfaceType); + + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(2, available); + ExcelUtils.write(response, "记录设置.xls", "数据", RecordsettingExcelVO.class, datas,mapDropDown); } @GetMapping("/get-import-template") @Operation(summary = "获得导入记录设置模板") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/RepleinshJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/RepleinshJobDetailController.java index 8140b472..42ca7cd1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/RepleinshJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/RepleinshJobDetailController.java @@ -2,6 +2,7 @@ package com.win.module.wms.controller.repleinshJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.repleinshJob.vo.*; @@ -77,6 +78,20 @@ public class RepleinshJobDetailController { return success(RepleinshJobDetailConvert.INSTANCE.convert(repleinshJobDetail)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:RepleinshJobDetail:query')") + public CommonResult> getRepleinshJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = repleinshJobDetailService.getRepleinshJobDetailSenior(conditions); + PageResult result = RepleinshJobDetailConvert.INSTANCE.convertPage(pageResult); + for(RepleinshJobDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + @GetMapping("/list") @Operation(summary = "获得补料任务子列表") @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/RepleinshJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/RepleinshJobMainController.java index 077aed04..c369b6bb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/RepleinshJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/RepleinshJobMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.repleinshJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import org.springframework.web.bind.annotation.*; @@ -8,9 +9,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import javax.validation.constraints.*; +import io.swagger.v3.oas.annotations.Operation;; import javax.validation.*; import javax.servlet.http.*; import java.util.*; @@ -48,7 +47,19 @@ public class RepleinshJobMainController { public CommonResult createRepleinshJobMain(@Valid @RequestBody RepleinshJobMainCreateReqVO createReqVO) { return success(repleinshJobMainService.createRepleinshJobMain(createReqVO)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得补料任务主信息分页") + @PreAuthorize("@ss.hasPermission('wms:RepleinshJobMain:query')") + public CommonResult> getRepleinshJobMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = repleinshJobMainService.getRepleinshJobMainSenior(conditions); + PageResult result = RepleinshJobMainConvert.INSTANCE.convertPage(pageResult); + for(RepleinshJobMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @PutMapping("/update") @Operation(summary = "更新补料任务主") @PreAuthorize("@ss.hasPermission('wms:repleinsh-job-main:update')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/RepleinshRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/RepleinshRecordDetailController.java index 435607a8..823d2e8c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/RepleinshRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/RepleinshRecordDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.repleinshRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import org.springframework.web.bind.annotation.*; @@ -9,8 +10,6 @@ import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; - -import javax.validation.constraints.*; import javax.validation.*; import javax.servlet.http.*; import java.util.*; @@ -65,6 +64,19 @@ public class RepleinshRecordDetailController { repleinshRecordDetailService.deleteRepleinshRecordDetail(id); return success(true); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:repleinsh-record-detail:query')") + public CommonResult> getRepleinshRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = repleinshRecordDetailService.getRepleinshRecordDetailSenior(conditions); + PageResult result = RepleinshRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(RepleinshRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/get") @Operation(summary = "获得补料记录子") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/RepleinshRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/RepleinshRecordMainController.java index 03373bff..e39567b9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/RepleinshRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/RepleinshRecordMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.repleinshRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import org.springframework.web.bind.annotation.*; @@ -56,6 +57,19 @@ public class RepleinshRecordMainController { repleinshRecordMainService.updateRepleinshRecordMain(updateReqVO); return success(true); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得补料记录主信息分页") + @PreAuthorize("@ss.hasPermission('wms:RepleinshRecordMain:query')") + public CommonResult> getRepleinshRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = repleinshRecordMainService.getRepleinshRecordMainSenior(conditions); + PageResult result = RepleinshRecordMainConvert.INSTANCE.convertPage(pageResult); + for(RepleinshRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @DeleteMapping("/delete") @Operation(summary = "删除补料记录主") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/RepleinshRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/RepleinshRequestDetailController.java index d72edd95..e8ecf5fb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/RepleinshRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/RepleinshRequestDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.repleinshRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.repleinshRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -65,7 +65,19 @@ public class RepleinshRequestDetailController { repleinshRequestDetailService.deleteRepleinshRequestDetail(id); return success(true); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:repleinsh-request-detail:query')") + public CommonResult> getRepleinshRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = repleinshRequestDetailService.getRepleinshRequestDetailSenior(conditions); + PageResult result = RepleinshRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(RepleinshRequestDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/get") @Operation(summary = "获得补料申请子") @Parameter(name = "id", description = "编号", required = true, example = "1024") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/RepleinshRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/RepleinshRequestMainController.java index caa814dd..4cae14f5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/RepleinshRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/RepleinshRequestMainController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.repleinshRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.repleinshRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -65,6 +65,19 @@ public class RepleinshRequestMainController { repleinshRequestMainService.deleteRepleinshRequestMain(id); return success(true); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:repleinsh-request-main:query')") + public CommonResult> getRepleinshRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = repleinshRequestMainService.getRepleinshRequestMainSenior(conditions); + PageResult result = RepleinshRequestMainConvert.INSTANCE.convertPage(pageResult); + for(RepleinshRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/get") @Operation(summary = "获得补料申请主") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/requestsetting/RequestsettingController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/requestsetting/RequestsettingController.java index 8bf7f0c1..c6639d2e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/requestsetting/RequestsettingController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/requestsetting/RequestsettingController.java @@ -1,6 +1,7 @@ package com.win.module.wms.controller.requestsetting; import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; @@ -76,7 +77,19 @@ public class RequestsettingController { RequestsettingDO requestsetting = requestsettingService.getRequestsetting(id); return success(RequestsettingConvert.INSTANCE.convert(requestsetting)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:Requestsetting:query')") + public CommonResult> getRequestsettingSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = requestsettingService.getRequestsettingSenior(conditions); + PageResult result = RequestsettingConvert.INSTANCE.convertPage(pageResult); + for(RequestsettingRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/list") @Operation(summary = "获得申请设置列表") @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") @@ -107,8 +120,20 @@ public class RequestsettingController { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); - } - ExcelUtils.write(response, "申请设置.xls", "数据", RequestsettingExcelVO.class, datas); + } Map mapDropDown = new HashMap<>(); + String[] requestMode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.REQUEST_MODE); + mapDropDown.put(1, requestMode); + String[] autoCommit = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(2, autoCommit); + String[] autoAgree = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(3, autoAgree); + String[] autoExecute = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(4, autoExecute); + String[] directCreateRecord = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(5, directCreateRecord); + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(6, available); + ExcelUtils.write(response, "申请设置.xls", "数据", RequestsettingExcelVO.class, datas,mapDropDown); } @GetMapping("/get-import-template") @Operation(summary = "获得导入记录设置模板") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/RuleController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/RuleController.java index fbddfc3b..28c3e59a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/RuleController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/RuleController.java @@ -1,8 +1,10 @@ package com.win.module.wms.controller.rule; import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.rule.vo.RuleCreateReqVO; import com.win.module.wms.controller.rule.vo.RulePageReqVO; import com.win.module.wms.controller.rule.vo.RuleRespVO; @@ -66,6 +68,19 @@ public class RuleController { RuleDO rule = ruleService.getRule(id); return success(RuleConvert.INSTANCE.convert(rule)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:rule:query')") + public CommonResult> getRuleSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = ruleService.getRuleSenior(conditions); + PageResult result = RuleConvert.INSTANCE.convertPage(pageResult); + for(RuleRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/page") @Operation(summary = "获得规则分页") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/RuleRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/RuleRespVO.java index bdf61db6..848ef3ae 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/RuleRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/RuleRespVO.java @@ -8,5 +8,6 @@ import lombok.*; @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class RuleRespVO extends RuleBaseVO { - + @Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED) + private String creator; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/SaleDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/SaleDetailController.java index e7e77bc8..86dd8624 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/SaleDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/SaleDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.sale; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.sale.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -91,6 +91,20 @@ public class SaleDetailController { PageResult pageResult = saleDetailService.getSaleDetailPage(pageVO); return success(SaleDetailConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:sale-detail:query')") + public CommonResult> getSaleDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = saleDetailService.getSaleDetailSenior(conditions); + PageResult result = SaleDetailConvert.INSTANCE.convertPage(pageResult); + for(SaleDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + @GetMapping("/export-excel") @Operation(summary = "导出销售订单子 Excel") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/SaleMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/SaleMainController.java index d585710c..e5c8470d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/SaleMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/SaleMainController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.sale; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.sale.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -56,6 +56,19 @@ public class SaleMainController { saleMainService.updateSaleMain(updateReqVO); return success(true); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得销售订单主信息分页") + @PreAuthorize("@ss.hasPermission('wms:sale-main:query')") + public CommonResult> getSaleMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = saleMainService.getSaleMainSenior(conditions); + PageResult result = SaleMainConvert.INSTANCE.convertPage(pageResult); + for(SaleMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @DeleteMapping("/delete") @Operation(summary = "删除销售订单主") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/SalepriceController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/SalepriceController.java index 7bc89f01..b3bfdf05 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/SalepriceController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/SalepriceController.java @@ -1,6 +1,7 @@ package com.win.module.wms.controller.saleprice; import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; @@ -94,7 +95,19 @@ public class SalepriceController { PageResult pageResult = salepriceService.getSalepricePage(pageVO); return success(SalepriceConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得销售价格单信息分页") + @PreAuthorize("@ss.hasPermission('wms:Saleprice:query')") + public CommonResult> getSalepriceSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = salepriceService.getSalepriceSenior(conditions); + PageResult result = SalepriceConvert.INSTANCE.convertPage(pageResult); + for(SalepriceRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出销售价格单 Excel") @PreAuthorize("@ss.hasPermission('wms:saleprice:export')") @@ -109,7 +122,12 @@ public class SalepriceController { //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } - ExcelUtils.write(response, "销售价格单.xls", "数据", SalepriceExcelVO.class, datas); + Map mapDropDown = new HashMap<>(); + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(4, available); + String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY); + mapDropDown.put(2, currency); + ExcelUtils.write(response, "销售价格单.xls", "数据", SalepriceExcelVO.class, datas,mapDropDown); } @GetMapping("/get-import-template") @Operation(summary = "获得导销售价格单信息模板") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/ScrapJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/ScrapJobDetailController.java index c6a5056f..628fe75b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/ScrapJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/ScrapJobDetailController.java @@ -1,8 +1,8 @@ package com.win.module.wms.controller.scrapJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.scrapJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -65,7 +65,19 @@ public class ScrapJobDetailController { scrapJobDetailService.deleteScrapJobDetail(id); return success(true); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:ScrapJobDetail:query')") + public CommonResult> getScrapJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = scrapJobDetailService.getScrapJobDetailSenior(conditions); + PageResult result = ScrapJobDetailConvert.INSTANCE.convertPage(pageResult); + for(ScrapJobDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/get") @Operation(summary = "获得报废出库任务子") @Parameter(name = "id", description = "编号", required = true, example = "1024") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/ScrapJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/ScrapJobMainController.java index 4aaab40c..0fe032a3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/ScrapJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/ScrapJobMainController.java @@ -1,8 +1,9 @@ package com.win.module.wms.controller.scrapJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.scrapJob.vo.*; + import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -48,7 +49,19 @@ public class ScrapJobMainController { public CommonResult createScrapJobMain(@Valid @RequestBody ScrapJobMainCreateReqVO createReqVO) { return success(scrapJobMainService.createScrapJobMain(createReqVO)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:ScrapJobMain:query')") + public CommonResult> getScrapJobMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = scrapJobMainService.getScrapJobMainSenior(conditions); + PageResult result = ScrapJobMainConvert.INSTANCE.convertPage(pageResult); + for(ScrapJobMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @PutMapping("/update") @Operation(summary = "更新报废出库任务主") @PreAuthorize("@ss.hasPermission('wms:scrap-job-main:update')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/ScrapRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/ScrapRecordDetailController.java index 2c2edce4..29461b71 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/ScrapRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/ScrapRecordDetailController.java @@ -1,6 +1,8 @@ package com.win.module.wms.controller.scrapRecord; -import com.win.module.wms.controller.scrapRecord.vo.*; +import com.win.framework.common.pojo.CustomConditions; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -37,6 +39,10 @@ public class ScrapRecordDetailController { @Resource private ScrapRecordDetailService scrapRecordDetailService; + @Resource + private AdminUserApi userApi; + + @PostMapping("/create") @Operation(summary = "创建报废出库记录子") @PreAuthorize("@ss.hasPermission('wms:scrap-record-detail:create')") @@ -69,6 +75,19 @@ public class ScrapRecordDetailController { ScrapRecordDetailDO scrapRecordDetail = scrapRecordDetailService.getScrapRecordDetail(id); return success(ScrapRecordDetailConvert.INSTANCE.convert(scrapRecordDetail)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:ScrapRecordDetail:query')") + public CommonResult> getScrapRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = scrapRecordDetailService.getScrapRecordDetailSenior(conditions); + PageResult result = ScrapRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(ScrapRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/list") @Operation(summary = "获得报废出库记录子列表") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/ScrapRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/ScrapRecordMainController.java index 12ea664e..dd9b1627 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/ScrapRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/ScrapRecordMainController.java @@ -1,6 +1,8 @@ package com.win.module.wms.controller.scrapRecord; -import com.win.module.wms.controller.scrapRecord.vo.*; +import com.win.framework.common.pojo.CustomConditions; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -37,6 +39,9 @@ public class ScrapRecordMainController { @Resource private ScrapRecordMainService scrapRecordMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建报废出库记录主") @PreAuthorize("@ss.hasPermission('wms:scrap-record-main:create')") @@ -86,6 +91,19 @@ public class ScrapRecordMainController { PageResult pageResult = scrapRecordMainService.getScrapRecordMainPage(pageVO); return success(ScrapRecordMainConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得报废出库记录主信息分页") + @PreAuthorize("@ss.hasPermission('wms:ScrapRecordMain:query')") + public CommonResult> getScrapRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = scrapRecordMainService.getScrapRecordMainSenior(conditions); + PageResult result = ScrapRecordMainConvert.INSTANCE.convertPage(pageResult); + for(ScrapRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出报废出库记录主 Excel") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/ScrapRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/ScrapRequestDetailController.java index d10887d0..779a63ce 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/ScrapRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/ScrapRequestDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.scrapRequest; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.scrapRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -8,22 +10,16 @@ import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; - import javax.validation.*; import javax.servlet.http.*; import java.util.*; import java.io.IOException; - import com.win.framework.common.pojo.PageResult; import com.win.framework.common.pojo.CommonResult; import static com.win.framework.common.pojo.CommonResult.success; - import com.win.framework.excel.core.util.ExcelUtils; - import com.win.framework.operatelog.core.annotations.OperateLog; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.win.module.wms.controller.scrapRequest.vo.*; import com.win.module.wms.dal.dataobject.scrapRequest.ScrapRequestDetailDO; import com.win.module.wms.convert.scrapRequest.ScrapRequestDetailConvert; import com.win.module.wms.service.scrapRequest.ScrapRequestDetailService; @@ -37,6 +33,10 @@ public class ScrapRequestDetailController { @Resource private ScrapRequestDetailService scrapRequestDetailService; + @Resource + private AdminUserApi userApi; + + @PostMapping("/create") @Operation(summary = "创建报废出库申请子") @PreAuthorize("@ss.hasPermission('wms:scrap-request-detail:create')") @@ -51,7 +51,19 @@ public class ScrapRequestDetailController { scrapRequestDetailService.updateScrapRequestDetail(updateReqVO); return success(true); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:ScrapRequestDetail:query')") + public CommonResult> getScrapRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = scrapRequestDetailService.getScrapRequestDetailSenior(conditions); + PageResult result = ScrapRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(ScrapRequestDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @DeleteMapping("/delete") @Operation(summary = "删除报废出库申请子") @Parameter(name = "id", description = "编号", required = true) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/ScrapRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/ScrapRequestMainController.java index 41a2200e..0dd7ddd4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/ScrapRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/ScrapRequestMainController.java @@ -1,5 +1,8 @@ package com.win.module.wms.controller.scrapRequest; +import com.win.framework.common.pojo.CustomConditions; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.scrapRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -8,22 +11,16 @@ import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; - import javax.validation.*; import javax.servlet.http.*; import java.util.*; import java.io.IOException; - import com.win.framework.common.pojo.PageResult; import com.win.framework.common.pojo.CommonResult; import static com.win.framework.common.pojo.CommonResult.success; - import com.win.framework.excel.core.util.ExcelUtils; - import com.win.framework.operatelog.core.annotations.OperateLog; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.win.module.wms.controller.scrapRequest.vo.*; import com.win.module.wms.dal.dataobject.scrapRequest.ScrapRequestMainDO; import com.win.module.wms.convert.scrapRequest.ScrapRequestMainConvert; import com.win.module.wms.service.scrapRequest.ScrapRequestMainService; @@ -37,6 +34,9 @@ public class ScrapRequestMainController { @Resource private ScrapRequestMainService scrapRequestMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建报废出库申请主") @PreAuthorize("@ss.hasPermission('wms:scrap-request-main:create')") @@ -87,6 +87,21 @@ public class ScrapRequestMainController { return success(ScrapRequestMainConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:scrap-request-main:query')") + public CommonResult> getScrapRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = scrapRequestMainService.getScrapRequestMainSenior(conditions); + PageResult result = ScrapRequestMainConvert.INSTANCE.convertPage(pageResult); + for(ScrapRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + + @GetMapping("/export-excel") @Operation(summary = "导出报废出库申请主 Excel") @PreAuthorize("@ss.hasPermission('wms:scrap-request-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/shift/ShiftController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/shift/ShiftController.java index 3a3d30fe..a2b3ea2f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/shift/ShiftController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/shift/ShiftController.java @@ -1,6 +1,7 @@ package com.win.module.wms.controller.shift; import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; @@ -21,7 +22,6 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; - import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -29,7 +29,6 @@ import java.io.IOException; import java.time.LocalDateTime; import java.time.ZoneOffset; import java.util.*; - import static com.win.framework.common.pojo.CommonResult.success; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @@ -94,6 +93,19 @@ public class ShiftController { PageResult pageResult = shiftService.getShiftPage(pageVO); return success(ShiftConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得班次信息分页") + @PreAuthorize("@ss.hasPermission('wms:shift:query')") + public CommonResult> getShiftSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = shiftService.getShiftSenior(conditions); + PageResult result = ShiftConvert.INSTANCE.convertPage(pageResult); + for(ShiftRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出班次 Excel") @@ -109,7 +121,12 @@ public class ShiftController { //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } - ExcelUtils.write(response, "班次.xls", "数据", ShiftExcelVO.class, datas); + Map mapDropDown = new HashMap<>(); + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(9, available); + String[] endAtNextDay = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(8, endAtNextDay); + ExcelUtils.write(response, "班次.xls", "数据", ShiftExcelVO.class, datas,mapDropDown); } @GetMapping("/get-import-template") @Operation(summary = "获得导入班次信息模板") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/stdcostprice/StdcostpriceController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/stdcostprice/StdcostpriceController.java index 4b88b1d6..6fe56da0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/stdcostprice/StdcostpriceController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/stdcostprice/StdcostpriceController.java @@ -1,6 +1,7 @@ package com.win.module.wms.controller.stdcostprice; import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; @@ -95,6 +96,20 @@ public class StdcostpriceController { return success(StdcostpriceConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得标准成本价格单信息分页") + @PreAuthorize("@ss.hasPermission('wms:Stdcostprice:query')") + public CommonResult> getStdcostpriceSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = stdcostpriceService.getStdcostpriceSenior(conditions); + PageResult result = StdcostpriceConvert.INSTANCE.convertPage(pageResult); + for(StdcostpriceRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + @GetMapping("/export-excel") @Operation(summary = "导出标准成本价格单 Excel") @PreAuthorize("@ss.hasPermission('wms:stdcostprice:export')") @@ -108,8 +123,12 @@ public class StdcostpriceController { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); - } - ExcelUtils.write(response, "标准成本价格单.xls", "数据", StdcostpriceExcelVO.class, datas); + } Map mapDropDown = new HashMap<>(); + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(4, available); + String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY); + mapDropDown.put(2, currency); + ExcelUtils.write(response, "标准成本价格单.xls", "数据", StdcostpriceExcelVO.class, datas,mapDropDown); } @GetMapping("/get-import-template") @Operation(summary = "获得导入标准成本价格单信息模板") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/StrategyController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/StrategyController.java index f7840aea..2fba1578 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/StrategyController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/StrategyController.java @@ -1,6 +1,7 @@ package com.win.module.wms.controller.strategy; import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; @@ -16,14 +17,12 @@ import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; - import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; import java.util.Collection; import java.util.List; - import static com.win.framework.common.pojo.CommonResult.success; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @@ -53,6 +52,19 @@ public class StrategyController { strategyService.updateStrategy(updateReqVO); return success(true); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得策略信息分页") + @PreAuthorize("@ss.hasPermission('wms:strategy:query')") + public CommonResult> getStrategySenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = strategyService.getStrategySenior(conditions); + PageResult result = StrategyConvert.INSTANCE.convertPage(pageResult); + for(StrategyRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @DeleteMapping("/delete") @Operation(summary = "删除策略") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/vo/StrategyRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/vo/StrategyRespVO.java index 22403c5f..bdd152d8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/vo/StrategyRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/vo/StrategyRespVO.java @@ -15,5 +15,7 @@ public class StrategyRespVO extends StrategyBaseVO { @Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED) private String creatorId; + @Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED) + private String creator; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplier/SupplierController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplier/SupplierController.java index db2551d2..ec0dbec1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplier/SupplierController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplier/SupplierController.java @@ -1,6 +1,7 @@ package com.win.module.wms.controller.supplier; import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; @@ -50,7 +51,19 @@ public class SupplierController { public CommonResult createSupplier(@Valid @RequestBody SupplierCreateReqVO createReqVO) { return success(supplierService.createSupplier(createReqVO)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:Supplier:query')") + public CommonResult> getSupplierSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = supplierService.getSupplierSenior(conditions); + PageResult result = SupplierConvert.INSTANCE.convertPage(pageResult); + for(SupplierRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @PutMapping("/update") @Operation(summary = "更新供应商") @PreAuthorize("@ss.hasPermission('wms:supplier:update')") @@ -106,8 +119,14 @@ public class SupplierController { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); - } - ExcelUtils.write(response, "供应商.xls", "数据", SupplierExcelVO.class, datas); + } Map mapDropDown = new HashMap<>(); + String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY); + mapDropDown.put(11, currency); + String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.SUPPLIER_TYPE); + mapDropDown.put(13, type); + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(14, available); + ExcelUtils.write(response, "供应商.xls", "数据", SupplierExcelVO.class, datas,mapDropDown); } @GetMapping("/get-import-template") @Operation(summary = "获得导入供应商模板") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordDetailController.java index 35ca478c..387a4b0d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.supplierdeliverRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.supplierdeliverRecord.vo.*; @@ -10,21 +11,16 @@ import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; - import javax.validation.*; import javax.servlet.http.*; import java.util.*; import java.io.IOException; - import com.win.framework.common.pojo.PageResult; import com.win.framework.common.pojo.CommonResult; import static com.win.framework.common.pojo.CommonResult.success; - import com.win.framework.excel.core.util.ExcelUtils; - import com.win.framework.operatelog.core.annotations.OperateLog; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO; import com.win.module.wms.convert.supplierdeliverRecord.SupplierdeliverRecordDetailConvert; import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordDetailService; @@ -73,7 +69,19 @@ public class SupplierdeliverRecordDetailController { SupplierdeliverRecordDetailDO supplierdeliverRecordDetail = supplierdeliverRecordDetailService.getSupplierdeliverRecordDetail(id); return success(SupplierdeliverRecordDetailConvert.INSTANCE.convert(supplierdeliverRecordDetail)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:SupplierdeliverRecordDetail:query')") + public CommonResult> getSupplierdeliverRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = supplierdeliverRecordDetailService.getSupplierdeliverRecordDetailSenior(conditions); + PageResult result = SupplierdeliverRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(SupplierdeliverRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/list") @Operation(summary = "获得供应商发货记录子列表") @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordMainController.java index 0f103eb1..c20ea0bf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordMainController.java @@ -1,5 +1,8 @@ package com.win.module.wms.controller.supplierdeliverRecord; +import com.win.framework.common.pojo.CustomConditions; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.supplierdeliverRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -8,22 +11,16 @@ import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; - import javax.validation.*; import javax.servlet.http.*; import java.util.*; import java.io.IOException; - import com.win.framework.common.pojo.PageResult; import com.win.framework.common.pojo.CommonResult; import static com.win.framework.common.pojo.CommonResult.success; - import com.win.framework.excel.core.util.ExcelUtils; - import com.win.framework.operatelog.core.annotations.OperateLog; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - - import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordMainDO; import com.win.module.wms.convert.supplierdeliverRecord.SupplierdeliverRecordMainConvert; import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordMainService; @@ -37,6 +34,9 @@ public class SupplierdeliverRecordMainController { @Resource private SupplierdeliverRecordMainService supplierdeliverRecordMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建供应商发货记录主") @PreAuthorize("@ss.hasPermission('wms:supplierdeliver-record-main:create')") @@ -52,6 +52,19 @@ public class SupplierdeliverRecordMainController { return success(true); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:supplierdeliver-record-main:query')") + public CommonResult> getSupplierdeliverRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = supplierdeliverRecordMainService.getSupplierdeliverRecordMainSenior(conditions); + PageResult result = SupplierdeliverRecordMainConvert.INSTANCE.convertPage(pageResult); + for(SupplierdeliverRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @DeleteMapping("/delete") @Operation(summary = "删除供应商发货记录主") @Parameter(name = "id", description = "编号", required = true) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestDetailController.java index f0ebda86..834d139d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.supplierdeliverRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.supplierdeliverRequest.vo.*; @@ -57,6 +58,20 @@ public class SupplierdeliverRequestDetailController { return success(true); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:SupplierdeliverRequestDetail:query')") + public CommonResult> getSupplierdeliverRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = supplierdeliverRequestDetailService.getSupplierdeliverRequestDetailSenior(conditions); + PageResult result = SupplierdeliverRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(SupplierdeliverRequestDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + @DeleteMapping("/delete") @Operation(summary = "删除供应商发货申请子") @Parameter(name = "id", description = "编号", required = true) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestMainController.java index a58275c4..fefcdf44 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestMainController.java @@ -1,5 +1,5 @@ package com.win.module.wms.controller.supplierdeliverRequest; - +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.supplierdeliverRequest.vo.*; @@ -10,21 +10,16 @@ import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; - import javax.validation.*; import javax.servlet.http.*; import java.util.*; import java.io.IOException; - import com.win.framework.common.pojo.PageResult; import com.win.framework.common.pojo.CommonResult; import static com.win.framework.common.pojo.CommonResult.success; - import com.win.framework.excel.core.util.ExcelUtils; - import com.win.framework.operatelog.core.annotations.OperateLog; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - import com.win.module.wms.dal.dataobject.supplierdeliverRequest.SupplierdeliverRequestMainDO; import com.win.module.wms.convert.supplierdeliverRequest.SupplierdeliverRequestMainConvert; import com.win.module.wms.service.supplierdeliverRequest.SupplierdeliverRequestMainService; @@ -82,6 +77,19 @@ public class SupplierdeliverRequestMainController { List list = supplierdeliverRequestMainService.getSupplierdeliverRequestMainList(ids); return success(SupplierdeliverRequestMainConvert.INSTANCE.convertList(list)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:SupplierdeliverRequestMain:query')") + public CommonResult> getSupplierdeliverRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = supplierdeliverRequestMainService.getSupplierdeliverRequestMainSenior(conditions); + PageResult result = SupplierdeliverRequestMainConvert.INSTANCE.convertPage(pageResult); + for(SupplierdeliverRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/page") @Operation(summary = "获得供应商发货申请主分页") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/SupplierinvoiceRecordDeatilController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/SupplierinvoiceRecordDeatilController.java index f6f9d9ff..1655e78f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/SupplierinvoiceRecordDeatilController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/SupplierinvoiceRecordDeatilController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.supplierinvoiceRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.supplierinvoiceRecord.vo.*; @@ -90,7 +91,19 @@ public class SupplierinvoiceRecordDeatilController { PageResult pageResult = supplierinvoiceRecordDeatilService.getSupplierinvoiceRecordDeatilPage(pageVO); return success(SupplierinvoiceRecordDeatilConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:supplierinvoice-record-deatil:query')") + public CommonResult> getSupplierinvoiceRecordDeatilSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = supplierinvoiceRecordDeatilService.getSupplierinvoiceRecordDeatilSenior(conditions); + PageResult result = SupplierinvoiceRecordDeatilConvert.INSTANCE.convertPage(pageResult); + for(SupplierinvoiceRecordDeatilRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出供应商发票记录子 Excel") @PreAuthorize("@ss.hasPermission('wms:supplierinvoice-record-deatil:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/SupplierinvoiceRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/SupplierinvoiceRecordMainController.java index db48ac79..cdb628dc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/SupplierinvoiceRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/SupplierinvoiceRecordMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.supplierinvoiceRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.supplierinvoiceRecord.vo.*; @@ -10,21 +11,16 @@ import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; - import javax.validation.*; import javax.servlet.http.*; import java.util.*; import java.io.IOException; - import com.win.framework.common.pojo.PageResult; import com.win.framework.common.pojo.CommonResult; import static com.win.framework.common.pojo.CommonResult.success; - import com.win.framework.excel.core.util.ExcelUtils; - import com.win.framework.operatelog.core.annotations.OperateLog; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - import com.win.module.wms.dal.dataobject.supplierinvoiceRecord.SupplierinvoiceRecordMainDO; import com.win.module.wms.convert.supplierinvoiceRecord.SupplierinvoiceRecordMainConvert; import com.win.module.wms.service.supplierinvoiceRecord.SupplierinvoiceRecordMainService; @@ -64,7 +60,19 @@ public class SupplierinvoiceRecordMainController { supplierinvoiceRecordMainService.deleteSupplierinvoiceRecordMain(id); return success(true); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:SupplierinvoiceRecordMain:query')") + public CommonResult> getSupplierinvoiceRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = supplierinvoiceRecordMainService.getSupplierinvoiceRecordMainSenior(conditions); + PageResult result = SupplierinvoiceRecordMainConvert.INSTANCE.convertPage(pageResult); + for(SupplierinvoiceRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/get") @Operation(summary = "获得供应商发票记录主") @Parameter(name = "id", description = "编号", required = true, example = "1024") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/SupplierinvoiceRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/SupplierinvoiceRequestDetailController.java index 0f89900d..5f784699 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/SupplierinvoiceRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/SupplierinvoiceRequestDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.supplierinvoiceRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.supplierinvoiceRequest.vo.*; @@ -73,7 +74,19 @@ public class SupplierinvoiceRequestDetailController { SupplierinvoiceRequestDetailDO supplierinvoiceRequestDetail = supplierinvoiceRequestDetailService.getSupplierinvoiceRequestDetail(id); return success(SupplierinvoiceRequestDetailConvert.INSTANCE.convert(supplierinvoiceRequestDetail)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:supplierinvoice-request-detail:query')") + public CommonResult> getSupplierinvoiceRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = supplierinvoiceRequestDetailService.getSupplierinvoiceRequestDetailSenior(conditions); + PageResult result = SupplierinvoiceRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(SupplierinvoiceRequestDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/list") @Operation(summary = "获得供应商发票申请子列表") @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/SupplierinvoiceRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/SupplierinvoiceRequestMainController.java index 91c869ec..671da1e6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/SupplierinvoiceRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/SupplierinvoiceRequestMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.supplierinvoiceRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.supplierinvoiceRequest.vo.*; @@ -90,7 +91,19 @@ public class SupplierinvoiceRequestMainController { PageResult pageResult = supplierinvoiceRequestMainService.getSupplierinvoiceRequestMainPage(pageVO); return success(SupplierinvoiceRequestMainConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得供应商发票申请主信息分页") + @PreAuthorize("@ss.hasPermission('wms:supplierinvoice-request-main:query')") + public CommonResult> getSupplierinvoiceRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = supplierinvoiceRequestMainService.getSupplierinvoiceRequestMainSenior(conditions); + PageResult result = SupplierinvoiceRequestMainConvert.INSTANCE.convertPage(pageResult); + for(SupplierinvoiceRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出供应商发票申请主 Excel") @PreAuthorize("@ss.hasPermission('wms:supplierinvoice-request-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/SupplieritemController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/SupplieritemController.java index 8a1c6150..15e5ddfa 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/SupplieritemController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/SupplieritemController.java @@ -1,6 +1,7 @@ package com.win.module.wms.controller.supplieritem; import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; @@ -8,7 +9,6 @@ import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.supplieritem.vo.*; - import com.win.module.wms.convert.supplieritem.SupplieritemConvert; import com.win.module.wms.dal.dataobject.supplieritem.SupplieritemDO; import com.win.module.wms.enums.DictTypeConstants; @@ -94,6 +94,19 @@ public class SupplieritemController { PageResult pageResult = supplieritemService.getSupplieritemPage(pageVO); return success(SupplieritemConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:supplieritem:query')") + public CommonResult> getSupplieritemSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = supplieritemService.getSupplieritemSenior(conditions); + PageResult result = SupplieritemConvert.INSTANCE.convertPage(pageResult); + for(SupplieritemRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出供应商物品 Excel") @@ -108,8 +121,18 @@ public class SupplieritemController { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); - } - ExcelUtils.write(response, "供应商物品.xls", "数据", SupplieritemExcelVO.class, datas); + } Map mapDropDown = new HashMap<>(); + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(13, available); + String[] supplierUom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); + mapDropDown.put(3, supplierUom); + String[] packUnit = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PACK_UNIT); + mapDropDown.put(5, packUnit); + String[] altPackUnit = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PACK_UNIT); + mapDropDown.put(7, altPackUnit); + String[] settlementType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.SETTLEMENT_TYPE); + mapDropDown.put(12, settlementType); + ExcelUtils.write(response, "供应商物品.xls", "数据", SupplieritemExcelVO.class, datas,mapDropDown); } @GetMapping("/get-import-template") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/systemcalendar/SystemcalendarController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/systemcalendar/SystemcalendarController.java index f0c7b036..a5b0b432 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/systemcalendar/SystemcalendarController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/systemcalendar/SystemcalendarController.java @@ -1,12 +1,13 @@ package com.win.module.wms.controller.systemcalendar; import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; -import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.system.api.user.dto.AdminUserRespDTO;; import com.win.module.wms.controller.systemcalendar.vo.*; import com.win.module.wms.controller.systemcalendar.vo.SystemcalendarImportExcelVo; import com.win.module.wms.convert.systemcalendar.SystemcalendarConvert; @@ -21,7 +22,6 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; - import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -29,7 +29,6 @@ import java.io.IOException; import java.time.LocalDateTime; import java.time.ZoneOffset; import java.util.*; - import static com.win.framework.common.pojo.CommonResult.success; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @@ -94,7 +93,19 @@ public class SystemcalendarController { PageResult pageResult = systemcalendarService.getSystemcalendarPage(pageVO); return success(SystemcalendarConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:Systemcalendar:query')") + public CommonResult> getSystemcalendarSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = systemcalendarService.getSystemcalendarSenior(conditions); + PageResult result = SystemcalendarConvert.INSTANCE.convertPage(pageResult); + for(SystemcalendarRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出系统日历 Excel") @PreAuthorize("@ss.hasPermission('wms:systemcalendar:export')") @@ -108,8 +119,10 @@ public class SystemcalendarController { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); - } - ExcelUtils.write(response, "系统日历.xls", "数据", SystemcalendarExcelVO.class, datas); + } Map mapDropDown = new HashMap<>(); + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(3, available); + ExcelUtils.write(response, "系统日历.xls", "数据", SystemcalendarExcelVO.class, datas,mapDropDown); } @GetMapping("/get-import-template") @Operation(summary = "获得导入班组信息模板") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/team/TeamController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/team/TeamController.java index 8a70810b..8c75f4fb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/team/TeamController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/team/TeamController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.team; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; @@ -96,7 +97,19 @@ public class TeamController { PageResult pageResult = teamService.getTeamPage(pageVO); return success(TeamConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:team:query')") + public CommonResult> getTeamSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = teamService.getTeamSenior(conditions); + PageResult result = TeamConvert.INSTANCE.convertPage(pageResult); + for(TeamRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出班组 Excel") @PreAuthorize("@ss.hasPermission('wms:team:export')") @@ -111,7 +124,10 @@ public class TeamController { //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } - ExcelUtils.write(response, "班组.xls", "数据", TeamExcelVO.class, datas); + Map mapDropDown = new HashMap<>(); + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(7, available); + ExcelUtils.write(response, "班组.xls", "数据", TeamExcelVO.class, datas,mapDropDown); } @GetMapping("/get-import-template") @Operation(summary = "获得导入班组信息模板") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/TransactionController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/TransactionController.java index 8860cb9c..cb7ece5c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/TransactionController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/TransactionController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.transaction; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.transaction.vo.*; @@ -83,7 +84,19 @@ public class TransactionController { List list = transactionService.getTransactionList(ids); return success(TransactionConvert.INSTANCE.convertList(list)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:Transaction:query')") + public CommonResult> getTransactionSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = transactionService.getTransactionSenior(conditions); + PageResult result = TransactionConvert.INSTANCE.convertPage(pageResult); + for(TransactionRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/page") @Operation(summary = "获得库存事务分页") @PreAuthorize("@ss.hasPermission('wms:transaction:query')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/vo/TransactionRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/vo/TransactionRespVO.java index c219ad39..ce2a812d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/vo/TransactionRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/vo/TransactionRespVO.java @@ -9,4 +9,6 @@ import lombok.*; @ToString(callSuper = true) public class TransactionRespVO extends TransactionBaseVO { + @Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED) + private String creator; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transactiontype/TransactiontypeController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transactiontype/TransactiontypeController.java index da208526..56ba3c74 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transactiontype/TransactiontypeController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transactiontype/TransactiontypeController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.transactiontype; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; @@ -70,7 +71,19 @@ public class TransactiontypeController { transactiontypeService.deleteTransactiontype(id); return success(true); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:Transactiontype:query')") + public CommonResult> getTransactiontypeSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = transactiontypeService.getTransactiontypeSenior(conditions); + PageResult result = TransactiontypeConvert.INSTANCE.convertPage(pageResult); + for(TransactiontypeRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/get") @Operation(summary = "获得事务类型") @Parameter(name = "id", description = "编号", required = true, example = "1024") @@ -110,8 +123,14 @@ public class TransactiontypeController { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); - } - ExcelUtils.write(response, "事务类型.xls", "数据", TransactiontypeExcelVO.class, datas); + } Map mapDropDown = new HashMap<>(); + String[] allowNegative = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(7, allowNegative); + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(8, available); + String[] isSoftDeleted = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(9, isSoftDeleted); + ExcelUtils.write(response, "事务类型.xls", "数据", TransactiontypeExcelVO.class, datas,mapDropDown); } @GetMapping("/get-import-template") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/TransferissueJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/TransferissueJobDetailController.java index f92af4ba..9bb6a98c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/TransferissueJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/TransferissueJobDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.transferissueJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.transferissueJob.vo.*; @@ -48,7 +49,19 @@ public class TransferissueJobDetailController { public CommonResult createTransferissueJobDetail(@Valid @RequestBody TransferissueJobDetailCreateReqVO createReqVO) { return success(transferissueJobDetailService.createTransferissueJobDetail(createReqVO)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:transferissue-job-detail:query')") + public CommonResult> getTransferissueJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = transferissueJobDetailService.getTransferissueJobDetailSenior(conditions); + PageResult result = TransferissueJobDetailConvert.INSTANCE.convertPage(pageResult); + for(TransferissueJobDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @PutMapping("/update") @Operation(summary = "更新调拨出库任务子") @PreAuthorize("@ss.hasPermission('wms:transferissue-job-detail:update')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/TransferissueJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/TransferissueJobMainController.java index e54c3d5b..de94ae76 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/TransferissueJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/TransferissueJobMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.transferissueJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.transferissueJob.vo.*; @@ -91,7 +92,19 @@ public class TransferissueJobMainController { PageResult pageResult = transferissueJobMainService.getTransferissueJobMainPage(pageVO); return success(TransferissueJobMainConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:transferissue-job-main:query')") + public CommonResult> getTransferissueJobMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = transferissueJobMainService.getTransferissueJobMainSenior(conditions); + PageResult result = TransferissueJobMainConvert.INSTANCE.convertPage(pageResult); + for(TransferissueJobMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出调拨出库任务主 Excel") @PreAuthorize("@ss.hasPermission('wms:transferissue-job-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/TransferissueRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/TransferissueRecordDetailController.java index b7d9e86f..c62652e2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/TransferissueRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/TransferissueRecordDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.transferissueRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.transferissueRecord.vo.*; @@ -10,22 +11,16 @@ import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; - import javax.validation.*; import javax.servlet.http.*; import java.util.*; import java.io.IOException; - import com.win.framework.common.pojo.PageResult; import com.win.framework.common.pojo.CommonResult; import static com.win.framework.common.pojo.CommonResult.success; - import com.win.framework.excel.core.util.ExcelUtils; - import com.win.framework.operatelog.core.annotations.OperateLog; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.win.module.wms.controller.transferissueRecord.vo.*; import com.win.module.wms.dal.dataobject.transferissueRecord.TransferissueRecordDetailDO; import com.win.module.wms.convert.transferissueRecord.TransferissueRecordDetailConvert; import com.win.module.wms.service.transferissueRecord.TransferissueRecordDetailService; @@ -82,6 +77,20 @@ public class TransferissueRecordDetailController { List list = transferissueRecordDetailService.getTransferissueRecordDetailList(ids); return success(TransferissueRecordDetailConvert.INSTANCE.convertList(list)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:transferissue-record-detail:query')") + public CommonResult> getTransferissueRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = transferissueRecordDetailService.getTransferissueRequestDetailSenior(conditions); + PageResult result = TransferissueRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(TransferissueRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + @GetMapping("/page") @Operation(summary = "获得调拨出库记录子分页") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/TransferissueRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/TransferissueRecordMainController.java index 8895d510..ed7f6092 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/TransferissueRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/TransferissueRecordMainController.java @@ -1,5 +1,8 @@ package com.win.module.wms.controller.transferissueRecord; +import com.win.framework.common.pojo.CustomConditions; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.transferissueRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +40,9 @@ public class TransferissueRecordMainController { @Resource private TransferissueRecordMainService transferissueRecordMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建调拨出库记录主") @PreAuthorize("@ss.hasPermission('wms:transferissue-record-main:create')") @@ -51,7 +57,20 @@ public class TransferissueRecordMainController { transferissueRecordMainService.updateTransferissueRecordMain(updateReqVO); return success(true); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:TransferissueRecordMain:query')") + public CommonResult> getTransferissueRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = transferissueRecordMainService.getTransferissueRecordMainSenior(conditions); + PageResult result = TransferissueRecordMainConvert.INSTANCE.convertPage(pageResult); + for(TransferissueRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + @DeleteMapping("/delete") @Operation(summary = "删除调拨出库记录主") @Parameter(name = "id", description = "编号", required = true) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRequest/TransferissueRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRequest/TransferissueRequestDetailController.java index 353be48b..3bf9e4f1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRequest/TransferissueRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRequest/TransferissueRequestDetailController.java @@ -1,5 +1,8 @@ package com.win.module.wms.controller.transferissueRequest; +import com.win.framework.common.pojo.CustomConditions; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.transferissueRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -36,7 +39,8 @@ public class TransferissueRequestDetailController { @Resource private TransferissueRequestDetailService transferissueRequestDetailService; - + @Resource + private AdminUserApi userApi; @PostMapping("/create") @Operation(summary = "创建调拨出库申请子") @PreAuthorize("@ss.hasPermission('wms:transferissue-request-detail:create')") @@ -44,6 +48,19 @@ public class TransferissueRequestDetailController { return success(transferissueRequestDetailService.createTransferissueRequestDetail(createReqVO)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:itembasic:query')") + public CommonResult> getTransferissueRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = transferissueRequestDetailService.getTransferissueRequestDetailSenior(conditions); + PageResult result = TransferissueRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(TransferissueRequestDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @PutMapping("/update") @Operation(summary = "更新调拨出库申请子") @PreAuthorize("@ss.hasPermission('wms:transferissue-request-detail:update')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRequest/TransferissueRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRequest/TransferissueRequestMainController.java index d208cae2..3b8171b8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRequest/TransferissueRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRequest/TransferissueRequestMainController.java @@ -1,5 +1,8 @@ package com.win.module.wms.controller.transferissueRequest; +import com.win.framework.common.pojo.CustomConditions; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.transferissueRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +40,9 @@ public class TransferissueRequestMainController { @Resource private TransferissueRequestMainService transferissueRequestMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建调拨出库申请主") @PreAuthorize("@ss.hasPermission('wms:transferissue-request-main:create')") @@ -51,6 +57,19 @@ public class TransferissueRequestMainController { transferissueRequestMainService.updateTransferissueRequestMain(updateReqVO); return success(true); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:itembasic:query')") + public CommonResult> getTransferissueRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = transferissueRequestMainService.getTransferissueRequestMainSenior(conditions); + PageResult result = TransferissueRequestMainConvert.INSTANCE.convertPage(pageResult); + for(TransferissueRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @DeleteMapping("/delete") @Operation(summary = "删除调拨出库申请主") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferlog/TransferlogController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferlog/TransferlogController.java index 4f3e7eef..04338a5f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferlog/TransferlogController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferlog/TransferlogController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.transferlog; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.transferlog.vo.*; @@ -57,6 +58,19 @@ public class TransferlogController { return success(true); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:itembasic:query')") + public CommonResult> getTransferlogSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = transferlogService.getTransferlogSenior(conditions); + PageResult result = TransferlogConvert.INSTANCE.convertPage(pageResult); + for(TransferlogRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @DeleteMapping("/delete") @Operation(summary = "删除库存转移日志") @Parameter(name = "id", description = "编号", required = true) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferlog/vo/TransferlogRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferlog/vo/TransferlogRespVO.java index 2fd39fca..11bb6e63 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferlog/vo/TransferlogRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferlog/vo/TransferlogRespVO.java @@ -8,5 +8,7 @@ import lombok.*; @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class TransferlogRespVO extends TransferlogBaseVO { + @Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED) + private String creator; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobDetailController.java index 6ea03222..6184f8b2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.transferreceiptJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.transferreceiptJob.vo.*; @@ -15,17 +16,12 @@ import javax.validation.*; import javax.servlet.http.*; import java.util.*; import java.io.IOException; - import com.win.framework.common.pojo.PageResult; import com.win.framework.common.pojo.CommonResult; import static com.win.framework.common.pojo.CommonResult.success; - import com.win.framework.excel.core.util.ExcelUtils; - import com.win.framework.operatelog.core.annotations.OperateLog; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.win.module.wms.controller.transferreceiptJob.vo.*; import com.win.module.wms.dal.dataobject.transferreceiptJob.TransferreceiptJobDetailDO; import com.win.module.wms.convert.transferreceiptJob.TransferreceiptJobDetailConvert; import com.win.module.wms.service.transferreceiptJob.TransferreceiptJobDetailService; @@ -48,7 +44,19 @@ public class TransferreceiptJobDetailController { public CommonResult createTransferreceiptJobDetail(@Valid @RequestBody TransferreceiptJobDetailCreateReqVO createReqVO) { return success(transferreceiptJobDetailService.createTransferreceiptJobDetail(createReqVO)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:itembasic:query')") + public CommonResult> getTransferreceiptJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = transferreceiptJobDetailService.getTransferreceiptJobDetailSenior(conditions); + PageResult result = TransferreceiptJobDetailConvert.INSTANCE.convertPage(pageResult); + for(TransferreceiptJobDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @PutMapping("/update") @Operation(summary = "更新调拨入库任务子") @PreAuthorize("@ss.hasPermission('wms:transferreceipt-job-detail:update')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobMainController.java index ee8c0c4b..ecb65d91 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.transferreceiptJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.transferreceiptJob.vo.*; @@ -10,22 +11,16 @@ import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; - import javax.validation.*; import javax.servlet.http.*; import java.util.*; import java.io.IOException; - import com.win.framework.common.pojo.PageResult; import com.win.framework.common.pojo.CommonResult; import static com.win.framework.common.pojo.CommonResult.success; - import com.win.framework.excel.core.util.ExcelUtils; - import com.win.framework.operatelog.core.annotations.OperateLog; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.win.module.wms.controller.transferreceiptJob.vo.*; import com.win.module.wms.dal.dataobject.transferreceiptJob.TransferreceiptJobMainDO; import com.win.module.wms.convert.transferreceiptJob.TransferreceiptJobMainConvert; import com.win.module.wms.service.transferreceiptJob.TransferreceiptJobMainService; @@ -92,6 +87,20 @@ public class TransferreceiptJobMainController { return success(TransferreceiptJobMainConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:itembasic:query')") + public CommonResult> getTransferreceiptJobMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = transferreceiptJobMainService.getTransferreceiptJobMainSenior(conditions); + PageResult result = TransferreceiptJobMainConvert.INSTANCE.convertPage(pageResult); + for(TransferreceiptJobMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + @GetMapping("/export-excel") @Operation(summary = "导出调拨入库任务主 Excel") @PreAuthorize("@ss.hasPermission('wms:transferreceipt-job-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/TransferreceiptRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/TransferreceiptRecordDetailController.java index 20a9e13f..d19460d9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/TransferreceiptRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/TransferreceiptRecordDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.transferreceiptRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.transferreceiptRecord.vo.*; @@ -10,22 +11,16 @@ import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; - import javax.validation.*; import javax.servlet.http.*; import java.util.*; import java.io.IOException; - import com.win.framework.common.pojo.PageResult; import com.win.framework.common.pojo.CommonResult; import static com.win.framework.common.pojo.CommonResult.success; - import com.win.framework.excel.core.util.ExcelUtils; - import com.win.framework.operatelog.core.annotations.OperateLog; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.win.module.wms.controller.transferreceiptRecord.vo.*; import com.win.module.wms.dal.dataobject.transferreceiptRecord.TransferreceiptRecordDetailDO; import com.win.module.wms.convert.transferreceiptRecord.TransferreceiptRecordDetailConvert; import com.win.module.wms.service.transferreceiptRecord.TransferreceiptRecordDetailService; @@ -92,6 +87,19 @@ public class TransferreceiptRecordDetailController { return success(TransferreceiptRecordDetailConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:itembasic:query')") + public CommonResult> getTransferreceiptRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = transferreceiptRecordDetailService.getTransferreceiptRecordDetailSenior(conditions); + PageResult result = TransferreceiptRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(TransferreceiptRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出调拨入库记录子 Excel") @PreAuthorize("@ss.hasPermission('wms:transferreceipt-record-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/TransferreceiptRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/TransferreceiptRecordMainController.java index 91ac5b2b..e8550e93 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/TransferreceiptRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/TransferreceiptRecordMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.transferreceiptRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.transferreceiptRecord.vo.*; @@ -25,7 +26,6 @@ import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; -import com.win.module.wms.controller.transferreceiptRecord.vo.*; import com.win.module.wms.dal.dataobject.transferreceiptRecord.TransferreceiptRecordMainDO; import com.win.module.wms.convert.transferreceiptRecord.TransferreceiptRecordMainConvert; import com.win.module.wms.service.transferreceiptRecord.TransferreceiptRecordMainService; @@ -66,6 +66,20 @@ public class TransferreceiptRecordMainController { return success(true); } + + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:TransferreceiptRecordMain:query')") + public CommonResult> getTransferreceiptRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = transferreceiptRecordMainService.getTransferreceiptRecordMainSenior(conditions); + PageResult result = TransferreceiptRecordMainConvert.INSTANCE.convertPage(pageResult); + for(TransferreceiptRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/get") @Operation(summary = "获得调拨入库记录主") @Parameter(name = "id", description = "编号", required = true, example = "1024") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/TransferreceiptRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/TransferreceiptRequestDetailController.java index bdb786b9..251b05b2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/TransferreceiptRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/TransferreceiptRequestDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.transferreceiptRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.transferreceiptRequest.vo.*; @@ -48,7 +49,19 @@ public class TransferreceiptRequestDetailController { public CommonResult createTransferreceiptRequestDetail(@Valid @RequestBody TransferreceiptRequestDetailCreateReqVO createReqVO) { return success(transferreceiptRequestDetailService.createTransferreceiptRequestDetail(createReqVO)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:itembasic:query')") + public CommonResult> getTransferreceiptRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = transferreceiptRequestDetailService.getTransferreceiptRequestDetailSenior(conditions); + PageResult result = TransferreceiptRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(TransferreceiptRequestDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @PutMapping("/update") @Operation(summary = "更新调拨入库申请子") @PreAuthorize("@ss.hasPermission('wms:transferreceipt-request-detail:update')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/TransferreceiptRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/TransferreceiptRequestMainController.java index e2607109..8e3f7e2a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/TransferreceiptRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/TransferreceiptRequestMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.transferreceiptRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.transferreceiptRequest.vo.*; @@ -10,22 +11,16 @@ import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; - import javax.validation.*; import javax.servlet.http.*; import java.util.*; import java.io.IOException; - import com.win.framework.common.pojo.PageResult; import com.win.framework.common.pojo.CommonResult; import static com.win.framework.common.pojo.CommonResult.success; - import com.win.framework.excel.core.util.ExcelUtils; - import com.win.framework.operatelog.core.annotations.OperateLog; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.win.module.wms.controller.transferreceiptRequest.vo.*; import com.win.module.wms.dal.dataobject.transferreceiptRequest.TransferreceiptRequestMainDO; import com.win.module.wms.convert.transferreceiptRequest.TransferreceiptRequestMainConvert; import com.win.module.wms.service.transferreceiptRequest.TransferreceiptRequestMainService; @@ -92,6 +87,21 @@ public class TransferreceiptRequestMainController { return success(TransferreceiptRequestMainConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:transferreceipt-request-main:query')") + public CommonResult> getTransferreceiptRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = transferreceiptRequestMainService.getTransferreceiptRequestMainSenior(conditions); + PageResult result = TransferreceiptRequestMainConvert.INSTANCE.convertPage(pageResult); + for(TransferreceiptRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + + @GetMapping("/export-excel") @Operation(summary = "导出调拨入库申请主 Excel") @PreAuthorize("@ss.hasPermission('wms:transferreceipt-request-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/UnplannedissueJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/UnplannedissueJobDetailController.java index 67fe4efd..2be8eca9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/UnplannedissueJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/UnplannedissueJobDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.unplannedissueJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.unplannedissueJob.vo.*; @@ -57,6 +58,19 @@ public class UnplannedissueJobDetailController { return success(true); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得计划外出库任务子信息分页") + @PreAuthorize("@ss.hasPermission('wms:itembasic:query')") + public CommonResult> getUnplannedissueJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = unplannedissueJobDetailService.getUnplannedissueJobDetailSenior(conditions); + PageResult result = UnplannedissueJobDetailConvert.INSTANCE.convertPage(pageResult); + for(UnplannedissueJobDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @DeleteMapping("/delete") @Operation(summary = "删除计划外出库任务子") @Parameter(name = "id", description = "编号", required = true) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/UnplannedissueJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/UnplannedissueJobMainController.java index b8dd868a..20d5d4a0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/UnplannedissueJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/UnplannedissueJobMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.unplannedissueJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.unplannedissueJob.vo.*; @@ -56,7 +57,19 @@ public class UnplannedissueJobMainController { unplannedissueJobMainService.updateUnplannedissueJobMain(updateReqVO); return success(true); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:itembasic:query')") + public CommonResult> getUnplannedissueJobMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = unplannedissueJobMainService.getUnplannedissueJobMainSenior(conditions); + PageResult result = UnplannedissueJobMainConvert.INSTANCE.convertPage(pageResult); + for(UnplannedissueJobMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @DeleteMapping("/delete") @Operation(summary = "删除计划外出库任务主") @Parameter(name = "id", description = "编号", required = true) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/UnplannedissueRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/UnplannedissueRecordDetailController.java index feb6ab81..59218b87 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/UnplannedissueRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/UnplannedissueRecordDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.unplannedissueRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.unplannedissueRecord.vo.*; @@ -48,7 +49,19 @@ public class UnplannedissueRecordDetailController { public CommonResult createUnplannedissueRecordDetail(@Valid @RequestBody UnplannedissueRecordDetailCreateReqVO createReqVO) { return success(unplannedissueRecordDetailService.createUnplannedissueRecordDetail(createReqVO)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:itembasic:query')") + public CommonResult> getUnplannedissueRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = unplannedissueRecordDetailService.getUnplannedissueRecordDetailSenior(conditions); + PageResult result = UnplannedissueRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(UnplannedissueRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @PutMapping("/update") @Operation(summary = "更新计划外出库记录子") @PreAuthorize("@ss.hasPermission('wms:unplannedissue-record-detail:update')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/UnplannedissueRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/UnplannedissueRecordMainController.java index aa7ae890..483297d8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/UnplannedissueRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/UnplannedissueRecordMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.unplannedissueRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.unplannedissueRecord.vo.*; @@ -15,17 +16,12 @@ import javax.validation.*; import javax.servlet.http.*; import java.util.*; import java.io.IOException; - import com.win.framework.common.pojo.PageResult; import com.win.framework.common.pojo.CommonResult; import static com.win.framework.common.pojo.CommonResult.success; - import com.win.framework.excel.core.util.ExcelUtils; - import com.win.framework.operatelog.core.annotations.OperateLog; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.win.module.wms.controller.unplannedissueRecord.vo.*; import com.win.module.wms.dal.dataobject.unplannedissueRecord.UnplannedissueRecordMainDO; import com.win.module.wms.convert.unplannedissueRecord.UnplannedissueRecordMainConvert; import com.win.module.wms.service.unplannedissueRecord.UnplannedissueRecordMainService; @@ -91,7 +87,19 @@ public class UnplannedissueRecordMainController { PageResult pageResult = unplannedissueRecordMainService.getUnplannedissueRecordMainPage(pageVO); return success(UnplannedissueRecordMainConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:unplannedissue-record-main:query')") + public CommonResult> getUnplannedissueRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = unplannedissueRecordMainService.getUnplannedissueRecordMainSenior(conditions); + PageResult result = UnplannedissueRecordMainConvert.INSTANCE.convertPage(pageResult); + for(UnplannedissueRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出计划外出库记录主 Excel") @PreAuthorize("@ss.hasPermission('wms:unplannedissue-record-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordMainBaseVO.java index ee338f2a..55f8bce8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordMainBaseVO.java @@ -86,6 +86,7 @@ public class UnplannedissueRecordMainBaseVO { @NotNull(message = "创建者Id不能为空") private String creatorId; + @Schema(description = "从仓库代码") private String fromWarehouseCode; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordMainExcelVO.java index 29f7eb49..41f63563 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordMainExcelVO.java @@ -93,4 +93,5 @@ public class UnplannedissueRecordMainExcelVO { @ExcelProperty("创建者ID") private String creator; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordMainRespVO.java index 4ff4cbc7..3c42b98d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordMainRespVO.java @@ -9,4 +9,7 @@ import lombok.*; @ToString(callSuper = true) public class UnplannedissueRecordMainRespVO extends UnplannedissueRecordMainBaseVO { + @Schema(description = "创建者ID", requiredMode = Schema.RequiredMode.REQUIRED) + private String creator; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/UnplannedissueRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/UnplannedissueRequestDetailController.java index 7d7ef502..f3ea7f43 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/UnplannedissueRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/UnplannedissueRequestDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.unplannedissueRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.unplannedissueRequest.vo.*; @@ -83,7 +84,19 @@ public class UnplannedissueRequestDetailController { List list = unplannedissueRequestDetailService.getUnplannedissueRequestDetailList(ids); return success(UnplannedissueRequestDetailConvert.INSTANCE.convertList(list)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:unplannedissue-request-detail:query')") + public CommonResult> getUnplannedissueRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = unplannedissueRequestDetailService.getUnplannedissueRequestDetailSenior(conditions); + PageResult result = UnplannedissueRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(UnplannedissueRequestDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/page") @Operation(summary = "获得计划外出库申请子分页") @PreAuthorize("@ss.hasPermission('wms:unplannedissue-request-detail:query')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/UnplannedissueRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/UnplannedissueRequestMainController.java index 19ba43bf..89088728 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/UnplannedissueRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/UnplannedissueRequestMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.unplannedissueRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.unplannedissueRequest.vo.*; @@ -24,8 +25,6 @@ import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.win.module.wms.controller.unplannedissueRequest.vo.*; import com.win.module.wms.dal.dataobject.unplannedissueRequest.UnplannedissueRequestMainDO; import com.win.module.wms.convert.unplannedissueRequest.UnplannedissueRequestMainConvert; import com.win.module.wms.service.unplannedissueRequest.UnplannedissueRequestMainService; @@ -84,6 +83,20 @@ public class UnplannedissueRequestMainController { return success(UnplannedissueRequestMainConvert.INSTANCE.convertList(list)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:unplannedissue-request-main:query')") + public CommonResult> getUnplannedissueRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = unplannedissueRequestMainService.getUnplannedissueRequestMainSenior(conditions); + PageResult result = UnplannedissueRequestMainConvert.INSTANCE.convertPage(pageResult); + for(UnplannedissueRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + @GetMapping("/page") @Operation(summary = "获得计划外出库申请主分页") @PreAuthorize("@ss.hasPermission('wms:unplannedissue-request-main:query')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/UnplannedreceiptJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/UnplannedreceiptJobDetailController.java index 829866a8..03862ee8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/UnplannedreceiptJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/UnplannedreceiptJobDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.unplannedreceiptJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.unplannedreceiptJob.vo.*; @@ -10,22 +11,16 @@ import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; - import javax.validation.*; import javax.servlet.http.*; import java.util.*; import java.io.IOException; - import com.win.framework.common.pojo.PageResult; import com.win.framework.common.pojo.CommonResult; import static com.win.framework.common.pojo.CommonResult.success; - import com.win.framework.excel.core.util.ExcelUtils; - import com.win.framework.operatelog.core.annotations.OperateLog; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.win.module.wms.controller.unplannedreceiptJob.vo.*; import com.win.module.wms.dal.dataobject.unplannedreceiptJob.UnplannedreceiptJobDetailDO; import com.win.module.wms.convert.unplannedreceiptJob.UnplannedreceiptJobDetailConvert; import com.win.module.wms.service.unplannedreceiptJob.UnplannedreceiptJobDetailService; @@ -57,6 +52,20 @@ public class UnplannedreceiptJobDetailController { return success(true); } + + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:unplannedreceipt-job-detail:query')") + public CommonResult> getUnplannedreceiptJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = unplannedreceiptJobDetailService.getUnplannedreceiptJobDetailSenior(conditions); + PageResult result = UnplannedreceiptJobDetailConvert.INSTANCE.convertPage(pageResult); + for(UnplannedreceiptJobDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @DeleteMapping("/delete") @Operation(summary = "删除计划外入库任务子") @Parameter(name = "id", description = "编号", required = true) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/UnplannedreceiptJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/UnplannedreceiptJobMainController.java index 1777fc9e..7b80092a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/UnplannedreceiptJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/UnplannedreceiptJobMainController.java @@ -1,5 +1,5 @@ package com.win.module.wms.controller.unplannedreceiptJob; - +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.unplannedreceiptJob.vo.*; @@ -10,22 +10,16 @@ import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; - import javax.validation.*; import javax.servlet.http.*; import java.util.*; import java.io.IOException; - import com.win.framework.common.pojo.PageResult; import com.win.framework.common.pojo.CommonResult; import static com.win.framework.common.pojo.CommonResult.success; - import com.win.framework.excel.core.util.ExcelUtils; - import com.win.framework.operatelog.core.annotations.OperateLog; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.win.module.wms.controller.unplannedreceiptJob.vo.*; import com.win.module.wms.dal.dataobject.unplannedreceiptJob.UnplannedreceiptJobMainDO; import com.win.module.wms.convert.unplannedreceiptJob.UnplannedreceiptJobMainConvert; import com.win.module.wms.service.unplannedreceiptJob.UnplannedreceiptJobMainService; @@ -65,7 +59,19 @@ public class UnplannedreceiptJobMainController { unplannedreceiptJobMainService.deleteUnplannedreceiptJobMain(id); return success(true); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:unplannedreceipt-job-main:query')") + public CommonResult> getUnplannedreceiptJobMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = unplannedreceiptJobMainService.getUnplannedreceiptJobMainSenior(conditions); + PageResult result = UnplannedreceiptJobMainConvert.INSTANCE.convertPage(pageResult); + for(UnplannedreceiptJobMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/get") @Operation(summary = "获得计划外入库任务主") @Parameter(name = "id", description = "编号", required = true, example = "1024") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/UnplannedreceiptRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/UnplannedreceiptRecordDetailController.java index 5956df0d..2aaeaec4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/UnplannedreceiptRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/UnplannedreceiptRecordDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.unplannedreceiptRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.unplannedreceiptRecord.vo.*; @@ -10,22 +11,16 @@ import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; - import javax.validation.*; import javax.servlet.http.*; import java.util.*; import java.io.IOException; - import com.win.framework.common.pojo.PageResult; import com.win.framework.common.pojo.CommonResult; import static com.win.framework.common.pojo.CommonResult.success; - import com.win.framework.excel.core.util.ExcelUtils; - import com.win.framework.operatelog.core.annotations.OperateLog; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.win.module.wms.controller.unplannedreceiptRecord.vo.*; import com.win.module.wms.dal.dataobject.unplannedreceiptRecord.UnplannedreceiptRecordDetailDO; import com.win.module.wms.convert.unplannedreceiptRecord.UnplannedreceiptRecordDetailConvert; import com.win.module.wms.service.unplannedreceiptRecord.UnplannedreceiptRecordDetailService; @@ -91,7 +86,19 @@ public class UnplannedreceiptRecordDetailController { PageResult pageResult = unplannedreceiptRecordDetailService.getUnplannedreceiptRecordDetailPage(pageVO); return success(UnplannedreceiptRecordDetailConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:unplannedreceiptRecordDetail:query')") + public CommonResult> getUnplannedreceiptRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = unplannedreceiptRecordDetailService.getUnplannedreceiptRecordDetailSenior(conditions); + PageResult result = UnplannedreceiptRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(UnplannedreceiptRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出计划外入库记录子 Excel") @PreAuthorize("@ss.hasPermission('wms:unplannedreceipt-record-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/UnplannedreceiptRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/UnplannedreceiptRecordMainController.java index e3348eab..8612fa9d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/UnplannedreceiptRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/UnplannedreceiptRecordMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.unplannedreceiptRecord; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.unplannedreceiptRecord.vo.*; @@ -10,22 +12,16 @@ import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; - import javax.validation.*; import javax.servlet.http.*; import java.util.*; import java.io.IOException; - import com.win.framework.common.pojo.PageResult; import com.win.framework.common.pojo.CommonResult; import static com.win.framework.common.pojo.CommonResult.success; - import com.win.framework.excel.core.util.ExcelUtils; - import com.win.framework.operatelog.core.annotations.OperateLog; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.win.module.wms.controller.unplannedreceiptRecord.vo.*; import com.win.module.wms.dal.dataobject.unplannedreceiptRecord.UnplannedreceiptRecordMainDO; import com.win.module.wms.convert.unplannedreceiptRecord.UnplannedreceiptRecordMainConvert; import com.win.module.wms.service.unplannedreceiptRecord.UnplannedreceiptRecordMainService; @@ -56,6 +52,7 @@ public class UnplannedreceiptRecordMainController { unplannedreceiptRecordMainService.updateUnplannedreceiptRecordMain(updateReqVO); return success(true); } + @DeleteMapping("/delete") @Operation(summary = "删除计划外入库记录主") @@ -65,7 +62,19 @@ public class UnplannedreceiptRecordMainController { unplannedreceiptRecordMainService.deleteUnplannedreceiptRecordMain(id); return success(true); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:unplannedreceiptRecordMain:query')") + public CommonResult> getUnplannedreceiptRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = unplannedreceiptRecordMainService.getUnplannedreceiptRecordMainSenior(conditions); + PageResult result = UnplannedreceiptRecordMainConvert.INSTANCE.convertPage(pageResult); + for(UnplannedreceiptRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/get") @Operation(summary = "获得计划外入库记录主") @Parameter(name = "id", description = "编号", required = true, example = "1024") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/UnplannedreceiptRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/UnplannedreceiptRequestDetailController.java index 952678a2..1e3b940e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/UnplannedreceiptRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/UnplannedreceiptRequestDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.unplannedreceiptRequest; +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.unplannedreceiptRequest.vo.*; @@ -10,22 +11,16 @@ import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; - import javax.validation.*; import javax.servlet.http.*; import java.util.*; import java.io.IOException; - import com.win.framework.common.pojo.PageResult; import com.win.framework.common.pojo.CommonResult; import static com.win.framework.common.pojo.CommonResult.success; - import com.win.framework.excel.core.util.ExcelUtils; - import com.win.framework.operatelog.core.annotations.OperateLog; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.win.module.wms.controller.unplannedreceiptRequest.vo.*; import com.win.module.wms.dal.dataobject.unplannedreceiptRequest.UnplannedreceiptRequestDetailDO; import com.win.module.wms.convert.unplannedreceiptRequest.UnplannedreceiptRequestDetailConvert; import com.win.module.wms.service.unplannedreceiptRequest.UnplannedreceiptRequestDetailService; @@ -92,6 +87,19 @@ public class UnplannedreceiptRequestDetailController { return success(UnplannedreceiptRequestDetailConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:unplannedreceiptRequestDetail:query')") + public CommonResult> getUnplannedreceiptRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = unplannedreceiptRequestDetailService.getUnplannedreceiptRequestDetailSenior(conditions); + PageResult result = UnplannedreceiptRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(UnplannedreceiptRequestDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出计划外入库申请子 Excel") @PreAuthorize("@ss.hasPermission('wms:unplannedreceipt-request-detail:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/UnplannedreceiptRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/UnplannedreceiptRequestMainController.java index fca26ad1..f924cdbc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/UnplannedreceiptRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/UnplannedreceiptRequestMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.unplannedreceiptRequest; +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.unplannedreceiptRequest.vo.*; @@ -10,22 +11,16 @@ import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; - import javax.validation.*; import javax.servlet.http.*; import java.util.*; import java.io.IOException; - import com.win.framework.common.pojo.PageResult; import com.win.framework.common.pojo.CommonResult; import static com.win.framework.common.pojo.CommonResult.success; - import com.win.framework.excel.core.util.ExcelUtils; - import com.win.framework.operatelog.core.annotations.OperateLog; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.win.module.wms.controller.unplannedreceiptRequest.vo.*; import com.win.module.wms.dal.dataobject.unplannedreceiptRequest.UnplannedreceiptRequestMainDO; import com.win.module.wms.convert.unplannedreceiptRequest.UnplannedreceiptRequestMainConvert; import com.win.module.wms.service.unplannedreceiptRequest.UnplannedreceiptRequestMainService; @@ -91,6 +86,19 @@ public class UnplannedreceiptRequestMainController { PageResult pageResult = unplannedreceiptRequestMainService.getUnplannedreceiptRequestMainPage(pageVO); return success(UnplannedreceiptRequestMainConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:unplannedreceiptRequestMain:query')") + public CommonResult> getUnplannedreceiptRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = unplannedreceiptRequestMainService.getUnplannedreceiptRequestMainSenior(conditions); + PageResult result = UnplannedreceiptRequestMainConvert.INSTANCE.convertPage(pageResult); + for(UnplannedreceiptRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出计划外入库申请主 Excel") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/warehouse/WarehouseController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/warehouse/WarehouseController.java index fca3d490..07fbb235 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/warehouse/WarehouseController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/warehouse/WarehouseController.java @@ -2,16 +2,17 @@ package com.win.module.wms.controller.warehouse; 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; 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.itembasic.vo.ItembasicImportExcelVo; +import com.win.module.wms.controller.warehouse.vo.WarehouseImportExcelVo; +import com.win.module.wms.controller.warehouse.vo.WarehouseRespVO; import com.win.module.wms.controller.warehouse.vo.*; -import com.win.module.wms.controller.workshop.vo.WorkshopImportExcelVo; import com.win.module.wms.convert.warehouse.WarehouseConvert; import com.win.module.wms.dal.dataobject.warehouse.WarehouseDO; import com.win.module.wms.dal.mysql.warehouse.WarehouseMapper; @@ -25,7 +26,6 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; - import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @@ -33,7 +33,6 @@ import java.io.IOException; import java.time.LocalDateTime; import java.time.ZoneOffset; import java.util.*; - import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.framework.common.pojo.CommonResult.success; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @@ -115,7 +114,12 @@ public class WarehouseController { //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } - ExcelUtils.write(response, "仓库.xls", "数据", WarehouseExcelVO.class, datas); + Map mapDropDown = new HashMap<>(); + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(4, available); + String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.WAREHOUSE_TYPE); + mapDropDown.put(3, type); + ExcelUtils.write(response, "仓库.xls", "数据", WarehouseExcelVO.class, datas,mapDropDown); } @GetMapping("/get-import-template") @Operation(summary = "获得导入仓库信息模板") @@ -158,6 +162,19 @@ public class WarehouseController { } return success(returnMap); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:warehouse:query')") + public CommonResult> getWarehouseSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = warehouseService.getWarehouseSenior(conditions); + PageResult result = WarehouseConvert.INSTANCE.convertPage(pageResult); + for(WarehouseRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/demo") public WarehouseDO LabelExist(String code) { QueryWrapper queryWrapper = new QueryWrapper(); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/WorkDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/WorkDetailController.java index 61cd6199..9a9d0fb9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/WorkDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/WorkDetailController.java @@ -1,8 +1,12 @@ package com.win.module.wms.controller.work; +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.work.vo.*; + + import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -25,7 +29,7 @@ import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; -import com.win.module.wms.controller.work.vo.*; + import com.win.module.wms.dal.dataobject.work.WorkDetailDO; import com.win.module.wms.convert.work.WorkDetailConvert; import com.win.module.wms.service.work.WorkDetailService; @@ -91,6 +95,19 @@ public class WorkDetailController { PageResult pageResult = workDetailService.getWorkDetailPage(pageVO); return success(WorkDetailConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得生产订单子分页") + @PreAuthorize("@ss.hasPermission('wms:workdetail:query')") + public CommonResult> getWorkdetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = workDetailService.getWorkDetailSenior(conditions); + PageResult result = WorkDetailConvert.INSTANCE.convertPage(pageResult); + for(WorkDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出生产订单子 Excel") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/WorkMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/WorkMainController.java index 81f3232d..406bdf35 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/WorkMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/WorkMainController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.work; +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.work.vo.*; @@ -10,22 +11,16 @@ import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; - import javax.validation.*; import javax.servlet.http.*; import java.util.*; import java.io.IOException; - import com.win.framework.common.pojo.PageResult; import com.win.framework.common.pojo.CommonResult; import static com.win.framework.common.pojo.CommonResult.success; - import com.win.framework.excel.core.util.ExcelUtils; - import com.win.framework.operatelog.core.annotations.OperateLog; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*; - -import com.win.module.wms.controller.work.vo.*; import com.win.module.wms.dal.dataobject.work.WorkMainDO; import com.win.module.wms.convert.work.WorkMainConvert; import com.win.module.wms.service.work.WorkMainService; @@ -91,7 +86,19 @@ public class WorkMainController { PageResult pageResult = workMainService.getWorkMainPage(pageVO); return success(WorkMainConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得物品基本信息分页") + @PreAuthorize("@ss.hasPermission('wms:workMain:query')") + public CommonResult> getWorkMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = workMainService.getWorkMainSenior(conditions); + PageResult result = WorkMainConvert.INSTANCE.convertPage(pageResult); + for(WorkMainRespVO 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:work-main:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workshop/WorkshopController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workshop/WorkshopController.java index 5e8e3c82..529b3e66 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workshop/WorkshopController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workshop/WorkshopController.java @@ -1,14 +1,18 @@ package com.win.module.wms.controller.workshop; import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.workshop.vo.WorkshopRespVO; import com.win.module.wms.controller.workshop.vo.*; import com.win.module.wms.convert.workshop.WorkshopConvert; +import com.win.module.wms.convert.workshop.WorkshopConvert; +import com.win.module.wms.dal.dataobject.workshop.WorkshopDO; import com.win.module.wms.dal.dataobject.workshop.WorkshopDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.workshop.WorkshopService; @@ -108,9 +112,27 @@ public class WorkshopController { //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } - ExcelUtils.write(response, "车间.xls", "数据", WorkshopExcelVO.class, datas); + Map mapDropDown = new HashMap<>(); + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(4, available); + String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.WORKSHOP_TYPE); + mapDropDown.put(3, type); + ExcelUtils.write(response, "车间.xls", "数据", WorkshopExcelVO.class, datas,mapDropDown); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得车间信息分页") + @PreAuthorize("@ss.hasPermission('wms:workshop:query')") + public CommonResult> getWorkshopSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = workshopService.getWorkshopSenior(conditions); + PageResult result = WorkshopConvert.INSTANCE.convertPage(pageResult); + for(WorkshopRespVO 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/workstation/WorkstationController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workstation/WorkstationController.java index c759d444..4da0de9e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workstation/WorkstationController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workstation/WorkstationController.java @@ -1,14 +1,18 @@ package com.win.module.wms.controller.workstation; import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.workstation.vo.WorkstationRespVO; import com.win.module.wms.controller.workstation.vo.*; import com.win.module.wms.convert.workstation.WorkstationConvert; +import com.win.module.wms.convert.workstation.WorkstationConvert; +import com.win.module.wms.dal.dataobject.workstation.WorkstationDO; import com.win.module.wms.dal.dataobject.workstation.WorkstationDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.workstation.WorkstationService; @@ -93,6 +97,20 @@ public class WorkstationController { PageResult pageResult = workstationService.getWorkstationPage(pageVO); return success(WorkstationConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得工位信息分页") + @PreAuthorize("@ss.hasPermission('wms:workstation:query')") + public CommonResult> getWorkstationSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = workstationService.getWorkstationSenior(conditions); + PageResult result = WorkstationConvert.INSTANCE.convertPage(pageResult); + for(WorkstationRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + @GetMapping("/export-excel") @Operation(summary = "导出工位 Excel") @@ -108,7 +126,12 @@ public class WorkstationController { //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } - ExcelUtils.write(response, "工位.xls", "数据", WorkstationExcelVO.class, datas); + Map mapDropDown = new HashMap<>(); + String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.WORK_STATION_TYPE); + mapDropDown.put(3, type); + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); + mapDropDown.put(10, available); + ExcelUtils.write(response, "工位.xls", "数据", WorkstationExcelVO.class, datas,mapDropDown); } @GetMapping("/get-import-template") @@ -116,13 +139,14 @@ public class WorkstationController { public void importTemplate(HttpServletResponse response) throws IOException { // 手动创建导出 demo List list = Arrays.asList(); + Map mapDropDown = new HashMap<>(); String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.WORK_STATION_TYPE); mapDropDown.put(3, type); String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); mapDropDown.put(10, available); // 输出 - ExcelUtils.write(response, "用户导入模板.xls", "用户列表", WorkstationImportExcelVo.class, list); + ExcelUtils.write(response, "用户导入模板.xls", "用户列表", WorkstationImportExcelVo.class, list,mapDropDown); } @PostMapping("/import") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapJob/ProductscrapJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapJob/ProductscrapJobDetailMapper.java index 01c63453..c2ffafd6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapJob/ProductscrapJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapJob/ProductscrapJobDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.productscrapJob; 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.productscrapJob.vo.ProductscrapJobDetailExportReqVO; import com.win.module.wms.controller.productscrapJob.vo.ProductscrapJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.productscrapJob.ProductscrapJobDetailDO; @@ -40,7 +42,9 @@ public interface ProductscrapJobDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ProductscrapJobDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductscrapJobDetailDO::getOwnerCode, reqVO.getOwnerCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapJob/ProductscrapJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapJob/ProductscrapJobMainMapper.java index 940b73d0..8d9d2c2c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapJob/ProductscrapJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapJob/ProductscrapJobMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.productscrapJob; 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.productscrapJob.vo.ProductscrapJobMainExportReqVO; import com.win.module.wms.controller.productscrapJob.vo.ProductscrapJobMainPageReqVO; import com.win.module.wms.dal.dataobject.productscrapJob.ProductscrapJobMainDO; @@ -56,7 +58,9 @@ public interface ProductscrapJobMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ProductscrapJobMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductscrapJobMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapRecord/ProductscrapRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapRecord/ProductscrapRecordDetailMapper.java index 7601ccff..4be7aba7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapRecord/ProductscrapRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapRecord/ProductscrapRecordDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.productscrapRecord; 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.productscrapRecord.vo.ProductscrapRecordDetailExportReqVO; import com.win.module.wms.controller.productscrapRecord.vo.ProductscrapRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.productscrapRecord.ProductscrapRecordDetailDO; @@ -47,7 +49,9 @@ public interface ProductscrapRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ProductscrapRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductscrapRecordDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapRecord/ProductscrapRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapRecord/ProductscrapRecordMainMapper.java index bfe43f59..eeac6578 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapRecord/ProductscrapRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapRecord/ProductscrapRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.productscrapRecord; 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.productscrapRecord.vo.ProductscrapRecordMainExportReqVO; import com.win.module.wms.controller.productscrapRecord.vo.ProductscrapRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.productscrapRecord.ProductscrapRecordMainDO; @@ -43,7 +45,9 @@ public interface ProductscrapRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ProductscrapRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductscrapRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapRequest/ProductscrapRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapRequest/ProductscrapRequestDetailMapper.java index b6abb650..b632f0c1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapRequest/ProductscrapRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapRequest/ProductscrapRequestDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.productscrapRequest; 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.productscrapRequest.vo.ProductscrapRequestDetailExportReqVO; import com.win.module.wms.controller.productscrapRequest.vo.ProductscrapRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.productscrapRequest.ProductscrapRequestDetailDO; @@ -42,7 +44,9 @@ public interface ProductscrapRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ProductscrapRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductscrapRequestDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapRequest/ProductscrapRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapRequest/ProductscrapRequestMainMapper.java index fffe5dc9..ce97dd03 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapRequest/ProductscrapRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productscrapRequest/ProductscrapRequestMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.productscrapRequest; 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.productscrapRequest.vo.ProductscrapRequestMainExportReqVO; import com.win.module.wms.controller.productscrapRequest.vo.ProductscrapRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.productscrapRequest.ProductscrapRequestMainDO; @@ -41,6 +43,10 @@ public interface ProductscrapRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductscrapRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductscrapRequestMainDO::getFromWarehouseCode, reqVO.getFromWarehouseCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/project/ProjectMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/project/ProjectMapper.java index e701c460..49478d77 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/project/ProjectMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/project/ProjectMapper.java @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.project; +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.project.vo.ProjectExportReqVO; import com.win.module.wms.controller.project.vo.ProjectPageReqVO; import com.win.module.wms.dal.dataobject.project.ProjectDO; @@ -32,7 +34,9 @@ public interface ProjectMapper extends BaseMapperX { .eqIfPresent(ProjectDO::getCreator, reqVO.getCreator()) .orderByDesc(ProjectDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ProjectExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProjectDO::getCode, reqVO.getCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchase/PurchaseDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchase/PurchaseDetailMapper.java index 4b43a304..2f2e941a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchase/PurchaseDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchase/PurchaseDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.purchase; 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.purchase.vo.PurchaseDetailExportReqVO; import com.win.module.wms.controller.purchase.vo.PurchaseDetailPageReqVO; import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO; @@ -49,7 +51,9 @@ public interface PurchaseDetailMapper extends BaseMapperX { .eqIfPresent(PurchaseDetailDO::getAvailable, reqVO.getAvailable()) .orderByDesc(PurchaseDetailDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PurchaseDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PurchaseDetailDO::getLineNumber, reqVO.getLineNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchase/PurchaseMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchase/PurchaseMainMapper.java index e3e999ab..9a656835 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchase/PurchaseMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchase/PurchaseMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.purchase; 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.purchase.vo.PurchaseMainExportReqVO; import com.win.module.wms.controller.purchase.vo.PurchaseMainPageReqVO; import com.win.module.wms.dal.dataobject.purchase.PurchaseMainDO; @@ -42,7 +44,9 @@ public interface PurchaseMainMapper extends BaseMapperX { .eqIfPresent(PurchaseMainDO::getAvailable, reqVO.getAvailable()) .orderByDesc(PurchaseMainDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PurchaseMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PurchaseMainDO::getSupplierCode, reqVO.getSupplierCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasePlan/PurchasePlanDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasePlan/PurchasePlanDetailMapper.java index f5abb3f9..9fe8c01a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasePlan/PurchasePlanDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasePlan/PurchasePlanDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.purchasePlan; 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.purchasePlan.vo.PurchasePlanDetailExportReqVO; import com.win.module.wms.controller.purchasePlan.vo.PurchasePlanDetailPageReqVO; import com.win.module.wms.dal.dataobject.purchasePlan.PurchasePlanDetailDO; @@ -35,7 +37,9 @@ public interface PurchasePlanDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PurchasePlanDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PurchasePlanDetailDO::getPoNumber, reqVO.getPoNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasePlan/PurchasePlanMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasePlan/PurchasePlanMainMapper.java index a636de60..6abd5515 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasePlan/PurchasePlanMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasePlan/PurchasePlanMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.purchasePlan; 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.purchasePlan.vo.PurchasePlanMainExportReqVO; import com.win.module.wms.controller.purchasePlan.vo.PurchasePlanMainPageReqVO; import com.win.module.wms.dal.dataobject.purchasePlan.PurchasePlanMainDO; @@ -37,7 +39,9 @@ public interface PurchasePlanMainMapper extends BaseMapperX .eqIfPresent(PurchasePlanMainDO::getAvailable, reqVO.getAvailable()) .orderByDesc(PurchasePlanMainDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PurchasePlanMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PurchasePlanMainDO::getSupplierCode, reqVO.getSupplierCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchaseclaimRecord/PurchaseclaimRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchaseclaimRecord/PurchaseclaimRecordDetailMapper.java index ad64a260..bc898698 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchaseclaimRecord/PurchaseclaimRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchaseclaimRecord/PurchaseclaimRecordDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.purchaseclaimRecord; 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.purchaseclaimRecord.vo.PurchaseclaimRecordDetailExportReqVO; import com.win.module.wms.controller.purchaseclaimRecord.vo.PurchaseclaimRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.purchaseclaimRecord.PurchaseclaimRecordDetailDO; @@ -43,7 +45,9 @@ public interface PurchaseclaimRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PurchaseclaimRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PurchaseclaimRecordDetailDO::getBatch, reqVO.getBatch()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchaseclaimRecord/PurchaseclaimRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchaseclaimRecord/PurchaseclaimRecordMainMapper.java index 7bf7c723..ef35bb7a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchaseclaimRecord/PurchaseclaimRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchaseclaimRecord/PurchaseclaimRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.purchaseclaimRecord; 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.purchaseclaimRecord.vo.PurchaseclaimRecordMainExportReqVO; import com.win.module.wms.controller.purchaseclaimRecord.vo.PurchaseclaimRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.purchaseclaimRecord.PurchaseclaimRecordMainDO; @@ -41,7 +43,9 @@ public interface PurchaseclaimRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PurchaseclaimRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PurchaseclaimRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchaseprice/PurchasepriceMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchaseprice/PurchasepriceMapper.java index 5d7d6fbc..d93fdfe2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchaseprice/PurchasepriceMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchaseprice/PurchasepriceMapper.java @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.purchaseprice; +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.purchaseprice.vo.PurchasepriceExportReqVO; import com.win.module.wms.controller.purchaseprice.vo.PurchasepricePageReqVO; import com.win.module.wms.dal.dataobject.purchaseprice.PurchasepriceDO; @@ -32,7 +34,9 @@ public interface PurchasepriceMapper extends BaseMapperX { .eqIfPresent(PurchasepriceDO::getCreator, reqVO.getCreator()) .orderByDesc(PurchasepriceDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PurchasepriceExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PurchasepriceDO::getSupplierCode, reqVO.getSupplierCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptJob/PurchasereceiptJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptJob/PurchasereceiptJobDetailMapper.java index 7828b5be..86bec0eb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptJob/PurchasereceiptJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptJob/PurchasereceiptJobDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.purchasereceiptJob; 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.dal.dataobject.purchasereceiptJob.PurchasereceiptJobDetailDO; import org.apache.ibatis.annotations.Mapper; import com.win.module.wms.controller.purchasereceiptJob.vo.*; @@ -51,7 +53,9 @@ public interface PurchasereceiptJobDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PurchasereceiptJobDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PurchasereceiptJobDetailDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptJob/PurchasereceiptJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptJob/PurchasereceiptJobMainMapper.java index 9a18319e..4655ec7f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptJob/PurchasereceiptJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptJob/PurchasereceiptJobMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.purchasereceiptJob; 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.dal.dataobject.purchasereceiptJob.PurchasereceiptJobMainDO; import org.apache.ibatis.annotations.Mapper; import com.win.module.wms.controller.purchasereceiptJob.vo.*; @@ -65,7 +67,9 @@ public interface PurchasereceiptJobMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PurchasereceiptJobMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PurchasereceiptJobMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRecord/PurchasereceiptRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRecord/PurchasereceiptRecordDetailMapper.java index 125f697c..f188bd31 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRecord/PurchasereceiptRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRecord/PurchasereceiptRecordDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.purchasereceiptRecord; 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.purchasereceiptRecord.vo.PurchasereceiptRecordDetailExportReqVO; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordDetailDO; @@ -67,7 +69,9 @@ public interface PurchasereceiptRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PurchasereceiptRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PurchasereceiptRecordDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRecord/PurchasereceiptRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRecord/PurchasereceiptRecordMainMapper.java index cccd9ecf..513786c9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRecord/PurchasereceiptRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRecord/PurchasereceiptRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.purchasereceiptRecord; 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.purchasereceiptRecord.vo.PurchasereceiptRecordMainExportReqVO; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordMainDO; @@ -52,7 +54,9 @@ public interface PurchasereceiptRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PurchasereceiptRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PurchasereceiptRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRequest/PurchasereceiptRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRequest/PurchasereceiptRequestDetailMapper.java index 34c37440..915cb103 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRequest/PurchasereceiptRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRequest/PurchasereceiptRequestDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.purchasereceiptRequest; 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.purchasereceiptRequest.vo.PurchasereceiptRequestDetailExportReqVO; import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestDetailDO; @@ -53,7 +55,9 @@ public interface PurchasereceiptRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PurchasereceiptRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PurchasereceiptRequestDetailDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRequest/PurchasereceiptRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRequest/PurchasereceiptRequestMainMapper.java index aa91218f..8391f231 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRequest/PurchasereceiptRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptRequest/PurchasereceiptRequestMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.purchasereceiptRequest; 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.purchasereceiptRequest.vo.PurchasereceiptRequestMainExportReqVO; import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestMainDO; @@ -50,7 +52,9 @@ public interface PurchasereceiptRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PurchasereceiptRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PurchasereceiptRequestMainDO::getAsnNumber, reqVO.getAsnNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnJob/PurchasereturnJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnJob/PurchasereturnJobDetailMapper.java index 95fb5f05..09a7847d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnJob/PurchasereturnJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnJob/PurchasereturnJobDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.purchasereturnJob; 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.purchasereturnJob.vo.PurchasereturnJobDetailExportReqVO; import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.purchasereturnJob.PurchasereturnJobDetailDO; @@ -46,6 +48,10 @@ public interface PurchasereturnJobDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(PurchasereturnJobDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PurchasereturnJobDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnJob/PurchasereturnJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnJob/PurchasereturnJobMainMapper.java index 527db7e4..6e0d78d8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnJob/PurchasereturnJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnJob/PurchasereturnJobMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.purchasereturnJob; 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.purchasereturnJob.vo.PurchasereturnJobMainExportReqVO; import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainPageReqVO; import com.win.module.wms.dal.dataobject.purchasereturnJob.PurchasereturnJobMainDO; @@ -67,7 +69,9 @@ public interface PurchasereturnJobMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PurchasereturnJobMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PurchasereturnJobMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnRecord/PurchasereturnRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnRecord/PurchasereturnRecordDetailMapper.java index c2fe4a48..b21cecb5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnRecord/PurchasereturnRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnRecord/PurchasereturnRecordDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.purchasereturnRecord; 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.purchasereturnRecord.vo.PurchasereturnRecordDetailExportReqVO; import com.win.module.wms.controller.purchasereturnRecord.vo.PurchasereturnRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.purchasereturnRecord.PurchasereturnRecordDetailDO; @@ -57,7 +59,9 @@ public interface PurchasereturnRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PurchasereturnRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PurchasereturnRecordDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnRecord/PurchasereturnRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnRecord/PurchasereturnRecordMainMapper.java index f3dfddf5..2b7aa207 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnRecord/PurchasereturnRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnRecord/PurchasereturnRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.purchasereturnRecord; 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.purchasereturnRecord.vo.PurchasereturnRecordMainExportReqVO; import com.win.module.wms.controller.purchasereturnRecord.vo.PurchasereturnRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.purchasereturnRecord.PurchasereturnRecordMainDO; @@ -53,7 +55,9 @@ public interface PurchasereturnRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PurchasereturnRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PurchasereturnRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnRequest/PurchasereturnRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnRequest/PurchasereturnRequestDetailMapper.java index 77957a43..911f5552 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnRequest/PurchasereturnRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnRequest/PurchasereturnRequestDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.purchasereturnRequest; 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.purchasereturnRequest.vo.PurchasereturnRequestDetailExportReqVO; import com.win.module.wms.controller.purchasereturnRequest.vo.PurchasereturnRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.purchasereturnRequest.PurchasereturnRequestDetailDO; @@ -46,7 +48,9 @@ public interface PurchasereturnRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PurchasereturnRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PurchasereturnRequestDetailDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnRequest/PurchasereturnRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnRequest/PurchasereturnRequestMainMapper.java index 98562620..d33ce366 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnRequest/PurchasereturnRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnRequest/PurchasereturnRequestMainMapper.java @@ -2,11 +2,14 @@ package com.win.module.wms.dal.mysql.purchasereturnRequest; 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.purchasereturnRequest.vo.PurchasereturnRequestMainExportReqVO; import com.win.module.wms.controller.purchasereturnRequest.vo.PurchasereturnRequestMainPageReqVO; + import com.win.module.wms.dal.dataobject.purchasereturnRequest.PurchasereturnRequestMainDO; import org.apache.ibatis.annotations.Mapper; @@ -51,7 +54,9 @@ public interface PurchasereturnRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PurchasereturnRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PurchasereturnRequestMainDO::getPurchaseReceiptRecordNumber, reqVO.getPurchaseReceiptRecordNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayJob/PutawayJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayJob/PutawayJobDetailMapper.java index e4ff424b..6d090f70 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayJob/PutawayJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayJob/PutawayJobDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.putawayJob; 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.putawayJob.vo.PutawayJobDetailExportReqVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.putawayJob.PutawayJobDetailDO; @@ -43,7 +45,9 @@ public interface PutawayJobDetailMapper extends BaseMapperX .eqIfPresent(PutawayJobDetailDO::getToOwnerCode, reqVO.getToOwnerCode()) .orderByDesc(PutawayJobDetailDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PutawayJobDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PutawayJobDetailDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayJob/PutawayJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayJob/PutawayJobMainMapper.java index 77c2b315..391ecd49 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayJob/PutawayJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayJob/PutawayJobMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.putawayJob; 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.putawayJob.vo.PutawayJobMainExportReqVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainPageReqVO; import com.win.module.wms.dal.dataobject.putawayJob.PutawayJobMainDO; @@ -60,7 +62,9 @@ public interface PutawayJobMainMapper extends BaseMapperX { .eqIfPresent(PutawayJobMainDO::getAllowModifyPackingNumber, reqVO.getAllowModifyPackingNumber()) .orderByDesc(PutawayJobMainDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PutawayJobMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PutawayJobMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRecord/PutawayRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRecord/PutawayRecordDetailMapper.java index 58447b42..765dea1d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRecord/PutawayRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRecord/PutawayRecordDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.putawayRecord; 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.putawayRecord.vo.PutawayRecordDetailExportReqVO; import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.putawayRecord.PutawayRecordDetailDO; @@ -53,7 +55,9 @@ public interface PutawayRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PutawayRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PutawayRecordDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRecord/PutawayRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRecord/PutawayRecordMainMapper.java index dc0b78bd..9a49604d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRecord/PutawayRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRecord/PutawayRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.putawayRecord; 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.putawayRecord.vo.PutawayRecordMainExportReqVO; import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.putawayRecord.PutawayRecordMainDO; @@ -47,6 +49,9 @@ public interface PutawayRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PutawayRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PutawayRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRequest/PutawayRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRequest/PutawayRequestDetailMapper.java index ba932087..d99e9a7d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRequest/PutawayRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRequest/PutawayRequestDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.putawayRequest; 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.putawayRequest.vo.PutawayRequestDetailExportReqVO; import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.putawayRequest.PutawayRequestDetailDO; @@ -44,7 +46,9 @@ public interface PutawayRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PutawayRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PutawayRequestDetailDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRequest/PutawayRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRequest/PutawayRequestMainMapper.java index 213b0d51..38c9ff7b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRequest/PutawayRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayRequest/PutawayRequestMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.putawayRequest; 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.putawayRequest.vo.PutawayRequestMainExportReqVO; import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.putawayRequest.PutawayRequestMainDO; @@ -52,7 +54,9 @@ public interface PutawayRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PutawayRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PutawayRequestMainDO::getSupplierCode, reqVO.getSupplierCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/recordsetting/RecordsettingMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/recordsetting/RecordsettingMapper.java index 4015519c..a05ef798 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/recordsetting/RecordsettingMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/recordsetting/RecordsettingMapper.java @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.recordsetting; +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.recordsetting.vo.RecordsettingExportReqVO; import com.win.module.wms.controller.recordsetting.vo.RecordsettingPageReqVO; import com.win.module.wms.dal.dataobject.recordsetting.RecordsettingDO; @@ -31,7 +33,9 @@ public interface RecordsettingMapper extends BaseMapperX { .eqIfPresent(RecordsettingDO::getIsSoftDeleted, reqVO.getIsSoftDeleted()) .orderByDesc(RecordsettingDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(RecordsettingExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(RecordsettingDO::getCode, reqVO.getCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshJob/RepleinshJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshJob/RepleinshJobDetailMapper.java index c97d8b3e..689e851c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshJob/RepleinshJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshJob/RepleinshJobDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.repleinshJob; 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.repleinshJob.vo.RepleinshJobDetailExportReqVO; import com.win.module.wms.controller.repleinshJob.vo.RepleinshJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.repleinshJob.RepleinshJobDetailDO; @@ -41,7 +43,9 @@ public interface RepleinshJobDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(RepleinshJobDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(RepleinshJobDetailDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshJob/RepleinshJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshJob/RepleinshJobMainMapper.java index 692ac427..2fad9e48 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshJob/RepleinshJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshJob/RepleinshJobMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.repleinshJob; 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.repleinshJob.vo.RepleinshJobMainExportReqVO; import com.win.module.wms.controller.repleinshJob.vo.RepleinshJobMainPageReqVO; import com.win.module.wms.dal.dataobject.repleinshJob.RepleinshJobMainDO; @@ -58,6 +60,9 @@ public interface RepleinshJobMainMapper extends BaseMapperX .eqIfPresent(RepleinshJobMainDO::getAllowModifyPackingNumber, reqVO.getAllowModifyPackingNumber()) .orderByDesc(RepleinshJobMainDO::getId)); } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(RepleinshJobMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshRecord/RepleinshRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshRecord/RepleinshRecordDetailMapper.java index 1124e045..e99eb946 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshRecord/RepleinshRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshRecord/RepleinshRecordDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.repleinshRecord; 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.repleinshRecord.vo.RepleinshRecordDetailExportReqVO; import com.win.module.wms.controller.repleinshRecord.vo.RepleinshRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.repleinshRecord.RepleinshRecordDetailDO; @@ -51,7 +53,9 @@ public interface RepleinshRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(RepleinshRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(RepleinshRecordDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshRecord/RepleinshRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshRecord/RepleinshRecordMainMapper.java index 484cd38d..1ccfcc06 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshRecord/RepleinshRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshRecord/RepleinshRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.repleinshRecord; 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.repleinshRecord.vo.RepleinshRecordMainExportReqVO; import com.win.module.wms.controller.repleinshRecord.vo.RepleinshRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.repleinshRecord.RepleinshRecordMainDO; @@ -45,7 +47,9 @@ public interface RepleinshRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(RepleinshRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(RepleinshRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshRequest/RepleinshRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshRequest/RepleinshRequestDetailMapper.java index 7d05666c..61457b17 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshRequest/RepleinshRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshRequest/RepleinshRequestDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.repleinshRequest; 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.repleinshRequest.vo.RepleinshRequestDetailExportReqVO; import com.win.module.wms.controller.repleinshRequest.vo.RepleinshRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.repleinshRequest.RepleinshRequestDetailDO; @@ -39,7 +41,9 @@ public interface RepleinshRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(RepleinshRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(RepleinshRequestDetailDO::getInventoryStatus, reqVO.getInventoryStatus()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/requestsetting/RequestsettingMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/requestsetting/RequestsettingMapper.java index 34ecb9c6..afb5916c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/requestsetting/RequestsettingMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/requestsetting/RequestsettingMapper.java @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.requestsetting; +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.requestsetting.vo.RequestsettingExportReqVO; import com.win.module.wms.controller.requestsetting.vo.RequestsettingPageReqVO; import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO; @@ -35,7 +37,9 @@ public interface RequestsettingMapper extends BaseMapperX { .eqIfPresent(RequestsettingDO::getIsSoftDeleted, reqVO.getIsSoftDeleted()) .orderByDesc(RequestsettingDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(RequestsettingExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(RequestsettingDO::getCode, reqVO.getCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/rule/RuleMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/rule/RuleMapper.java index c54de1b9..f4e04e72 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/rule/RuleMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/rule/RuleMapper.java @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.rule; +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.rule.vo.RulePageReqVO; import com.win.module.wms.dal.dataobject.rule.RuleDO; import org.apache.ibatis.annotations.Mapper; @@ -25,5 +27,7 @@ public interface RuleMapper extends BaseMapperX { .eqIfPresent(RuleDO::getConfiguration, reqVO.getConfiguration()) .orderByDesc(RuleDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/sale/SaleDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/sale/SaleDetailMapper.java index 62fb261e..a5d93bc2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/sale/SaleDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/sale/SaleDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.sale; 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.sale.vo.SaleDetailExportReqVO; import com.win.module.wms.controller.sale.vo.SaleDetailPageReqVO; import com.win.module.wms.dal.dataobject.sale.SaleDetailDO; @@ -44,6 +46,9 @@ public interface SaleDetailMapper extends BaseMapperX { .eqIfPresent(SaleDetailDO::getAvailable, reqVO.getAvailable()) .orderByDesc(SaleDetailDO::getId)); } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(SaleDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/sale/SaleMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/sale/SaleMainMapper.java index 7fec83dd..430a3158 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/sale/SaleMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/sale/SaleMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.sale; 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.sale.vo.SaleMainExportReqVO; import com.win.module.wms.controller.sale.vo.SaleMainPageReqVO; import com.win.module.wms.dal.dataobject.sale.SaleMainDO; @@ -40,7 +42,9 @@ public interface SaleMainMapper extends BaseMapperX { .eqIfPresent(SaleMainDO::getAvailable, reqVO.getAvailable()) .orderByDesc(SaleMainDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(SaleMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(SaleMainDO::getCustomerCode, reqVO.getCustomerCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/saleprice/SalepriceMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/saleprice/SalepriceMapper.java index 91ee4123..23b4f383 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/saleprice/SalepriceMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/saleprice/SalepriceMapper.java @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.saleprice; +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.saleprice.vo.SalepriceExportReqVO; import com.win.module.wms.controller.saleprice.vo.SalepricePageReqVO; import com.win.module.wms.dal.dataobject.saleprice.SalepriceDO; @@ -36,7 +38,9 @@ public interface SalepriceMapper extends BaseMapperX { .eqIfPresent(SalepriceDO::getCreator, reqVO.getCreator()) .orderByDesc(SalepriceDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(SalepriceExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(SalepriceDO::getCustomerCode, reqVO.getCustomerCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapJob/ScrapJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapJob/ScrapJobDetailMapper.java index 66000b50..45131cc8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapJob/ScrapJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapJob/ScrapJobDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.scrapJob; 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.scrapJob.vo.ScrapJobDetailExportReqVO; import com.win.module.wms.controller.scrapJob.vo.ScrapJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.scrapJob.ScrapJobDetailDO; @@ -40,7 +42,9 @@ public interface ScrapJobDetailMapper extends BaseMapperX { .eqIfPresent(ScrapJobDetailDO::getCreator, reqVO.getCreator()) .orderByDesc(ScrapJobDetailDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ScrapJobDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ScrapJobDetailDO::getOwnerCode, reqVO.getOwnerCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapJob/ScrapJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapJob/ScrapJobMainMapper.java index 3552abbe..4b4ee9e1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapJob/ScrapJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapJob/ScrapJobMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.scrapJob; 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.scrapJob.vo.ScrapJobMainExportReqVO; import com.win.module.wms.controller.scrapJob.vo.ScrapJobMainPageReqVO; import com.win.module.wms.dal.dataobject.scrapJob.ScrapJobMainDO; @@ -56,6 +58,9 @@ public interface ScrapJobMainMapper extends BaseMapperX { .eqIfPresent(ScrapJobMainDO::getAllowModifyPackingNumber, reqVO.getAllowModifyPackingNumber()) .orderByDesc(ScrapJobMainDO::getId)); } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ScrapJobMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapRecord/ScrapRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapRecord/ScrapRecordDetailMapper.java index 222fad7f..c47d03ca 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapRecord/ScrapRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapRecord/ScrapRecordDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.scrapRecord; 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.scrapRecord.vo.ScrapRecordDetailExportReqVO; import com.win.module.wms.controller.scrapRecord.vo.ScrapRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.scrapRecord.ScrapRecordDetailDO; @@ -47,7 +49,9 @@ public interface ScrapRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ScrapRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ScrapRecordDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapRecord/ScrapRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapRecord/ScrapRecordMainMapper.java index 75ac9f7f..5270fac2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapRecord/ScrapRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapRecord/ScrapRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.scrapRecord; 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.scrapRecord.vo.ScrapRecordMainExportReqVO; import com.win.module.wms.controller.scrapRecord.vo.ScrapRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.scrapRecord.ScrapRecordMainDO; @@ -42,7 +44,9 @@ public interface ScrapRecordMainMapper extends BaseMapperX { .eqIfPresent(ScrapRecordMainDO::getAvailable, reqVO.getAvailable()) .orderByDesc(ScrapRecordMainDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ScrapRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ScrapRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapRequest/ScrapRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapRequest/ScrapRequestDetailMapper.java index 42116859..51af448e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapRequest/ScrapRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapRequest/ScrapRequestDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.scrapRequest; 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.scrapRequest.vo.ScrapRequestDetailExportReqVO; import com.win.module.wms.controller.scrapRequest.vo.ScrapRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.scrapRequest.ScrapRequestDetailDO; @@ -42,7 +44,9 @@ public interface ScrapRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ScrapRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ScrapRequestDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapRequest/ScrapRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapRequest/ScrapRequestMainMapper.java index 87dece6c..a898082d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapRequest/ScrapRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/scrapRequest/ScrapRequestMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.scrapRequest; 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.scrapRequest.vo.ScrapRequestMainExportReqVO; import com.win.module.wms.controller.scrapRequest.vo.ScrapRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.scrapRequest.ScrapRequestMainDO; @@ -40,7 +42,9 @@ public interface ScrapRequestMainMapper extends BaseMapperX .eqIfPresent(ScrapRequestMainDO::getDirectCreateRecord, reqVO.getDirectCreateRecord()) .orderByDesc(ScrapRequestMainDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ScrapRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ScrapRequestMainDO::getFromWarehouseCode, reqVO.getFromWarehouseCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/shift/ShiftMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/shift/ShiftMapper.java index 0d4f45e1..89f85f3c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/shift/ShiftMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/shift/ShiftMapper.java @@ -2,13 +2,14 @@ package com.win.module.wms.dal.mysql.shift; 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.shift.vo.ShiftExportReqVO; import com.win.module.wms.controller.shift.vo.ShiftPageReqVO; import com.win.module.wms.dal.dataobject.shift.ShiftDO; -import com.win.module.wms.dal.dataobject.supplier.SupplierDO; import org.apache.ibatis.annotations.Mapper; /** @@ -38,7 +39,9 @@ public interface ShiftMapper extends BaseMapperX { .eqIfPresent(ShiftDO::getAvailable, reqVO.getAvailable()) .orderByDesc(ShiftDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ShiftExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ShiftDO::getCode, reqVO.getCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/stdcostprice/StdcostpriceMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/stdcostprice/StdcostpriceMapper.java index d939dd3b..1adc9721 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/stdcostprice/StdcostpriceMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/stdcostprice/StdcostpriceMapper.java @@ -2,13 +2,14 @@ package com.win.module.wms.dal.mysql.stdcostprice; 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.stdcostprice.vo.StdcostpriceExportReqVO; import com.win.module.wms.controller.stdcostprice.vo.StdcostpricePageReqVO; import com.win.module.wms.dal.dataobject.stdcostprice.StdcostpriceDO; -import com.win.module.wms.dal.dataobject.supplier.SupplierDO; import org.apache.ibatis.annotations.Mapper; /** @@ -22,6 +23,10 @@ public interface StdcostpriceMapper extends BaseMapperX { default StdcostpriceDO selectByStdcostpriceCode(String suppliercode) { return selectOne( StdcostpriceDO::getSupplierCode,suppliercode); } + + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default PageResult selectPage(StdcostpricePageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(StdcostpriceDO::getSupplierCode, reqVO.getSupplierCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/strategy/StrategyMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/strategy/StrategyMapper.java index 202d7fca..b30bc169 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/strategy/StrategyMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/strategy/StrategyMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.strategy; 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.strategy.vo.StrategyExportReqVO; import com.win.module.wms.controller.strategy.vo.StrategyPageReqVO; import com.win.module.wms.dal.dataobject.strategy.StrategyDO; @@ -31,7 +33,9 @@ public interface StrategyMapper extends BaseMapperX { .eqIfPresent(StrategyDO::getIsActive, reqVO.getIsActive()) .orderByDesc(StrategyDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(StrategyExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(StrategyDO::getRemark, reqVO.getRemark()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplier/SupplierMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplier/SupplierMapper.java index 9a31c627..2b84aec5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplier/SupplierMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplier/SupplierMapper.java @@ -2,13 +2,14 @@ package com.win.module.wms.dal.mysql.supplier; 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.supplier.vo.SupplierExportReqVO; import com.win.module.wms.controller.supplier.vo.SupplierPageReqVO; import com.win.module.wms.dal.dataobject.supplier.SupplierDO; -import com.win.module.wms.dal.dataobject.team.TeamDO; import org.apache.ibatis.annotations.Mapper; /** @@ -46,7 +47,9 @@ public interface SupplierMapper extends BaseMapperX { .eqIfPresent(SupplierDO::getCreator, reqVO.getCreator()) .orderByDesc(SupplierDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(SupplierExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(SupplierDO::getCode, reqVO.getCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRecord/SupplierdeliverRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRecord/SupplierdeliverRecordDetailMapper.java index 900ab694..7fdaf2b3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRecord/SupplierdeliverRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRecord/SupplierdeliverRecordDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.supplierdeliverRecord; 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.supplierdeliverRecord.vo.SupplierdeliverRecordDetailExportReqVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO; @@ -59,7 +61,9 @@ public interface SupplierdeliverRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(SupplierdeliverRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(SupplierdeliverRecordDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRecord/SupplierdeliverRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRecord/SupplierdeliverRecordMainMapper.java index 3ce4c3c1..bad59f78 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRecord/SupplierdeliverRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRecord/SupplierdeliverRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.supplierdeliverRecord; 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.supplierdeliverRecord.vo.SupplierdeliverRecordMainExportReqVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordMainDO; @@ -52,7 +54,9 @@ public interface SupplierdeliverRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(SupplierdeliverRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(SupplierdeliverRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRequest/SupplierdeliverRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRequest/SupplierdeliverRequestDetailMapper.java index 27cd0765..189826b4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRequest/SupplierdeliverRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRequest/SupplierdeliverRequestDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.supplierdeliverRequest; 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.supplierdeliverRequest.vo.SupplierdeliverRequestDetailExportReqVO; import com.win.module.wms.controller.supplierdeliverRequest.vo.SupplierdeliverRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.supplierdeliverRequest.SupplierdeliverRequestDetailDO; @@ -51,7 +53,9 @@ public interface SupplierdeliverRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(SupplierdeliverRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(SupplierdeliverRequestDetailDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRequest/SupplierdeliverRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRequest/SupplierdeliverRequestMainMapper.java index f61dba44..07d3dc9c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRequest/SupplierdeliverRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierdeliverRequest/SupplierdeliverRequestMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.supplierdeliverRequest; 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.supplierdeliverRequest.vo.SupplierdeliverRequestMainExportReqVO; import com.win.module.wms.controller.supplierdeliverRequest.vo.SupplierdeliverRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.supplierdeliverRequest.SupplierdeliverRequestMainDO; @@ -51,7 +53,9 @@ public interface SupplierdeliverRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(SupplierdeliverRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(SupplierdeliverRequestMainDO::getPpNumber, reqVO.getPpNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierinvoiceRecord/SupplierinvoiceRecordDeatilMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierinvoiceRecord/SupplierinvoiceRecordDeatilMapper.java index 59dfd199..930cc27a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierinvoiceRecord/SupplierinvoiceRecordDeatilMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierinvoiceRecord/SupplierinvoiceRecordDeatilMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.supplierinvoiceRecord; 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.supplierinvoiceRecord.vo.SupplierinvoiceRecordDeatilExportReqVO; import com.win.module.wms.controller.supplierinvoiceRecord.vo.SupplierinvoiceRecordDeatilPageReqVO; import com.win.module.wms.dal.dataobject.supplierinvoiceRecord.SupplierinvoiceRecordDeatilDO; @@ -50,7 +52,9 @@ public interface SupplierinvoiceRecordDeatilMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(SupplierinvoiceRecordDeatilExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(SupplierinvoiceRecordDeatilDO::getRecordNumber, reqVO.getRecordNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierinvoiceRecord/SupplierinvoiceRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierinvoiceRecord/SupplierinvoiceRecordMainMapper.java index 03bde1b3..75c68338 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierinvoiceRecord/SupplierinvoiceRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierinvoiceRecord/SupplierinvoiceRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.supplierinvoiceRecord; 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.supplierinvoiceRecord.vo.SupplierinvoiceRecordMainExportReqVO; import com.win.module.wms.controller.supplierinvoiceRecord.vo.SupplierinvoiceRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.supplierinvoiceRecord.SupplierinvoiceRecordMainDO; @@ -40,7 +42,9 @@ public interface SupplierinvoiceRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(SupplierinvoiceRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(SupplierinvoiceRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierinvoiceRequest/SupplierinvoiceRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierinvoiceRequest/SupplierinvoiceRequestDetailMapper.java index e2146599..73755a35 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierinvoiceRequest/SupplierinvoiceRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierinvoiceRequest/SupplierinvoiceRequestDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.supplierinvoiceRequest; 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.supplierinvoiceRequest.vo.SupplierinvoiceRequestDetailExportReqVO; import com.win.module.wms.controller.supplierinvoiceRequest.vo.SupplierinvoiceRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.supplierinvoiceRequest.SupplierinvoiceRequestDetailDO; @@ -42,7 +44,9 @@ public interface SupplierinvoiceRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(SupplierinvoiceRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(SupplierinvoiceRequestDetailDO::getRecordNumber, reqVO.getRecordNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierinvoiceRequest/SupplierinvoiceRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierinvoiceRequest/SupplierinvoiceRequestMainMapper.java index 2f9b8716..ff686946 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierinvoiceRequest/SupplierinvoiceRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplierinvoiceRequest/SupplierinvoiceRequestMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.supplierinvoiceRequest; 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.supplierinvoiceRequest.vo.SupplierinvoiceRequestMainExportReqVO; import com.win.module.wms.controller.supplierinvoiceRequest.vo.SupplierinvoiceRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.supplierinvoiceRequest.SupplierinvoiceRequestMainDO; @@ -39,7 +41,9 @@ public interface SupplierinvoiceRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(SupplierinvoiceRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(SupplierinvoiceRequestMainDO::getSupplierCode, reqVO.getSupplierCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplieritem/SupplieritemMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplieritem/SupplieritemMapper.java index d023b283..ec7168d3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplieritem/SupplieritemMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplieritem/SupplieritemMapper.java @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.supplieritem; +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.supplieritem.vo.SupplieritemExportReqVO; import com.win.module.wms.controller.supplieritem.vo.SupplieritemPageReqVO; import com.win.module.wms.dal.dataobject.supplieritem.SupplieritemDO; @@ -21,6 +23,9 @@ public interface SupplieritemMapper extends BaseMapperX { default SupplieritemDO selectBySuppercode(String suppercode) {return selectOne(SupplieritemDO::getSupplierCode, suppercode); } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default PageResult selectPage(SupplieritemPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(SupplieritemDO::getSupplierCode, reqVO.getSupplierCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/systemcalendar/SystemcalendarMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/systemcalendar/SystemcalendarMapper.java index 42e858c5..4b450162 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/systemcalendar/SystemcalendarMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/systemcalendar/SystemcalendarMapper.java @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.systemcalendar; +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.systemcalendar.vo.SystemcalendarExportReqVO; import com.win.module.wms.controller.systemcalendar.vo.SystemcalendarPageReqVO; import com.win.module.wms.dal.dataobject.systemcalendar.SystemcalendarDO; @@ -31,7 +33,9 @@ public interface SystemcalendarMapper extends BaseMapperX { .eqIfPresent(SystemcalendarDO::getCreator, reqVO.getCreator()) .orderByDesc(SystemcalendarDO::getId)); } - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(SystemcalendarExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(SystemcalendarDO::getModule, reqVO.getModule()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/team/TeamMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/team/TeamMapper.java index e5831a21..785cec8d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/team/TeamMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/team/TeamMapper.java @@ -1,14 +1,13 @@ package com.win.module.wms.dal.mysql.team; - 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.team.vo.TeamExportReqVO; import com.win.module.wms.controller.team.vo.TeamPageReqVO; import com.win.module.wms.dal.dataobject.team.TeamDO; -import com.win.module.wms.dal.dataobject.warehouse.WarehouseDO; import org.apache.ibatis.annotations.Mapper; /** @@ -37,6 +36,12 @@ public interface TeamMapper extends BaseMapperX { .orderByDesc(TeamDO::getId)); } + + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + + default List selectList(TeamExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(TeamDO::getCode, reqVO.getCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transaction/TransactionMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transaction/TransactionMapper.java index 68d4827a..7a96c88c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transaction/TransactionMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transaction/TransactionMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.transaction; 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.transaction.vo.TransactionExportReqVO; import com.win.module.wms.controller.transaction.vo.TransactionPageReqVO; import com.win.module.wms.dal.dataobject.transaction.TransactionDO; @@ -48,6 +50,9 @@ public interface TransactionMapper extends BaseMapperX { .eqIfPresent(TransactionDO::getOwnerCode, reqVO.getOwnerCode()) .orderByDesc(TransactionDO::getId)); } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(TransactionExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transactiontype/TransactiontypeMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transactiontype/TransactiontypeMapper.java index 0b545b2a..1563a170 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transactiontype/TransactiontypeMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transactiontype/TransactiontypeMapper.java @@ -2,14 +2,14 @@ package com.win.module.wms.dal.mysql.transactiontype; 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.transactiontype.vo.TransactiontypeExportReqVO; import com.win.module.wms.controller.transactiontype.vo.TransactiontypePageReqVO; import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO; -import com.win.module.wms.dal.dataobject.warehouse.WarehouseDO; -import com.win.module.wms.dal.dataobject.workstation.WorkstationDO; import org.apache.ibatis.annotations.Mapper; /** @@ -41,6 +41,9 @@ public interface TransactiontypeMapper extends BaseMapperX { .eqIfPresent(TransactiontypeDO::getIsSoftDeleted, reqVO.getIsSoftDeleted()) .orderByDesc(TransactiontypeDO::getId)); } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(TransactiontypeExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueJob/TransferissueJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueJob/TransferissueJobDetailMapper.java index 6e7ef256..46ba1937 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueJob/TransferissueJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueJob/TransferissueJobDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.transferissueJob; 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.transferissueJob.vo.TransferissueJobDetailExportReqVO; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.transferissueJob.TransferissueJobDetailDO; @@ -41,7 +43,9 @@ public interface TransferissueJobDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(TransferissueJobDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(TransferissueJobDetailDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueJob/TransferissueJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueJob/TransferissueJobMainMapper.java index d5550ab5..bb895a1d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueJob/TransferissueJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueJob/TransferissueJobMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.transferissueJob; 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.transferissueJob.vo.TransferissueJobMainExportReqVO; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobMainPageReqVO; import com.win.module.wms.dal.dataobject.transferissueJob.TransferissueJobMainDO; @@ -64,7 +66,9 @@ public interface TransferissueJobMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(TransferissueJobMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(TransferissueJobMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueRecord/TransferissueRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueRecord/TransferissueRecordDetailMapper.java index e7c8febb..4d5de0b0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueRecord/TransferissueRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueRecord/TransferissueRecordDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.transferissueRecord; 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.transferissueRecord.vo.TransferissueRecordDetailExportReqVO; import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.transferissueRecord.TransferissueRecordDetailDO; @@ -51,7 +53,9 @@ public interface TransferissueRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(TransferissueRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(TransferissueRecordDetailDO::getFromBatch, reqVO.getFromBatch()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueRecord/TransferissueRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueRecord/TransferissueRecordMainMapper.java index 25c40253..538b0687 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueRecord/TransferissueRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueRecord/TransferissueRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.transferissueRecord; 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.transferissueRecord.vo.TransferissueRecordMainExportReqVO; import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.transferissueRecord.TransferissueRecordMainDO; @@ -49,7 +51,9 @@ public interface TransferissueRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(TransferissueRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(TransferissueRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueRequest/TransferissueRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueRequest/TransferissueRequestDetailMapper.java index ab4b47a9..e80795e2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueRequest/TransferissueRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueRequest/TransferissueRequestDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.transferissueRequest; 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.transferissueRequest.vo.TransferissueRequestDetailExportReqVO; import com.win.module.wms.controller.transferissueRequest.vo.TransferissueRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.transferissueRequest.TransferissueRequestDetailDO; @@ -18,6 +20,10 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface TransferissueRequestDetailMapper extends BaseMapperX { + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default PageResult selectPage(TransferissueRequestDetailPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(TransferissueRequestDetailDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueRequest/TransferissueRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueRequest/TransferissueRequestMainMapper.java index 90fe1cd0..62de99a4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueRequest/TransferissueRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueRequest/TransferissueRequestMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.transferissueRequest; 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.transferissueRequest.vo.TransferissueRequestMainExportReqVO; import com.win.module.wms.controller.transferissueRequest.vo.TransferissueRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.transferissueRequest.TransferissueRequestMainDO; @@ -18,6 +20,9 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface TransferissueRequestMainMapper extends BaseMapperX { + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default PageResult selectPage(TransferissueRequestMainPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(TransferissueRequestMainDO::getCarrierCode, reqVO.getCarrierCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferlog/TransferlogMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferlog/TransferlogMapper.java index 948a40ef..736c7f63 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferlog/TransferlogMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferlog/TransferlogMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.transferlog; 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.transferlog.vo.TransferlogExportReqVO; import com.win.module.wms.controller.transferlog.vo.TransferlogPageReqVO; import com.win.module.wms.dal.dataobject.transferlog.TransferlogDO; @@ -18,6 +20,10 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface TransferlogMapper extends BaseMapperX { + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default PageResult selectPage(TransferlogPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(TransferlogDO::getNumber, reqVO.getNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptJob/TransferreceiptJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptJob/TransferreceiptJobDetailMapper.java index 22dd8899..5ddae0d0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptJob/TransferreceiptJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptJob/TransferreceiptJobDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.transferreceiptJob; 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.transferreceiptJob.vo.TransferreceiptJobDetailExportReqVO; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.transferreceiptJob.TransferreceiptJobDetailDO; @@ -18,6 +20,10 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface TransferreceiptJobDetailMapper extends BaseMapperX { + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default PageResult selectPage(TransferreceiptJobDetailPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(TransferreceiptJobDetailDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptJob/TransferreceiptJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptJob/TransferreceiptJobMainMapper.java index dbc99363..2c97c859 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptJob/TransferreceiptJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptJob/TransferreceiptJobMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.transferreceiptJob; 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.transferreceiptJob.vo.TransferreceiptJobMainExportReqVO; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobMainPageReqVO; import com.win.module.wms.dal.dataobject.transferreceiptJob.TransferreceiptJobMainDO; @@ -18,6 +20,10 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface TransferreceiptJobMainMapper extends BaseMapperX { + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default PageResult selectPage(TransferreceiptJobMainPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(TransferreceiptJobMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptRecord/TransferreceiptRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptRecord/TransferreceiptRecordDetailMapper.java index b71b0664..0502b147 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptRecord/TransferreceiptRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptRecord/TransferreceiptRecordDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.transferreceiptRecord; 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.transferreceiptRecord.vo.TransferreceiptRecordDetailExportReqVO; import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.transferreceiptRecord.TransferreceiptRecordDetailDO; @@ -18,6 +20,10 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface TransferreceiptRecordDetailMapper extends BaseMapperX { + + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default PageResult selectPage(TransferreceiptRecordDetailPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(TransferreceiptRecordDetailDO::getFromBatch, reqVO.getFromBatch()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptRecord/TransferreceiptRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptRecord/TransferreceiptRecordMainMapper.java index 2365151f..79d7313c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptRecord/TransferreceiptRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptRecord/TransferreceiptRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.transferreceiptRecord; 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.transferreceiptRecord.vo.TransferreceiptRecordMainExportReqVO; import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.transferreceiptRecord.TransferreceiptRecordMainDO; @@ -18,6 +20,11 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface TransferreceiptRecordMainMapper extends BaseMapperX { + + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default PageResult selectPage(TransferreceiptRecordMainPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(TransferreceiptRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptRequest/TransferreceiptRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptRequest/TransferreceiptRequestMainMapper.java index fcf6d9bb..4bff4633 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptRequest/TransferreceiptRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptRequest/TransferreceiptRequestMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.transferreceiptRequest; 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.transferreceiptRequest.vo.TransferreceiptRequestMainExportReqVO; import com.win.module.wms.controller.transferreceiptRequest.vo.TransferreceiptRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.transferreceiptRequest.TransferreceiptRequestMainDO; @@ -18,6 +20,10 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface TransferreceiptRequestMainMapper extends BaseMapperX { + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default PageResult selectPage(TransferreceiptRequestMainPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(TransferreceiptRequestMainDO::getCarrierCode, reqVO.getCarrierCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueJob/UnplannedissueJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueJob/UnplannedissueJobDetailMapper.java index 48843595..b7172e43 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueJob/UnplannedissueJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueJob/UnplannedissueJobDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.unplannedissueJob; 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.unplannedissueJob.vo.UnplannedissueJobDetailExportReqVO; import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.unplannedissueJob.UnplannedissueJobDetailDO; @@ -18,6 +20,10 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface UnplannedissueJobDetailMapper extends BaseMapperX { + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default PageResult selectPage(UnplannedissueJobDetailPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(UnplannedissueJobDetailDO::getOwnerCode, reqVO.getOwnerCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueJob/UnplannedissueJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueJob/UnplannedissueJobMainMapper.java index 1aaa0e68..5c1136a6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueJob/UnplannedissueJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueJob/UnplannedissueJobMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.unplannedissueJob; 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.unplannedissueJob.vo.UnplannedissueJobMainExportReqVO; import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobMainPageReqVO; import com.win.module.wms.dal.dataobject.unplannedissueJob.UnplannedissueJobMainDO; @@ -56,7 +58,9 @@ public interface UnplannedissueJobMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(UnplannedissueJobMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(UnplannedissueJobMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueRecord/UnplannedissueRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueRecord/UnplannedissueRecordDetailMapper.java index 8fbdb16c..3615ca6e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueRecord/UnplannedissueRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueRecord/UnplannedissueRecordDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.unplannedissueRecord; 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.unplannedissueRecord.vo.UnplannedissueRecordDetailExportReqVO; import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.unplannedissueRecord.UnplannedissueRecordDetailDO; @@ -18,6 +20,10 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface UnplannedissueRecordDetailMapper extends BaseMapperX { + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default PageResult selectPage(UnplannedissueRecordDetailPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(UnplannedissueRecordDetailDO::getOwnerCode, reqVO.getOwnerCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueRecord/UnplannedissueRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueRecord/UnplannedissueRecordMainMapper.java index 16c57339..09b566f0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueRecord/UnplannedissueRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueRecord/UnplannedissueRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.unplannedissueRecord; 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.unplannedissueRecord.vo.UnplannedissueRecordMainExportReqVO; import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.unplannedissueRecord.UnplannedissueRecordMainDO; @@ -18,6 +20,10 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface UnplannedissueRecordMainMapper extends BaseMapperX { + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default PageResult selectPage(UnplannedissueRecordMainPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(UnplannedissueRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueRequest/UnplannedissueRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueRequest/UnplannedissueRequestDetailMapper.java index cf3bed25..a9c79547 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueRequest/UnplannedissueRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueRequest/UnplannedissueRequestDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.unplannedissueRequest; 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.unplannedissueRequest.vo.UnplannedissueRequestDetailExportReqVO; import com.win.module.wms.controller.unplannedissueRequest.vo.UnplannedissueRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.unplannedissueRequest.UnplannedissueRequestDetailDO; @@ -18,6 +20,10 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface UnplannedissueRequestDetailMapper extends BaseMapperX { + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default PageResult selectPage(UnplannedissueRequestDetailPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(UnplannedissueRequestDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueRequest/UnplannedissueRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueRequest/UnplannedissueRequestMainMapper.java index f4a0ca86..7beec62a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueRequest/UnplannedissueRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedissueRequest/UnplannedissueRequestMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.unplannedissueRequest; 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.unplannedissueRequest.vo.UnplannedissueRequestMainExportReqVO; import com.win.module.wms.controller.unplannedissueRequest.vo.UnplannedissueRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.unplannedissueRequest.UnplannedissueRequestMainDO; @@ -41,6 +43,10 @@ public interface UnplannedissueRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(UnplannedissueRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptJob/UnplannedreceiptJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptJob/UnplannedreceiptJobDetailMapper.java index 60db6275..fd8c2fd4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptJob/UnplannedreceiptJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptJob/UnplannedreceiptJobDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.unplannedreceiptJob; 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.unplannedreceiptJob.vo.UnplannedreceiptJobDetailExportReqVO; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.unplannedreceiptJob.UnplannedreceiptJobDetailDO; @@ -18,6 +20,11 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface UnplannedreceiptJobDetailMapper extends BaseMapperX { + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + + default PageResult selectPage(UnplannedreceiptJobDetailPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(UnplannedreceiptJobDetailDO::getOwnerCode, reqVO.getOwnerCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptJob/UnplannedreceiptJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptJob/UnplannedreceiptJobMainMapper.java index ee4746de..25af6ece 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptJob/UnplannedreceiptJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptJob/UnplannedreceiptJobMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.unplannedreceiptJob; 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.unplannedreceiptJob.vo.UnplannedreceiptJobMainExportReqVO; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobMainPageReqVO; import com.win.module.wms.dal.dataobject.unplannedreceiptJob.UnplannedreceiptJobMainDO; @@ -18,6 +20,11 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface UnplannedreceiptJobMainMapper extends BaseMapperX { + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + + default PageResult selectPage(UnplannedreceiptJobMainPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(UnplannedreceiptJobMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptRecord/UnplannedreceiptRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptRecord/UnplannedreceiptRecordDetailMapper.java index 951bb4e3..6a85f9f4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptRecord/UnplannedreceiptRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptRecord/UnplannedreceiptRecordDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.unplannedreceiptRecord; 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.unplannedreceiptRecord.vo.UnplannedreceiptRecordDetailExportReqVO; import com.win.module.wms.controller.unplannedreceiptRecord.vo.UnplannedreceiptRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.unplannedreceiptRecord.UnplannedreceiptRecordDetailDO; @@ -18,6 +20,10 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface UnplannedreceiptRecordDetailMapper extends BaseMapperX { + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default PageResult selectPage(UnplannedreceiptRecordDetailPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(UnplannedreceiptRecordDetailDO::getOwnerCode, reqVO.getOwnerCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptRecord/UnplannedreceiptRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptRecord/UnplannedreceiptRecordMainMapper.java index 2fd31c12..1d65f952 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptRecord/UnplannedreceiptRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptRecord/UnplannedreceiptRecordMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.unplannedreceiptRecord; 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.unplannedreceiptRecord.vo.UnplannedreceiptRecordMainExportReqVO; import com.win.module.wms.controller.unplannedreceiptRecord.vo.UnplannedreceiptRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.unplannedreceiptRecord.UnplannedreceiptRecordMainDO; @@ -18,6 +20,10 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface UnplannedreceiptRecordMainMapper extends BaseMapperX { + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default PageResult selectPage(UnplannedreceiptRecordMainPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(UnplannedreceiptRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptRequest/UnplannedreceiptRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptRequest/UnplannedreceiptRequestDetailMapper.java index 33e78d40..a5e62d3b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptRequest/UnplannedreceiptRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptRequest/UnplannedreceiptRequestDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.unplannedreceiptRequest; 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.unplannedreceiptRequest.vo.UnplannedreceiptRequestDetailExportReqVO; import com.win.module.wms.controller.unplannedreceiptRequest.vo.UnplannedreceiptRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.unplannedreceiptRequest.UnplannedreceiptRequestDetailDO; @@ -17,7 +19,9 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface UnplannedreceiptRequestDetailMapper extends BaseMapperX { - + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default PageResult selectPage(UnplannedreceiptRequestDetailPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(UnplannedreceiptRequestDetailDO::getToOwnerCode, reqVO.getToOwnerCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptRequest/UnplannedreceiptRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptRequest/UnplannedreceiptRequestMainMapper.java index 3eb51276..86f864ae 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptRequest/UnplannedreceiptRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/unplannedreceiptRequest/UnplannedreceiptRequestMainMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.unplannedreceiptRequest; 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.unplannedreceiptRequest.vo.UnplannedreceiptRequestMainExportReqVO; import com.win.module.wms.controller.unplannedreceiptRequest.vo.UnplannedreceiptRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.unplannedreceiptRequest.UnplannedreceiptRequestMainDO; @@ -18,6 +20,10 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface UnplannedreceiptRequestMainMapper extends BaseMapperX { + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default PageResult selectPage(UnplannedreceiptRequestMainPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(UnplannedreceiptRequestMainDO::getToWarehouseCode, reqVO.getToWarehouseCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/warehouse/WarehouseMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/warehouse/WarehouseMapper.java index 39c9b0c1..a675b375 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/warehouse/WarehouseMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/warehouse/WarehouseMapper.java @@ -2,12 +2,15 @@ package com.win.module.wms.dal.mysql.warehouse; 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.warehouse.vo.WarehouseExportReqVO; import com.win.module.wms.controller.warehouse.vo.WarehousePageReqVO; import com.win.module.wms.dal.dataobject.warehouse.WarehouseDO; +import com.win.module.wms.dal.dataobject.warehouse.WarehouseDO; import com.win.module.wms.dal.dataobject.workshop.WorkshopDO; import org.apache.ibatis.annotations.Mapper; @@ -19,6 +22,10 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface WarehouseMapper extends BaseMapperX { + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default WarehouseDO selectByCode(String code) { return selectOne(WarehouseDO::getCode, code); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/work/WorkDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/work/WorkDetailMapper.java index 90760dc4..5e618e06 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/work/WorkDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/work/WorkDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.work; 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.work.vo.WorkDetailExportReqVO; import com.win.module.wms.controller.work.vo.WorkDetailPageReqVO; import com.win.module.wms.dal.dataobject.work.WorkDetailDO; @@ -18,6 +20,9 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface WorkDetailMapper extends BaseMapperX { + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default PageResult selectPage(WorkDetailPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(WorkDetailDO::getLineNumber, reqVO.getLineNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/work/WorkMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/work/WorkMainMapper.java index 3dc2b4b0..1e7983c3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/work/WorkMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/work/WorkMainMapper.java @@ -2,11 +2,14 @@ package com.win.module.wms.dal.mysql.work; 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.work.vo.WorkMainExportReqVO; import com.win.module.wms.controller.work.vo.WorkMainPageReqVO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.work.WorkMainDO; import org.apache.ibatis.annotations.Mapper; @@ -17,6 +20,10 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface WorkMainMapper extends BaseMapperX { + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default PageResult selectPage(WorkMainPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/workshop/WorkshopMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/workshop/WorkshopMapper.java index 9e1e6ac7..e83b06c3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/workshop/WorkshopMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/workshop/WorkshopMapper.java @@ -2,12 +2,14 @@ package com.win.module.wms.dal.mysql.workshop; 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.workshop.vo.WorkshopExportReqVO; import com.win.module.wms.controller.workshop.vo.WorkshopPageReqVO; -import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; +import com.win.module.wms.dal.dataobject.workshop.WorkshopDO; import com.win.module.wms.dal.dataobject.workshop.WorkshopDO; import org.apache.ibatis.annotations.Mapper; @@ -22,6 +24,10 @@ public interface WorkshopMapper extends BaseMapperX { default WorkshopDO selectByCode(String code) { return selectOne(WorkshopDO::getCode, code); } + + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default PageResult selectPage(WorkshopPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(WorkshopDO::getCode, reqVO.getCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/workstation/WorkstationMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/workstation/WorkstationMapper.java index 5d9c18ab..a463df12 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/workstation/WorkstationMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/workstation/WorkstationMapper.java @@ -1,10 +1,14 @@ package com.win.module.wms.dal.mysql.workstation; +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.workstation.vo.WorkstationExportReqVO; import com.win.module.wms.controller.workstation.vo.WorkstationPageReqVO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; +import com.win.module.wms.dal.dataobject.workstation.WorkstationDO; import com.win.module.wms.dal.dataobject.workstation.WorkstationDO; import org.apache.ibatis.annotations.Mapper; @@ -22,6 +26,10 @@ public interface WorkstationMapper extends BaseMapperX { return selectOne(WorkstationDO::getCode, code); } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default PageResult selectPage(WorkstationPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(WorkstationDO::getCode, reqVO.getCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobDetailService.java index 4de58dae..dc7eecaa 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.productscrapJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.productscrapJob.vo.ProductscrapJobDetailCreateReqVO; import com.win.module.wms.controller.productscrapJob.vo.ProductscrapJobDetailExportReqVO; import com.win.module.wms.controller.productscrapJob.vo.ProductscrapJobDetailPageReqVO; @@ -25,6 +26,14 @@ public interface ProductscrapJobDetailService { */ Long createProductscrapJobDetail(@Valid ProductscrapJobDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductscrapJobDetailSenior(CustomConditions conditions); + /** * 更新制品报废任务子 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobDetailServiceImpl.java index 828eb233..4d89b6f3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.productscrapJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.productscrapJob.vo.ProductscrapJobDetailCreateReqVO; import com.win.module.wms.controller.productscrapJob.vo.ProductscrapJobDetailExportReqVO; import com.win.module.wms.controller.productscrapJob.vo.ProductscrapJobDetailPageReqVO; @@ -48,7 +49,10 @@ public class ProductscrapJobDetailServiceImpl implements ProductscrapJobDetailSe ProductscrapJobDetailDO updateObj = ProductscrapJobDetailConvert.INSTANCE.convert(updateReqVO); productscrapJobDetailMapper.updateById(updateObj); } - + @Override + public PageResult getProductscrapJobDetailSenior(CustomConditions conditions) { + return productscrapJobDetailMapper.selectSenior(conditions); + } @Override public void deleteProductscrapJobDetail(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainService.java index 279d1fd3..f192c020 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.productscrapJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.productscrapJob.vo.ProductscrapJobMainCreateReqVO; import com.win.module.wms.controller.productscrapJob.vo.ProductscrapJobMainExportReqVO; import com.win.module.wms.controller.productscrapJob.vo.ProductscrapJobMainPageReqVO; @@ -25,6 +26,14 @@ public interface ProductscrapJobMainService { */ Long createProductscrapJobMain(@Valid ProductscrapJobMainCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductscrapJobMainSenior(CustomConditions conditions); + /** * 更新制品报废任务主 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainServiceImpl.java index 2338c8f7..d103b80a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainServiceImpl.java @@ -1,11 +1,11 @@ package com.win.module.wms.service.productscrapJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.productscrapJob.vo.ProductscrapJobMainCreateReqVO; import com.win.module.wms.controller.productscrapJob.vo.ProductscrapJobMainExportReqVO; import com.win.module.wms.controller.productscrapJob.vo.ProductscrapJobMainPageReqVO; import com.win.module.wms.controller.productscrapJob.vo.ProductscrapJobMainUpdateReqVO; -import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -50,7 +50,10 @@ public class ProductscrapJobMainServiceImpl implements ProductscrapJobMainServic ProductscrapJobMainDO updateObj = ProductscrapJobMainConvert.INSTANCE.convert(updateReqVO); productscrapJobMainMapper.updateById(updateObj); } - + @Override + public PageResult getProductscrapJobMainSenior(CustomConditions conditions) { + return productscrapJobMainMapper.selectSenior(conditions); + } @Override public void deleteProductscrapJobMain(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRecord/ProductscrapRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRecord/ProductscrapRecordDetailService.java index b12cded9..a279b58e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRecord/ProductscrapRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRecord/ProductscrapRecordDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.productscrapRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.productscrapRecord.vo.ProductscrapRecordDetailCreateReqVO; import com.win.module.wms.controller.productscrapRecord.vo.ProductscrapRecordDetailExportReqVO; import com.win.module.wms.controller.productscrapRecord.vo.ProductscrapRecordDetailPageReqVO; @@ -25,6 +26,14 @@ public interface ProductscrapRecordDetailService { */ Long createProductscrapRecordDetail(@Valid ProductscrapRecordDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索制品报废记录子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductscrapRecordDetailSenior(CustomConditions conditions); + /** * 更新制品报废记录子 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRecord/ProductscrapRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRecord/ProductscrapRecordDetailServiceImpl.java index 1ab42236..36b14ec9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRecord/ProductscrapRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRecord/ProductscrapRecordDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.productscrapRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.productscrapRecord.vo.ProductscrapRecordDetailCreateReqVO; import com.win.module.wms.controller.productscrapRecord.vo.ProductscrapRecordDetailExportReqVO; import com.win.module.wms.controller.productscrapRecord.vo.ProductscrapRecordDetailPageReqVO; @@ -48,7 +49,10 @@ public class ProductscrapRecordDetailServiceImpl implements ProductscrapRecordDe ProductscrapRecordDetailDO updateObj = ProductscrapRecordDetailConvert.INSTANCE.convert(updateReqVO); productscrapRecordDetailMapper.updateById(updateObj); } - + @Override + public PageResult getProductscrapRecordDetailSenior(CustomConditions conditions) { + return productscrapRecordDetailMapper.selectSenior(conditions); + } @Override public void deleteProductscrapRecordDetail(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRecord/ProductscrapRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRecord/ProductscrapRecordMainService.java index 59b04319..dc972e2f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRecord/ProductscrapRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRecord/ProductscrapRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.productscrapRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.productscrapRecord.vo.ProductscrapRecordMainCreateReqVO; import com.win.module.wms.controller.productscrapRecord.vo.ProductscrapRecordMainExportReqVO; import com.win.module.wms.controller.productscrapRecord.vo.ProductscrapRecordMainPageReqVO; @@ -25,6 +26,14 @@ public interface ProductscrapRecordMainService { */ String createProductscrapRecordMain(@Valid ProductscrapRecordMainCreateReqVO createReqVO); + /** + * 获得用高级搜索创建制品报废记录主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductscrapRecordMainSenior(CustomConditions conditions); + /** * 更新制品报废记录主 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRecord/ProductscrapRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRecord/ProductscrapRecordMainServiceImpl.java index 86774bd8..65c5ece5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRecord/ProductscrapRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRecord/ProductscrapRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.productscrapRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.productscrapRecord.vo.ProductscrapRecordMainCreateReqVO; import com.win.module.wms.controller.productscrapRecord.vo.ProductscrapRecordMainExportReqVO; import com.win.module.wms.controller.productscrapRecord.vo.ProductscrapRecordMainPageReqVO; @@ -48,7 +49,10 @@ public class ProductscrapRecordMainServiceImpl implements ProductscrapRecordMain ProductscrapRecordMainDO updateObj = ProductscrapRecordMainConvert.INSTANCE.convert(updateReqVO); productscrapRecordMainMapper.updateById(updateObj); } - + @Override + public PageResult getProductscrapRecordMainSenior(CustomConditions conditions) { + return productscrapRecordMainMapper.selectSenior(conditions); + } @Override public void deleteProductscrapRecordMain(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestDetailService.java index 3eb0c631..36b612d6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.productscrapRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.productscrapRequest.vo.ProductscrapRequestDetailCreateReqVO; import com.win.module.wms.controller.productscrapRequest.vo.ProductscrapRequestDetailExportReqVO; import com.win.module.wms.controller.productscrapRequest.vo.ProductscrapRequestDetailPageReqVO; @@ -32,6 +33,14 @@ public interface ProductscrapRequestDetailService { */ void updateProductscrapRequestDetail(@Valid ProductscrapRequestDetailUpdateReqVO updateReqVO); + /** + * 获得用高级搜索制品报废申请子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductscrapRequestDetailSenior(CustomConditions conditions); + /** * 删除制品报废申请子 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestDetailServiceImpl.java index 9fa56552..f6858c46 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.productscrapRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.productscrapRequest.vo.ProductscrapRequestDetailCreateReqVO; import com.win.module.wms.controller.productscrapRequest.vo.ProductscrapRequestDetailExportReqVO; import com.win.module.wms.controller.productscrapRequest.vo.ProductscrapRequestDetailPageReqVO; @@ -56,7 +57,10 @@ public class ProductscrapRequestDetailServiceImpl implements ProductscrapRequest // 删除 productscrapRequestDetailMapper.deleteById(id); } - + @Override + public PageResult getProductscrapRequestDetailSenior(CustomConditions conditions) { + return productscrapRequestDetailMapper.selectSenior(conditions); + } private void validateProductscrapRequestDetailExists(Long id) { if (productscrapRequestDetailMapper.selectById(id) == null) { throw exception(PRODUCTSCRAP_REQUEST_DETAIL_NOT_EXISTS); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestMainService.java index 1ce2a29f..8382f106 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.productscrapRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.productscrapRequest.vo.ProductscrapRequestMainCreateReqVO; import com.win.module.wms.controller.productscrapRequest.vo.ProductscrapRequestMainExportReqVO; import com.win.module.wms.controller.productscrapRequest.vo.ProductscrapRequestMainPageReqVO; @@ -32,6 +33,14 @@ public interface ProductscrapRequestMainService { */ void updateProductscrapRequestMain(@Valid ProductscrapRequestMainUpdateReqVO updateReqVO); + /** + * 获得用高级搜索制品报废申请主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductscrapRequestMainSenior(CustomConditions conditions); + /** * 删除制品报废申请主 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestMainServiceImpl.java index 03724ebe..823a4877 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.productscrapRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.productscrapRequest.vo.ProductscrapRequestMainCreateReqVO; import com.win.module.wms.controller.productscrapRequest.vo.ProductscrapRequestMainExportReqVO; import com.win.module.wms.controller.productscrapRequest.vo.ProductscrapRequestMainPageReqVO; @@ -56,7 +57,10 @@ public class ProductscrapRequestMainServiceImpl implements ProductscrapRequestMa // 删除 productscrapRequestMainMapper.deleteById(id); } - + @Override + public PageResult getProductscrapRequestMainSenior(CustomConditions conditions) { + return productscrapRequestMainMapper.selectSenior(conditions); + } private void validateProductscrapRequestMainExists(Long id) { if (productscrapRequestMainMapper.selectById(id) == null) { throw exception(PRODUCTSCRAP_REQUEST_MAIN_NOT_EXISTS); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/project/ProjectService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/project/ProjectService.java index 59a1ec55..7ce3b085 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/project/ProjectService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/project/ProjectService.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.project; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.project.vo.*; import com.win.module.wms.dal.dataobject.project.ProjectDO; @@ -29,6 +30,13 @@ public interface ProjectService { * @param updateReqVO 更新信息 */ void updateProject(@Valid ProjectUpdateReqVO updateReqVO); + /** + * 获得用高级搜索项目分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProjectSenior(CustomConditions conditions); /** * 删除项目 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/project/ProjectServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/project/ProjectServiceImpl.java index c37dfcd8..ca95f896 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/project/ProjectServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/project/ProjectServiceImpl.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.project.vo.*; @@ -44,7 +45,10 @@ public class ProjectServiceImpl implements ProjectService { // 返回 return project.getId(); } - + @Override + public PageResult getProjectSenior(CustomConditions conditions) { + return projectMapper.selectSenior(conditions); + } @Override public void updateProject(ProjectUpdateReqVO updateReqVO) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseDetailService.java index 5c604488..d7db48b1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.purchase; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchase.vo.PurchaseDetailCreateReqVO; import com.win.module.wms.controller.purchase.vo.PurchaseDetailExportReqVO; import com.win.module.wms.controller.purchase.vo.PurchaseDetailPageReqVO; @@ -25,6 +26,14 @@ public interface PurchaseDetailService { */ Long createPurchaseDetail(@Valid PurchaseDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索采购订单子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPurchaseDetailSenior(CustomConditions conditions); + /** * 更新采购订单子 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseDetailServiceImpl.java index 9f7e31ae..0053be68 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.purchase; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchase.vo.PurchaseDetailCreateReqVO; import com.win.module.wms.controller.purchase.vo.PurchaseDetailExportReqVO; import com.win.module.wms.controller.purchase.vo.PurchaseDetailPageReqVO; @@ -48,7 +49,10 @@ public class PurchaseDetailServiceImpl implements PurchaseDetailService { PurchaseDetailDO updateObj = PurchaseDetailConvert.INSTANCE.convert(updateReqVO); purchaseDetailMapper.updateById(updateObj); } - + @Override + public PageResult getPurchaseDetailSenior(CustomConditions conditions) { + return purchaseDetailMapper.selectSenior(conditions); + } @Override public void deletePurchaseDetail(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainService.java index da14ac22..6e450520 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.purchase; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchase.vo.PurchaseMainCreateReqVO; import com.win.module.wms.controller.purchase.vo.PurchaseMainExportReqVO; import com.win.module.wms.controller.purchase.vo.PurchaseMainPageReqVO; @@ -26,6 +27,14 @@ public interface PurchaseMainService { */ Long createPurchaseMain(@Valid PurchaseMainCreateReqVO createReqVO); + /** + * 获得用高级搜索采购订单主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPurchaseMainSenior(CustomConditions conditions); + /** * 更新采购订单主 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java index c1648292..226350b6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java @@ -1,6 +1,7 @@ package com.win.module.wms.service.purchase; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchase.vo.PurchaseMainCreateReqVO; import com.win.module.wms.controller.purchase.vo.PurchaseMainExportReqVO; import com.win.module.wms.controller.purchase.vo.PurchaseMainPageReqVO; @@ -44,7 +45,10 @@ public class PurchaseMainServiceImpl implements PurchaseMainService { // 返回 return purchaseMain.getId(); } - + @Override + public PageResult getPurchaseMainSenior(CustomConditions conditions) { + return purchaseMainMapper.selectSenior(conditions); + } @Override public void updatePurchaseMain(PurchaseMainUpdateReqVO updateReqVO) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanDetailService.java index ffa7df81..7afb54ff 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.purchasePlan; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasePlan.vo.PurchasePlanDetailCreateReqVO; import com.win.module.wms.controller.purchasePlan.vo.PurchasePlanDetailExportReqVO; import com.win.module.wms.controller.purchasePlan.vo.PurchasePlanDetailPageReqVO; @@ -25,6 +26,14 @@ public interface PurchasePlanDetailService { */ Long createPurchasePlanDetail(@Valid PurchasePlanDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索要货计划子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPurchasePlanDetailSenior(CustomConditions conditions); + /** * 更新要货计划子 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanDetailServiceImpl.java index 693ae555..95420fcf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.purchasePlan; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasePlan.vo.PurchasePlanDetailCreateReqVO; import com.win.module.wms.controller.purchasePlan.vo.PurchasePlanDetailExportReqVO; import com.win.module.wms.controller.purchasePlan.vo.PurchasePlanDetailPageReqVO; @@ -48,6 +49,10 @@ public class PurchasePlanDetailServiceImpl implements PurchasePlanDetailService PurchasePlanDetailDO updateObj = PurchasePlanDetailConvert.INSTANCE.convert(updateReqVO); purchasePlanDetailMapper.updateById(updateObj); } + @Override + public PageResult getPurchasePlanDetailSenior(CustomConditions conditions) { + return purchasePlanDetailMapper.selectSenior(conditions); + } @Override public void deletePurchasePlanDetail(Long id) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainService.java index 22a86c78..d003f4d8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.purchasePlan; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasePlan.vo.PurchasePlanMainCreateReqVO; import com.win.module.wms.controller.purchasePlan.vo.PurchasePlanMainExportReqVO; import com.win.module.wms.controller.purchasePlan.vo.PurchasePlanMainPageReqVO; @@ -25,7 +26,13 @@ public interface PurchasePlanMainService { * @return 编号 */ Long createPurchasePlanMain(@Valid PurchasePlanMainCreateReqVO createReqVO); - + /** + * 获得用高级搜索要货计划主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPurchasePlanMainSenior(CustomConditions conditions); /** * 更新要货计划主 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainServiceImpl.java index 429fdcd8..2d4ce280 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainServiceImpl.java @@ -1,6 +1,7 @@ package com.win.module.wms.service.purchasePlan; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasePlan.vo.PurchasePlanMainCreateReqVO; import com.win.module.wms.controller.purchasePlan.vo.PurchasePlanMainExportReqVO; import com.win.module.wms.controller.purchasePlan.vo.PurchasePlanMainPageReqVO; @@ -54,6 +55,10 @@ public class PurchasePlanMainServiceImpl implements PurchasePlanMainService { PurchasePlanMainDO updateObj = PurchasePlanMainConvert.INSTANCE.convert(updateReqVO); purchasePlanMainMapper.updateById(updateObj); } + @Override + public PageResult getPurchasePlanMainSenior(CustomConditions conditions) { + return purchasePlanMainMapper.selectSenior(conditions); + } @Override public void deletePurchasePlanMain(Long id) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRecord/PurchaseclaimRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRecord/PurchaseclaimRecordDetailService.java index 823ced15..bed74860 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRecord/PurchaseclaimRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRecord/PurchaseclaimRecordDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.purchaseclaimRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchaseclaimRecord.vo.PurchaseclaimRecordDetailCreateReqVO; import com.win.module.wms.controller.purchaseclaimRecord.vo.PurchaseclaimRecordDetailExportReqVO; import com.win.module.wms.controller.purchaseclaimRecord.vo.PurchaseclaimRecordDetailPageReqVO; @@ -25,6 +26,14 @@ public interface PurchaseclaimRecordDetailService { */ Long createPurchaseclaimRecordDetail(@Valid PurchaseclaimRecordDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索采购索赔记录子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPurchaseclaimRecordDetailSenior(CustomConditions conditions); + /** * 更新采购索赔记录子 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRecord/PurchaseclaimRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRecord/PurchaseclaimRecordDetailServiceImpl.java index 8802ad52..63637c37 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRecord/PurchaseclaimRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRecord/PurchaseclaimRecordDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.purchaseclaimRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchaseclaimRecord.vo.PurchaseclaimRecordDetailCreateReqVO; import com.win.module.wms.controller.purchaseclaimRecord.vo.PurchaseclaimRecordDetailExportReqVO; import com.win.module.wms.controller.purchaseclaimRecord.vo.PurchaseclaimRecordDetailPageReqVO; @@ -48,6 +49,10 @@ public class PurchaseclaimRecordDetailServiceImpl implements PurchaseclaimRecord PurchaseclaimRecordDetailDO updateObj = PurchaseclaimRecordDetailConvert.INSTANCE.convert(updateReqVO); purchaseclaimRecordDetailMapper.updateById(updateObj); } + @Override + public PageResult getPurchaseclaimRecordDetailSenior(CustomConditions conditions) { + return purchaseclaimRecordDetailMapper.selectSenior(conditions); + } @Override public void deletePurchaseclaimRecordDetail(Long id) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRecord/PurchaseclaimRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRecord/PurchaseclaimRecordMainService.java index 8af2e87c..0e80e8d0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRecord/PurchaseclaimRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRecord/PurchaseclaimRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.purchaseclaimRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchaseclaimRecord.vo.PurchaseclaimRecordMainCreateReqVO; import com.win.module.wms.controller.purchaseclaimRecord.vo.PurchaseclaimRecordMainExportReqVO; import com.win.module.wms.controller.purchaseclaimRecord.vo.PurchaseclaimRecordMainPageReqVO; @@ -25,6 +26,14 @@ public interface PurchaseclaimRecordMainService { */ Long createPurchaseclaimRecordMain(@Valid PurchaseclaimRecordMainCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPurchaseclaimRecordMainSenior(CustomConditions conditions); + /** * 更新采购索赔记录主 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRecord/PurchaseclaimRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRecord/PurchaseclaimRecordMainServiceImpl.java index 3fc8d3e0..c30fa0eb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRecord/PurchaseclaimRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRecord/PurchaseclaimRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.purchaseclaimRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchaseclaimRecord.vo.PurchaseclaimRecordMainCreateReqVO; import com.win.module.wms.controller.purchaseclaimRecord.vo.PurchaseclaimRecordMainExportReqVO; import com.win.module.wms.controller.purchaseclaimRecord.vo.PurchaseclaimRecordMainPageReqVO; @@ -48,6 +49,10 @@ public class PurchaseclaimRecordMainServiceImpl implements PurchaseclaimRecordMa PurchaseclaimRecordMainDO updateObj = PurchaseclaimRecordMainConvert.INSTANCE.convert(updateReqVO); purchaseclaimRecordMainMapper.updateById(updateObj); } + @Override + public PageResult getPurchaseclaimRecordMainSenior(CustomConditions conditions) { + return purchaseclaimRecordMainMapper.selectSenior(conditions); + } @Override public void deletePurchaseclaimRecordMain(Long id) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseprice/PurchasepriceService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseprice/PurchasepriceService.java index 5103bc25..3ef9bf25 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseprice/PurchasepriceService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseprice/PurchasepriceService.java @@ -1,7 +1,9 @@ package com.win.module.wms.service.purchaseprice; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.purchaseprice.vo.*; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.purchaseprice.PurchasepriceDO; import javax.validation.Valid; @@ -23,6 +25,14 @@ public interface PurchasepriceService { */ Long createPurchaseprice(@Valid PurchasepriceCreateReqVO createReqVO); + /** + * 获得用高级搜索采购价格单分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPurchasepriceSenior(CustomConditions conditions); + /** * 更新采购价格单 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseprice/PurchasepriceServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseprice/PurchasepriceServiceImpl.java index b7fe6c97..d73ee5f3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseprice/PurchasepriceServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseprice/PurchasepriceServiceImpl.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.purchaseprice.vo.*; @@ -46,7 +47,10 @@ public class PurchasepriceServiceImpl implements PurchasepriceService { // 返回 return purchaseprice.getId(); } - + @Override + public PageResult getPurchasepriceSenior(CustomConditions conditions) { + return purchasepriceMapper.selectSenior(conditions); + } @Override public void updatePurchaseprice(PurchasepriceUpdateReqVO updateReqVO) { // 校验存在 @@ -93,25 +97,55 @@ public class PurchasepriceServiceImpl implements PurchasepriceService { List errorList = new ArrayList<>(); purchaseprices.forEach(purchaseprice -> { // 校验，判断是否有不符合的原因 - try { - if(mode != null){ - validatePurchasepriceForCreateOrUpdate(null,purchaseprice.getSupplierCode(),purchaseprice.getItemCode() - ,purchaseprice.getCurrency(),purchaseprice.getPrice(),purchaseprice.getAvailable()); + String massage = ""; + if(mode != null) { + try { + validatePurchasepriceExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCodeExists(null, purchaseprice.getItemCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateSupplierCodeExists(purchaseprice.getSupplierCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCurrencyExists(purchaseprice.getCurrency()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validatePriceExists(purchaseprice.getPrice()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(purchaseprice.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + + if (StrUtil.isNotEmpty(massage)) { + massage.substring(0, massage.length() - 1); + errorList.add(purchaseprice); + } + if (errorList == null) { + // 判断如果不存在，在进行插入 + OwnerDO existConfigurationSetting = null; + if (existConfigurationSetting == null && mode != 3) { + purchasepriceMapper.insert(PurchasepriceConvert.INSTANCE.convert(purchaseprice)); + } else if (existConfigurationSetting != null && mode != 2) {// 如果存在，判断是否允许更新 + PurchasepriceDO purchasepriceDo = PurchasepriceConvert.INSTANCE.convert(purchaseprice); + purchasepriceDo.setId(existConfigurationSetting.getId()); + purchasepriceMapper.updateById(purchasepriceDo); + } + } } - } catch (ServiceException ex) { - errorList.add(purchaseprice); - return; - } - // 判断如果不存在，在进行插入 - OwnerDO existConfigurationSetting = null; - if (existConfigurationSetting == null&& mode != 3) { - purchasepriceMapper.insert(PurchasepriceConvert.INSTANCE.convert(purchaseprice)); - } - else if (existConfigurationSetting != null && mode != 2) {// 如果存在，判断是否允许更新 - PurchasepriceDO purchasepriceDo = PurchasepriceConvert.INSTANCE.convert(purchaseprice); - purchasepriceDo.setId(existConfigurationSetting.getId()); - purchasepriceMapper.updateById(purchasepriceDo); - } }); //错误不为空并非部分更新，手工回滚 if(!errorList.isEmpty() && !updatePart) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailService.java index b2ed0e25..321c8076 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailService.java @@ -2,6 +2,8 @@ package com.win.module.wms.service.purchasereceiptJob; import java.util.*; import javax.validation.*; + +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereceiptJob.vo.*; import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobDetailDO; import com.win.framework.common.pojo.PageResult; @@ -20,7 +22,13 @@ public interface PurchasereceiptJobDetailService { * @return 编号 */ Long createPurchasereceiptJobDetail(@Valid PurchasereceiptJobDetailCreateReqVO createReqVO); - + /** + * 获得用高级搜索采购收货任务子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPurchasereceiptJobDetailSenior(CustomConditions conditions); /** * 更新采购收货任务子 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailServiceImpl.java index ed06342a..2c9f1c2e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.purchasereceiptJob; +import com.win.framework.common.pojo.CustomConditions; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -44,7 +45,10 @@ public class PurchasereceiptJobDetailServiceImpl implements PurchasereceiptJobDe PurchasereceiptJobDetailDO updateObj = PurchasereceiptJobDetailConvert.INSTANCE.convert(updateReqVO); purchasereceiptJobDetailMapper.updateById(updateObj); } - + @Override + public PageResult getPurchasereceiptJobDetailSenior(CustomConditions conditions) { + return purchasereceiptJobDetailMapper.selectSenior(conditions); + } @Override public void deletePurchasereceiptJobDetail(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java index 027e92e6..a99916ae 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java @@ -2,10 +2,11 @@ package com.win.module.wms.service.purchasereceiptJob; import java.util.*; import javax.validation.*; + +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereceiptJob.vo.*; import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobMainDO; import com.win.framework.common.pojo.PageResult; -import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO; /** * 采购收货任务主 Service 接口 @@ -21,7 +22,13 @@ public interface PurchasereceiptJobMainService { * @return 编号 */ Long createPurchasereceiptJobMain(@Valid PurchasereceiptJobMainCreateReqVO createReqVO); - + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPurchasereceiptJobMainSenior(CustomConditions conditions); /** * 更新采购收货任务主 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java index 73398f2c..43cad474 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java @@ -1,7 +1,7 @@ package com.win.module.wms.service.purchasereceiptJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO; import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordMainService; import org.springframework.stereotype.Service; @@ -50,7 +50,10 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain PurchasereceiptJobMainDO updateObj = PurchasereceiptJobMainConvert.INSTANCE.convert(updateReqVO); purchasereceiptJobMainMapper.updateById(updateObj); } - + @Override + public PageResult getPurchasereceiptJobMainSenior(CustomConditions conditions) { + return purchasereceiptJobMainMapper.selectSenior(conditions); + } @Override public void deletePurchasereceiptJobMain(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordDetailService.java index bc3da76b..71fbe220 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.purchasereceiptRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordDetailCreateReqVO; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordDetailExportReqVO; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordDetailPageReqVO; @@ -38,7 +39,13 @@ public interface PurchasereceiptRecordDetailService { * @param id 编号 */ void deletePurchasereceiptRecordDetail(Long id); - + /** + * 获得用高级搜索采购收货记录子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPurchasereceiptRecordDetailSenior(CustomConditions conditions); /** * 获得采购收货记录子 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordDetailServiceImpl.java index 59b9e2c1..cd5056f9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.purchasereceiptRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordDetailCreateReqVO; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordDetailExportReqVO; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordDetailPageReqVO; @@ -48,7 +49,10 @@ public class PurchasereceiptRecordDetailServiceImpl implements PurchasereceiptRe PurchasereceiptRecordDetailDO updateObj = PurchasereceiptRecordDetailConvert.INSTANCE.convert(updateReqVO); purchasereceiptRecordDetailMapper.updateById(updateObj); } - + @Override + public PageResult getPurchasereceiptRecordDetailSenior(CustomConditions conditions) { + return purchasereceiptRecordDetailMapper.selectSenior(conditions); + } @Override public void deletePurchasereceiptRecordDetail(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainService.java index 7e56e8d5..ee054664 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.purchasereceiptRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainCreateReqVO; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainExportReqVO; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainPageReqVO; @@ -32,6 +33,13 @@ public interface PurchasereceiptRecordMainService { * @param updateReqVO 更新信息 */ void updatePurchasereceiptRecordMain(@Valid PurchasereceiptRecordMainUpdateReqVO updateReqVO); + /** + * 获得用高级搜索采购收货记录主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPurchasereceiptRecordMainSenior(CustomConditions conditions); /** * 删除采购收货记录主 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainServiceImpl.java index 61476dfa..9dda87b2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainServiceImpl.java @@ -1,6 +1,7 @@ package com.win.module.wms.service.purchasereceiptRecord; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainCreateReqVO; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainExportReqVO; import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainPageReqVO; @@ -68,7 +69,10 @@ public class PurchasereceiptRecordMainServiceImpl implements PurchasereceiptReco throw exception(PURCHASERECEIPT_RECORD_MAIN_NOT_EXISTS); } } - + @Override + public PageResult getPurchasereceiptRecordMainSenior(CustomConditions conditions) { + return purchasereceiptRecordMainMapper.selectSenior(conditions); + } @Override public PurchasereceiptRecordMainDO getPurchasereceiptRecordMain(Long id) { return purchasereceiptRecordMainMapper.selectById(id); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestDetailService.java index dfedc1e6..cf1a86fe 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestDetailService.java @@ -2,6 +2,8 @@ package com.win.module.wms.service.purchasereceiptRequest; import java.util.*; import javax.validation.*; + +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereceiptRequest.vo.*; import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestDetailDO; import com.win.framework.common.pojo.PageResult; @@ -20,7 +22,13 @@ public interface PurchasereceiptRequestDetailService { * @return 编号 */ Long createPurchasereceiptRequestDetail(@Valid PurchasereceiptRequestDetailCreateReqVO createReqVO); - + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPurchasereceiptRequestDetailSenior(CustomConditions conditions); /** * 更新采购收货申请子 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestDetailServiceImpl.java index e292f93a..352307fe 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.purchasereceiptRequest; +import com.win.framework.common.pojo.CustomConditions; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -35,7 +36,10 @@ public class PurchasereceiptRequestDetailServiceImpl implements PurchasereceiptR // 返回 return purchasereceiptRequestDetail.getId(); } - + @Override + public PageResult getPurchasereceiptRequestDetailSenior(CustomConditions conditions) { + return purchasereceiptRequestDetailMapper.selectSenior(conditions); + } @Override public void updatePurchasereceiptRequestDetail(PurchasereceiptRequestDetailUpdateReqVO updateReqVO) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainService.java index 1a66a313..968d9eb1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.purchasereceiptRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestMainCreateReqVO; import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestMainExportReqVO; import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestMainPageReqVO; @@ -25,6 +26,14 @@ public interface PurchasereceiptRequestMainService { */ Long createPurchasereceiptRequestMain(@Valid PurchasereceiptRequestMainCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPurchasereceiptRequestMainSenior(CustomConditions conditions); + /** * 更新采购收货申请主 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java index fa6dbd03..636b0aa9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.purchasereceiptRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestMainCreateReqVO; import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestMainExportReqVO; import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestMainPageReqVO; @@ -48,7 +49,10 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq PurchasereceiptRequestMainDO updateObj = PurchasereceiptRequestMainConvert.INSTANCE.convert(updateReqVO); purchasereceiptRequestMainMapper.updateById(updateObj); } - + @Override + public PageResult getPurchasereceiptRequestMainSenior(CustomConditions conditions) { + return purchasereceiptRequestMainMapper.selectSenior(conditions); + } @Override public void deletePurchasereceiptRequestMain(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobDetailService.java index 0ba64f58..0bebb6a8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.purchasereturnJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobDetailCreateReqVO; import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobDetailExportReqVO; import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobDetailPageReqVO; @@ -25,6 +26,14 @@ public interface PurchasereturnJobDetailService { */ String createPurchasereturnJobDetail(@Valid PurchasereturnJobDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索采购退货任务子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPurchasereturnJobDetailSenior(CustomConditions conditions); + /** * 更新采购退货任务子 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobDetailServiceImpl.java index a35f07ba..98866b0a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.purchasereturnJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobDetailCreateReqVO; import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobDetailExportReqVO; import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobDetailPageReqVO; @@ -48,7 +49,10 @@ public class PurchasereturnJobDetailServiceImpl implements PurchasereturnJobDeta PurchasereturnJobDetailDO updateObj = PurchasereturnJobDetailConvert.INSTANCE.convert(updateReqVO); purchasereturnJobDetailMapper.updateById(updateObj); } - + @Override + public PageResult getPurchasereturnJobDetailSenior(CustomConditions conditions) { + return purchasereturnJobDetailMapper.selectSenior(conditions); + } @Override public void deletePurchasereturnJobDetail(String id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainService.java index a46b4d44..89d2d170 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.purchasereturnJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainCreateReqVO; import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainExportReqVO; import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainPageReqVO; @@ -31,6 +32,13 @@ public interface PurchasereturnJobMainService { * @param updateReqVO 更新信息 */ void updatePurchasereturnJobMain(@Valid PurchasereturnJobMainUpdateReqVO updateReqVO); + /** + * 获得用高级搜索采购退货任务主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPurchasereturnJobMainSenior(CustomConditions conditions); /** * 删除采购退货任务主 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java index 55339151..0fd771a0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java @@ -1,11 +1,11 @@ package com.win.module.wms.service.purchasereturnJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainCreateReqVO; import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainExportReqVO; import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainPageReqVO; import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainUpdateReqVO; -import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO; import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordMainService; import org.springframework.stereotype.Service; @@ -61,7 +61,10 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe // 删除 purchasereturnJobMainMapper.deleteById(id); } - + @Override + public PageResult getPurchasereturnJobMainSenior(CustomConditions conditions) { + return purchasereturnJobMainMapper.selectSenior(conditions); + } private void validatePurchasereturnJobMainExists(String id) { if (purchasereturnJobMainMapper.selectById(id) == null) { throw exception(PURCHASERETURN_JOB_MAIN_NOT_EXISTS); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordDetailService.java index 5a420e66..4aec4104 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.purchasereturnRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereturnRecord.vo.PurchasereturnRecordDetailCreateReqVO; import com.win.module.wms.controller.purchasereturnRecord.vo.PurchasereturnRecordDetailExportReqVO; import com.win.module.wms.controller.purchasereturnRecord.vo.PurchasereturnRecordDetailPageReqVO; @@ -39,6 +40,15 @@ public interface PurchasereturnRecordDetailService { */ void deletePurchasereturnRecordDetail(Long id); + + /** + * 获得用高级搜索采购退货记录子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPurchasereturnRecordDetailSenior(CustomConditions conditions); + /** * 获得采购退货记录子 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordDetailServiceImpl.java index 0945012d..f5f724c9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.purchasereturnRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereturnRecord.vo.PurchasereturnRecordDetailCreateReqVO; import com.win.module.wms.controller.purchasereturnRecord.vo.PurchasereturnRecordDetailExportReqVO; import com.win.module.wms.controller.purchasereturnRecord.vo.PurchasereturnRecordDetailPageReqVO; @@ -72,7 +73,10 @@ public class PurchasereturnRecordDetailServiceImpl implements PurchasereturnReco public List getPurchasereturnRecordDetailList(Collection ids) { return purchasereturnRecordDetailMapper.selectBatchIds(ids); } - + @Override + public PageResult getPurchasereturnRecordDetailSenior(CustomConditions conditions) { + return purchasereturnRecordDetailMapper.selectSenior(conditions); + } @Override public PageResult getPurchasereturnRecordDetailPage(PurchasereturnRecordDetailPageReqVO pageReqVO) { return purchasereturnRecordDetailMapper.selectPage(pageReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordMainService.java index 977bac29..bdc792de 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.purchasereturnRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereturnRecord.vo.PurchasereturnRecordMainCreateReqVO; import com.win.module.wms.controller.purchasereturnRecord.vo.PurchasereturnRecordMainExportReqVO; import com.win.module.wms.controller.purchasereturnRecord.vo.PurchasereturnRecordMainPageReqVO; @@ -25,6 +26,14 @@ public interface PurchasereturnRecordMainService { */ Long createPurchasereturnRecordMain(@Valid PurchasereturnRecordMainCreateReqVO createReqVO); + /** + * 获得用高级搜索采购退货记录主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPurchasereturnRecordMainSenior(CustomConditions conditions); + /** * 更新采购退货记录主 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordMainServiceImpl.java index e10e544b..4ed9f1d9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.purchasereturnRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereturnRecord.vo.PurchasereturnRecordMainCreateReqVO; import com.win.module.wms.controller.purchasereturnRecord.vo.PurchasereturnRecordMainExportReqVO; import com.win.module.wms.controller.purchasereturnRecord.vo.PurchasereturnRecordMainPageReqVO; @@ -48,7 +49,10 @@ public class PurchasereturnRecordMainServiceImpl implements PurchasereturnRecord PurchasereturnRecordMainDO updateObj = PurchasereturnRecordMainConvert.INSTANCE.convert(updateReqVO); purchasereturnRecordMainMapper.updateById(updateObj); } - + @Override + public PageResult getPurchasereturnRecordMainSenior(CustomConditions conditions) { + return purchasereturnRecordMainMapper.selectSenior(conditions); + } @Override public void deletePurchasereturnRecordMain(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestDetailService.java index 9ae269a9..6388451a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.purchasereturnRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereturnRequest.vo.PurchasereturnRequestDetailCreateReqVO; import com.win.module.wms.controller.purchasereturnRequest.vo.PurchasereturnRequestDetailExportReqVO; import com.win.module.wms.controller.purchasereturnRequest.vo.PurchasereturnRequestDetailPageReqVO; @@ -24,6 +25,13 @@ public interface PurchasereturnRequestDetailService { * @return 编号 */ Long createPurchasereturnRequestDetail(@Valid PurchasereturnRequestDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索采购退货申请子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPurchasereturnRequestDetailSenior(CustomConditions conditions); /** * 更新采购退货申请子 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestDetailServiceImpl.java index 1c8719fe..40440075 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.purchasereturnRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereturnRequest.vo.PurchasereturnRequestDetailCreateReqVO; import com.win.module.wms.controller.purchasereturnRequest.vo.PurchasereturnRequestDetailExportReqVO; import com.win.module.wms.controller.purchasereturnRequest.vo.PurchasereturnRequestDetailPageReqVO; @@ -57,6 +58,11 @@ public class PurchasereturnRequestDetailServiceImpl implements PurchasereturnReq purchasereturnRequestDetailMapper.deleteById(id); } + @Override + public PageResult getPurchasereturnRequestDetailSenior(CustomConditions conditions) { + return purchasereturnRequestDetailMapper.selectSenior(conditions); + } + private void validatePurchasereturnRequestDetailExists(Long id) { if (purchasereturnRequestDetailMapper.selectById(id) == null) { throw exception(PURCHASERETURN_REQUEST_DETAIL_NOT_EXISTS); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainService.java index 689265a3..cbc73432 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.purchasereturnRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereturnRequest.vo.PurchasereturnRequestMainCreateReqVO; import com.win.module.wms.controller.purchasereturnRequest.vo.PurchasereturnRequestMainExportReqVO; import com.win.module.wms.controller.purchasereturnRequest.vo.PurchasereturnRequestMainPageReqVO; @@ -24,7 +25,13 @@ public interface PurchasereturnRequestMainService { * @return 编号 */ Long createPurchasereturnRequestMain(@Valid PurchasereturnRequestMainCreateReqVO createReqVO); - + /** + * 获得用高级搜索采购退货申请主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPurchasereturnRequestMainSenior(CustomConditions conditions); /** * 更新采购退货申请主 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java index 1eb8103c..c88848eb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.purchasereturnRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereturnRequest.vo.PurchasereturnRequestMainCreateReqVO; import com.win.module.wms.controller.purchasereturnRequest.vo.PurchasereturnRequestMainExportReqVO; import com.win.module.wms.controller.purchasereturnRequest.vo.PurchasereturnRequestMainPageReqVO; @@ -48,7 +49,10 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque PurchasereturnRequestMainDO updateObj = PurchasereturnRequestMainConvert.INSTANCE.convert(updateReqVO); purchasereturnRequestMainMapper.updateById(updateObj); } - + @Override + public PageResult getPurchasereturnRequestMainSenior(CustomConditions conditions) { + return purchasereturnRequestMainMapper.selectSenior(conditions); + } @Override public void deletePurchasereturnRequestMain(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobDetailService.java index cfc18396..4e2cbf38 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobDetailService.java @@ -1,8 +1,7 @@ package com.win.module.wms.service.putawayJob; - import java.util.*; import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.putawayJob.vo.PutawayJobDetailCreateReqVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobDetailExportReqVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobDetailPageReqVO; @@ -25,6 +24,15 @@ public interface PutawayJobDetailService { */ Long createPutawayJobDetail(@Valid PutawayJobDetailCreateReqVO createReqVO); + + /** + * 获得用高级搜索上架任务子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPutawayJobDetailSenior(CustomConditions conditions); + /** * 更新上架任务子 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobDetailServiceImpl.java index d0c53511..1b5db3fc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.putawayJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.putawayJob.vo.PutawayJobDetailCreateReqVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobDetailExportReqVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobDetailPageReqVO; @@ -48,7 +49,10 @@ public class PutawayJobDetailServiceImpl implements PutawayJobDetailService { PutawayJobDetailDO updateObj = PutawayJobDetailConvert.INSTANCE.convert(updateReqVO); putawayJobDetailMapper.updateById(updateObj); } - + @Override + public PageResult getPutawayJobDetailSenior(CustomConditions conditions) { + return putawayJobDetailMapper.selectSenior(conditions); + } @Override public void deletePutawayJobDetail(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainService.java index 7c852e8c..c9363131 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.putawayJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainCreateReqVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainExportReqVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainPageReqVO; @@ -25,6 +26,14 @@ public interface PutawayJobMainService { */ Long createPutawayJobMain(@Valid PutawayJobMainCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPutawayJobMainSenior(CustomConditions conditions); + /** * 更新上架任务主 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java index 3de7cf41..3fc34132 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java @@ -1,11 +1,11 @@ package com.win.module.wms.service.putawayJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainCreateReqVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainExportReqVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainPageReqVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainUpdateReqVO; -import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -41,7 +41,10 @@ public class PutawayJobMainServiceImpl implements PutawayJobMainService { // 返回 return putawayJobMain.getId(); } - + @Override + public PageResult getPutawayJobMainSenior(CustomConditions conditions) { + return putawayJobMainMapper.selectSenior(conditions); + } @Override public void updatePutawayJobMain(PutawayJobMainUpdateReqVO updateReqVO) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordDetailService.java index 55595421..98d53c4b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.putawayRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordDetailCreateReqVO; import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordDetailExportReqVO; import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordDetailPageReqVO; @@ -31,7 +32,13 @@ public interface PutawayRecordDetailService { * @param updateReqVO 更新信息 */ void updatePutawayRecordDetail(@Valid PutawayRecordDetailUpdateReqVO updateReqVO); - + /** + * 获得用高级搜索上架记录子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPutawayRecordDetailSenior(CustomConditions conditions); /** * 删除上架记录子 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordDetailServiceImpl.java index 2d5f0ad6..d4fa3acd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.putawayRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordDetailCreateReqVO; import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordDetailExportReqVO; import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordDetailPageReqVO; @@ -82,5 +83,8 @@ public class PutawayRecordDetailServiceImpl implements PutawayRecordDetailServic public List getPutawayRecordDetailList(PutawayRecordDetailExportReqVO exportReqVO) { return putawayRecordDetailMapper.selectList(exportReqVO); } - + @Override + public PageResult getPutawayRecordDetailSenior(CustomConditions conditions) { + return putawayRecordDetailMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordMainService.java index bf7c75a9..1ad10d4f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.putawayRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordMainCreateReqVO; import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordMainExportReqVO; import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordMainPageReqVO; @@ -25,6 +26,15 @@ public interface PutawayRecordMainService { */ Long createPutawayRecordMain(@Valid PutawayRecordMainCreateReqVO createReqVO); + + /** + * 获得用高级搜索上架记录主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPutawayRecordMainSenior(CustomConditions conditions); + /** * 更新上架记录主 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordMainServiceImpl.java index 162ceb03..8fd7b30d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.putawayRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordMainCreateReqVO; import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordMainExportReqVO; import com.win.module.wms.controller.putawayRecord.vo.PutawayRecordMainPageReqVO; @@ -62,7 +63,10 @@ public class PutawayRecordMainServiceImpl implements PutawayRecordMainService { throw exception(PUTAWAY_RECORD_MAIN_NOT_EXISTS); } } - + @Override + public PageResult getPutawayRecordMainSenior(CustomConditions conditions) { + return putawayRecordMainMapper.selectSenior(conditions); + } @Override public PutawayRecordMainDO getPutawayRecordMain(Long id) { return putawayRecordMainMapper.selectById(id); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestDetailService.java index d563dd49..18db412a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.putawayRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestDetailCreateReqVO; import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestDetailExportReqVO; import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestDetailPageReqVO; @@ -31,6 +32,13 @@ public interface PutawayRequestDetailService { * @param updateReqVO 更新信息 */ void updatePutawayRequestDetail(@Valid PutawayRequestDetailUpdateReqVO updateReqVO); + /** + * 获得用高级搜索上架申请子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPutawayRequestDetailSenior(CustomConditions conditions); /** * 删除上架申请子 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestDetailServiceImpl.java index fb8bdcf8..457a59d1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.putawayRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestDetailCreateReqVO; import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestDetailExportReqVO; import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestDetailPageReqVO; @@ -7,15 +8,11 @@ import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestDetailUpdat import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; - import java.util.*; - import com.win.module.wms.dal.dataobject.putawayRequest.PutawayRequestDetailDO; import com.win.framework.common.pojo.PageResult; - import com.win.module.wms.convert.putawayRequest.PutawayRequestDetailConvert; import com.win.module.wms.dal.mysql.putawayRequest.PutawayRequestDetailMapper; - import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.module.wms.enums.ErrorCodeConstants.*; @@ -39,7 +36,10 @@ public class PutawayRequestDetailServiceImpl implements PutawayRequestDetailServ // 返回 return putawayRequestDetail.getId(); } - + @Override + public PageResult getPutawayRequestDetailSenior(CustomConditions conditions) { + return putawayRequestDetailMapper.selectSenior(conditions); + } @Override public void updatePutawayRequestDetail(PutawayRequestDetailUpdateReqVO updateReqVO) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainService.java index 0739b7f2..ec601c6e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainService.java @@ -1,8 +1,7 @@ package com.win.module.wms.service.putawayRequest; - import java.util.*; import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestMainCreateReqVO; import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestMainExportReqVO; import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestMainPageReqVO; @@ -47,6 +46,14 @@ public interface PutawayRequestMainService { */ PutawayRequestMainDO getPutawayRequestMain(Long id); + /** + * 获得用高级搜索上架申请主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPutawayRequestMainSenior(CustomConditions conditions); + /** * 获得上架申请主列表 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java index 5814f5fb..46f34c0c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.putawayRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestMainCreateReqVO; import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestMainExportReqVO; import com.win.module.wms.controller.putawayRequest.vo.PutawayRequestMainPageReqVO; @@ -68,6 +69,10 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService return putawayRequestMainMapper.selectById(id); } + @Override + public PageResult getPutawayRequestMainSenior(CustomConditions conditions) { + return putawayRequestMainMapper.selectSenior(conditions); + } @Override public List getPutawayRequestMainList(Collection ids) { return putawayRequestMainMapper.selectBatchIds(ids); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/recordsetting/RecordsettingService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/recordsetting/RecordsettingService.java index 81cd89da..a28f515e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/recordsetting/RecordsettingService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/recordsetting/RecordsettingService.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.recordsetting; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.recordsetting.vo.*; import com.win.module.wms.dal.dataobject.recordsetting.RecordsettingDO; @@ -30,6 +31,14 @@ public interface RecordsettingService { */ void updateRecordsetting(@Valid RecordsettingUpdateReqVO updateReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getRecordsettingSenior(CustomConditions conditions); + /** * 删除记录设置 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/recordsetting/RecordsettingServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/recordsetting/RecordsettingServiceImpl.java index 1509dac3..0bc372c3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/recordsetting/RecordsettingServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/recordsetting/RecordsettingServiceImpl.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.recordsetting.vo.*; @@ -63,6 +64,12 @@ public class RecordsettingServiceImpl implements RecordsettingService { recordsettingMapper.deleteById(id); } + + @Override + public PageResult getRecordsettingSenior(CustomConditions conditions) { + return recordsettingMapper.selectSenior(conditions); + } + @Override public RecordsettingDO getRecordsetting(Long id) { return recordsettingMapper.selectById(id); @@ -91,24 +98,45 @@ public class RecordsettingServiceImpl implements RecordsettingService { List errorList = new ArrayList<>(); recordsettings.forEach(recordsetting -> { // 校验，判断是否有不符合的原因 - try { - if(mode != null){ - validateRecordsettingForCreateOrUpdate(null,recordsetting.getCode(),recordsetting.getInterfaceType(),recordsetting.getAvailable()); + String massage = ""; + if(mode != null) { + try { + validateRecordsettingExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCodeExists(null, recordsetting.getCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateInterfaceTypeExists(recordsetting.getInterfaceType()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(recordsetting.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + if (StrUtil.isNotEmpty(massage)) { + massage.substring(0, massage.length() - 1); + errorList.add(recordsetting); + } + if (errorList == null) { + + // 判断如果不存在，在进行插入 + OwnerDO existConfigurationSetting = null; + if (existConfigurationSetting == null && mode != 3) { + recordsettingMapper.insert(RecordsettingConvert.INSTANCE.convert(recordsetting)); + } else if (existConfigurationSetting != null && mode != 2) {// 如果存在，判断是否允许更新 + RecordsettingDO recordsettingDo = RecordsettingConvert.INSTANCE.convert(recordsetting); + recordsettingDo.setId(existConfigurationSetting.getId()); + recordsettingMapper.updateById(recordsettingDo); + } + } } - } catch (ServiceException ex) { - errorList.add(recordsetting); - return; - } - // 判断如果不存在，在进行插入 - OwnerDO existConfigurationSetting = null; - if (existConfigurationSetting == null&& mode != 3) { - recordsettingMapper.insert(RecordsettingConvert.INSTANCE.convert(recordsetting)); - } - else if (existConfigurationSetting != null && mode != 2) {// 如果存在，判断是否允许更新 - RecordsettingDO recordsettingDo = RecordsettingConvert.INSTANCE.convert(recordsetting); - recordsettingDo.setId(existConfigurationSetting.getId()); - recordsettingMapper.updateById(recordsettingDo); - } }); //错误不为空并非部分更新，手工回滚 if(!errorList.isEmpty() && !updatePart) { @@ -123,7 +151,6 @@ public class RecordsettingServiceImpl implements RecordsettingService { validateCodeExists(id,code); validateInterfaceTypeExists(interfaceType); validateAvailableExists(available); - }); } private void validateRecordsettingExists(Long id) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobDetailService.java index 36b5e44a..0480296e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.repleinshJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.repleinshJob.vo.RepleinshJobDetailCreateReqVO; import com.win.module.wms.controller.repleinshJob.vo.RepleinshJobDetailExportReqVO; import com.win.module.wms.controller.repleinshJob.vo.RepleinshJobDetailPageReqVO; @@ -24,6 +25,13 @@ public interface RepleinshJobDetailService { * @return 编号 */ Long createRepleinshJobDetail(@Valid RepleinshJobDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索补料任务子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getRepleinshJobDetailSenior(CustomConditions conditions); /** * 更新补料任务子 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobDetailServiceImpl.java index 07e3597f..885d8d23 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.repleinshJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.repleinshJob.vo.RepleinshJobDetailCreateReqVO; import com.win.module.wms.controller.repleinshJob.vo.RepleinshJobDetailExportReqVO; import com.win.module.wms.controller.repleinshJob.vo.RepleinshJobDetailPageReqVO; @@ -7,15 +8,11 @@ import com.win.module.wms.controller.repleinshJob.vo.RepleinshJobDetailUpdateReq import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; - import java.util.*; - import com.win.module.wms.dal.dataobject.repleinshJob.RepleinshJobDetailDO; import com.win.framework.common.pojo.PageResult; - import com.win.module.wms.convert.repleinshJob.RepleinshJobDetailConvert; import com.win.module.wms.dal.mysql.repleinshJob.RepleinshJobDetailMapper; - import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.module.wms.enums.ErrorCodeConstants.*; @@ -62,7 +59,10 @@ public class RepleinshJobDetailServiceImpl implements RepleinshJobDetailService throw exception(REPLEINSH_JOB_DETAIL_NOT_EXISTS); } } - + @Override + public PageResult getRepleinshJobDetailSenior(CustomConditions conditions) { + return repleinshJobDetailMapper.selectSenior(conditions); + } @Override public RepleinshJobDetailDO getRepleinshJobDetail(Long id) { return repleinshJobDetailMapper.selectById(id); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainService.java index 7248c847..69ce6e55 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.repleinshJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.repleinshJob.vo.RepleinshJobMainCreateReqVO; import com.win.module.wms.controller.repleinshJob.vo.RepleinshJobMainExportReqVO; import com.win.module.wms.controller.repleinshJob.vo.RepleinshJobMainPageReqVO; @@ -25,6 +26,15 @@ public interface RepleinshJobMainService { */ Long createRepleinshJobMain(@Valid RepleinshJobMainCreateReqVO createReqVO); + + /** + * 获得用高级搜索补料任务主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getRepleinshJobMainSenior(CustomConditions conditions); + /** * 更新补料任务主 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainServiceImpl.java index 4ce95608..ffd92fca 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainServiceImpl.java @@ -1,11 +1,11 @@ package com.win.module.wms.service.repleinshJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.repleinshJob.vo.RepleinshJobMainCreateReqVO; import com.win.module.wms.controller.repleinshJob.vo.RepleinshJobMainExportReqVO; import com.win.module.wms.controller.repleinshJob.vo.RepleinshJobMainPageReqVO; import com.win.module.wms.controller.repleinshJob.vo.RepleinshJobMainUpdateReqVO; -import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -64,6 +64,10 @@ public class RepleinshJobMainServiceImpl implements RepleinshJobMainService { throw exception(REPLEINSH_JOB_MAIN_NOT_EXISTS); } } + @Override + public PageResult getRepleinshJobMainSenior(CustomConditions conditions) { + return repleinshJobMainMapper.selectSenior(conditions); + } @Override public RepleinshJobMainDO getRepleinshJobMain(Long id) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordDetailService.java index 9c74e003..54cbae3e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.repleinshRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.repleinshRecord.vo.RepleinshRecordDetailCreateReqVO; import com.win.module.wms.controller.repleinshRecord.vo.RepleinshRecordDetailExportReqVO; import com.win.module.wms.controller.repleinshRecord.vo.RepleinshRecordDetailPageReqVO; @@ -32,6 +33,14 @@ public interface RepleinshRecordDetailService { */ void updateRepleinshRecordDetail(@Valid RepleinshRecordDetailUpdateReqVO updateReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getRepleinshRecordDetailSenior(CustomConditions conditions); + /** * 删除补料记录子 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordDetailServiceImpl.java index 2e4e2066..e370b889 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.repleinshRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.repleinshRecord.vo.RepleinshRecordDetailCreateReqVO; import com.win.module.wms.controller.repleinshRecord.vo.RepleinshRecordDetailExportReqVO; import com.win.module.wms.controller.repleinshRecord.vo.RepleinshRecordDetailPageReqVO; @@ -48,7 +49,10 @@ public class RepleinshRecordDetailServiceImpl implements RepleinshRecordDetailSe RepleinshRecordDetailDO updateObj = RepleinshRecordDetailConvert.INSTANCE.convert(updateReqVO); repleinshRecordDetailMapper.updateById(updateObj); } - + @Override + public PageResult getRepleinshRecordDetailSenior(CustomConditions conditions) { + return repleinshRecordDetailMapper.selectSenior(conditions); + } @Override public void deleteRepleinshRecordDetail(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordMainService.java index 5a2464b9..2569013b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.repleinshRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.repleinshRecord.vo.RepleinshRecordMainCreateReqVO; import com.win.module.wms.controller.repleinshRecord.vo.RepleinshRecordMainExportReqVO; import com.win.module.wms.controller.repleinshRecord.vo.RepleinshRecordMainPageReqVO; @@ -24,6 +25,13 @@ public interface RepleinshRecordMainService { * @return 编号 */ Long createRepleinshRecordMain(@Valid RepleinshRecordMainCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getRepleinshRecordMainSenior(CustomConditions conditions); /** * 更新补料记录主 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordMainServiceImpl.java index d1db0028..51cadc5b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.repleinshRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.repleinshRecord.vo.RepleinshRecordMainCreateReqVO; import com.win.module.wms.controller.repleinshRecord.vo.RepleinshRecordMainExportReqVO; import com.win.module.wms.controller.repleinshRecord.vo.RepleinshRecordMainPageReqVO; @@ -39,7 +40,10 @@ public class RepleinshRecordMainServiceImpl implements RepleinshRecordMainServic // 返回 return repleinshRecordMain.getId(); } - + @Override + public PageResult getRepleinshRecordMainSenior(CustomConditions conditions) { + return repleinshRecordMainMapper.selectSenior(conditions); + } @Override public void updateRepleinshRecordMain(RepleinshRecordMainUpdateReqVO updateReqVO) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRequest/RepleinshRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRequest/RepleinshRequestDetailService.java index d82ff9b6..9c3ff69c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRequest/RepleinshRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRequest/RepleinshRequestDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.repleinshRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.repleinshRequest.vo.RepleinshRequestDetailCreateReqVO; import com.win.module.wms.controller.repleinshRequest.vo.RepleinshRequestDetailExportReqVO; import com.win.module.wms.controller.repleinshRequest.vo.RepleinshRequestDetailPageReqVO; @@ -24,7 +25,13 @@ public interface RepleinshRequestDetailService { * @return 编号 */ Long createRepleinshRequestDetail(@Valid RepleinshRequestDetailCreateReqVO createReqVO); - + /** + * 获得用高级搜索补料申请子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getRepleinshRequestDetailSenior(CustomConditions conditions); /** * 更新补料申请子 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRequest/RepleinshRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRequest/RepleinshRequestDetailServiceImpl.java index 3ef468bf..a0abfa17 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRequest/RepleinshRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRequest/RepleinshRequestDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.repleinshRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.repleinshRequest.vo.RepleinshRequestDetailCreateReqVO; import com.win.module.wms.controller.repleinshRequest.vo.RepleinshRequestDetailExportReqVO; import com.win.module.wms.controller.repleinshRequest.vo.RepleinshRequestDetailPageReqVO; @@ -49,6 +50,11 @@ public class RepleinshRequestDetailServiceImpl implements RepleinshRequestDetail repleinshRequestDetailMapper.updateById(updateObj); } + @Override + public PageResult getRepleinshRequestDetailSenior(CustomConditions conditions) { + return repleinshRequestDetailMapper.selectSenior(conditions); + } + @Override public void deleteRepleinshRequestDetail(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRequest/RepleinshRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRequest/RepleinshRequestMainService.java index bb4b37be..d3441259 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRequest/RepleinshRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRequest/RepleinshRequestMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.repleinshRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.repleinshRequest.vo.RepleinshRequestMainCreateReqVO; import com.win.module.wms.controller.repleinshRequest.vo.RepleinshRequestMainExportReqVO; import com.win.module.wms.controller.repleinshRequest.vo.RepleinshRequestMainPageReqVO; @@ -24,6 +25,13 @@ public interface RepleinshRequestMainService { * @return 编号 */ Long createRepleinshRequestMain(@Valid RepleinshRequestMainCreateReqVO createReqVO); + /** + * 获得用高级搜索补料申请主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getRepleinshRequestMainSenior(CustomConditions conditions); /** * 更新补料申请主 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/requestsetting/RequestsettingService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/requestsetting/RequestsettingService.java index 0803b1df..e2233256 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/requestsetting/RequestsettingService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/requestsetting/RequestsettingService.java @@ -1,9 +1,8 @@ package com.win.module.wms.service.requestsetting; - +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.requestsetting.vo.*; import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO; - import javax.validation.Valid; import java.util.Collection; import java.util.List; @@ -22,6 +21,13 @@ public interface RequestsettingService { * @return 编号 */ Long createRequestsetting(@Valid RequestsettingCreateReqVO createReqVO); + /** + * 获得用高级搜索申请设置分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getRequestsettingSenior(CustomConditions conditions); /** * 更新申请设置 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/requestsetting/RequestsettingServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/requestsetting/RequestsettingServiceImpl.java index 4a3b8c5f..eb409fbb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/requestsetting/RequestsettingServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/requestsetting/RequestsettingServiceImpl.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.requestsetting.vo.*; @@ -46,6 +47,10 @@ public class RequestsettingServiceImpl implements RequestsettingService { // 返回 return requestsetting.getId(); } + @Override + public PageResult getRequestsettingSenior(CustomConditions conditions) { + return requestsettingMapper.selectSenior(conditions); + } @Override public void updateRequestsetting(RequestsettingUpdateReqVO updateReqVO) { @@ -93,25 +98,65 @@ public class RequestsettingServiceImpl implements RequestsettingService { List errorList = new ArrayList<>(); requestsettings.forEach(requestsetting -> { // 校验，判断是否有不符合的原因 - try { - if(mode != null){ - validateRecordsettingForCreateOrUpdate(null,requestsetting.getCode(),requestsetting.getRequestMode(),requestsetting.getAutoCommit() - ,requestsetting.getAutoAgree(),requestsetting.getAutoExecute(),requestsetting.getDirectCreateRecord(),requestsetting.getAvailable()); + + if(mode != null) { + String massage = ""; + try { + validateRequestsettingExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCodeExists(null, requestsetting.getCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateRequestModeExists(requestsetting.getRequestMode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAutoCommitExists(requestsetting.getAutoCommit()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAutoAgreeExists(requestsetting.getAutoAgree()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAutoExecuteExists(requestsetting.getAutoExecute()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateDirectCreateRecordExists(requestsetting.getDirectCreateRecord()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(requestsetting.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + if (StrUtil.isNotEmpty(massage)) { + massage.substring(0, massage.length() - 1); + errorList.add(requestsetting); + } + if (errorList == null) { + // 判断如果不存在，在进行插入 + OwnerDO existConfigurationSetting = null; + if (existConfigurationSetting == null && mode != 3) { + requestsettingMapper.insert(RequestsettingConvert.INSTANCE.convert(requestsetting)); + } else if (existConfigurationSetting != null && mode != 2) {// 如果存在，判断是否允许更新 + RequestsettingDO requestsettingDo = RequestsettingConvert.INSTANCE.convert(requestsetting); + requestsettingDo.setId(existConfigurationSetting.getId()); + requestsettingMapper.updateById(requestsettingDo); + } + } } - } catch (ServiceException ex) { - errorList.add(requestsetting); - return; - } - // 判断如果不存在，在进行插入 - OwnerDO existConfigurationSetting = null; - if (existConfigurationSetting == null&& mode != 3) { - requestsettingMapper.insert(RequestsettingConvert.INSTANCE.convert(requestsetting)); - } - else if (existConfigurationSetting != null && mode != 2) {// 如果存在，判断是否允许更新 - RequestsettingDO requestsettingDo = RequestsettingConvert.INSTANCE.convert(requestsetting); - requestsettingDo.setId(existConfigurationSetting.getId()); - requestsettingMapper.updateById(requestsettingDo); - } }); //错误不为空并非部分更新，手工回滚 if(!errorList.isEmpty() && !updatePart) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleService.java index 460cc3bb..f947c9e1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleService.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.rule; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.rule.vo.RuleCreateReqVO; import com.win.module.wms.controller.rule.vo.RulePageReqVO; @@ -25,6 +26,13 @@ public interface RuleService { * @return 编号 */ Long createRule(@Valid RuleCreateReqVO createReqVO); + /** + * 获得用高级搜索规则分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getRuleSenior(CustomConditions conditions); /** * 更新规则 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleServiceImpl.java index 9877625e..2fc42fc7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.google.common.annotations.VisibleForTesting; +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.rule.vo.RuleCreateReqVO; @@ -62,6 +63,11 @@ public class RuleServiceImpl implements RuleService { // 删除 ruleMapper.deleteById(id); } + @Override + public PageResult getRuleSenior(CustomConditions conditions) { + return ruleMapper.selectSenior(conditions); + } + @Override public RuleDO getRule(Long id) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleDetailService.java index e0113b04..e13d27fd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.sale; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.sale.vo.SaleDetailCreateReqVO; import com.win.module.wms.controller.sale.vo.SaleDetailExportReqVO; import com.win.module.wms.controller.sale.vo.SaleDetailPageReqVO; @@ -24,7 +25,13 @@ public interface SaleDetailService { * @return 编号 */ Long createSaleDetail(@Valid SaleDetailCreateReqVO createReqVO); - + /** + * 获得用高级搜索销售订单子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getSaleDetailSenior(CustomConditions conditions); /** * 更新销售订单子 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleDetailServiceImpl.java index da2b4565..66bf8e1a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.sale; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.sale.vo.SaleDetailCreateReqVO; import com.win.module.wms.controller.sale.vo.SaleDetailExportReqVO; import com.win.module.wms.controller.sale.vo.SaleDetailPageReqVO; @@ -49,6 +50,12 @@ public class SaleDetailServiceImpl implements SaleDetailService { saleDetailMapper.updateById(updateObj); } + @Override + public PageResult getSaleDetailSenior(CustomConditions conditions) { + return saleDetailMapper.selectSenior(conditions); + } + + @Override public void deleteSaleDetail(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleMainService.java index b0a8b3a7..09dd04d1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.sale; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.sale.vo.SaleMainCreateReqVO; import com.win.module.wms.controller.sale.vo.SaleMainExportReqVO; import com.win.module.wms.controller.sale.vo.SaleMainPageReqVO; @@ -25,6 +26,13 @@ public interface SaleMainService { * @return 编号 */ Long createSaleMain(@Valid SaleMainCreateReqVO createReqVO); + /** + * 获得用高级搜索销售订单主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getSaleMainSenior(CustomConditions conditions); /** * 更新销售订单主 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleMainServiceImpl.java index 54800ac1..193d3a68 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleMainServiceImpl.java @@ -1,6 +1,7 @@ package com.win.module.wms.service.sale; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.sale.vo.SaleMainCreateReqVO; import com.win.module.wms.controller.sale.vo.SaleMainExportReqVO; import com.win.module.wms.controller.sale.vo.SaleMainPageReqVO; @@ -43,6 +44,10 @@ public class SaleMainServiceImpl implements SaleMainService { // 返回 return saleMain.getId(); } + @Override + public PageResult getSaleMainSenior(CustomConditions conditions) { + return saleMainMapper.selectSenior(conditions); + } @Override public void updateSaleMain(SaleMainUpdateReqVO updateReqVO) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/saleprice/SalepriceService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/saleprice/SalepriceService.java index ec21591c..088f728b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/saleprice/SalepriceService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/saleprice/SalepriceService.java @@ -3,11 +3,11 @@ package com.win.module.wms.service.saleprice; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.saleprice.vo.SalepriceCreateReqVO; import com.win.module.wms.controller.saleprice.vo.SalepriceExportReqVO; import com.win.module.wms.controller.saleprice.vo.SalepricePageReqVO; import com.win.module.wms.controller.saleprice.vo.*; -import com.win.module.wms.controller.shift.vo.ShiftImportExcelVo; import com.win.module.wms.dal.dataobject.saleprice.SalepriceDO; import com.win.framework.common.pojo.PageResult; @@ -25,6 +25,13 @@ public interface SalepriceService { * @return 编号 */ Long createSaleprice(@Valid SalepriceCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getSalepriceSenior(CustomConditions conditions); /** * 更新销售价格单 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/saleprice/SalepriceServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/saleprice/SalepriceServiceImpl.java index 53a3a9c6..8893a042 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/saleprice/SalepriceServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/saleprice/SalepriceServiceImpl.java @@ -5,11 +5,12 @@ 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.saleprice.vo.*; import com.win.module.wms.convert.saleprice.SalepriceConvert; -import com.win.module.wms.dal.dataobject.itempackaging.ItempackagingDO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.saleprice.SalepriceDO; import com.win.module.wms.dal.mysql.saleprice.SalepriceMapper; import org.springframework.stereotype.Service; @@ -46,7 +47,10 @@ public class SalepriceServiceImpl implements SalepriceService { // 返回 return saleprice.getId(); } - + @Override + public PageResult getSalepriceSenior(CustomConditions conditions) { + return salepriceMapper.selectSenior(conditions); + } @Override public void updateSaleprice(SalepriceUpdateReqVO updateReqVO) { // 校验存在 @@ -91,24 +95,55 @@ public class SalepriceServiceImpl implements SalepriceService { List errorList = new ArrayList<>(); saleprices.forEach(saleprice -> { // 校验，判断是否有不符合的原因 - try { + String massage = ""; if (mode != null) { - validateSalepriceForCreateOrUpdate(null, saleprice.getCustomerCode(), saleprice.getItemCode(), saleprice.getCurrency(), saleprice.getPrice(), saleprice.getAvailable()); + try { + validateSalepriceExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCodeExists(null, saleprice.getItemCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCustomerCodeExists(saleprice.getCustomerCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCurrencyExists(saleprice.getCurrency()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validatePriceExists(saleprice.getPrice()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(saleprice.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + if (StrUtil.isNotEmpty(massage)) { + massage.substring(0, massage.length() - 1); + errorList.add(saleprice); + } + if (errorList == null) { + + // 判断如果不存在，在进行插入 + SalepriceDO existSaleprice = salepriceMapper.selectByItemCode(saleprice.getItemCode()); + if (existSaleprice == null && mode != 3) { + salepriceMapper.insert(SalepriceConvert.INSTANCE.convert(saleprice)); + } else if (existSaleprice != null && mode != 2) {// 如果存在，判断是否允许更新 + SalepriceDO salepriceDO = SalepriceConvert.INSTANCE.convert(saleprice); + salepriceDO.setId(existSaleprice.getId()); + salepriceMapper.updateById(salepriceDO); + } + } } - } catch (ServiceException ex) { - errorList.add(saleprice); - return; - } - - // 判断如果不存在，在进行插入 - SalepriceDO existSaleprice = salepriceMapper.selectByItemCode(saleprice.getItemCode()); - if (existSaleprice == null && mode != 3) { - salepriceMapper.insert(SalepriceConvert.INSTANCE.convert(saleprice)); - } else if (existSaleprice != null && mode != 2) {// 如果存在，判断是否允许更新 - SalepriceDO salepriceDO = SalepriceConvert.INSTANCE.convert(saleprice); - salepriceDO.setId(existSaleprice.getId()); - salepriceMapper.updateById(salepriceDO); - } }); //错误不为空并非部分更新，手工回滚 if (!errorList.isEmpty() && !updatePart) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobDetailService.java index 290efde0..e7710a21 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.scrapJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.scrapJob.vo.ScrapJobDetailCreateReqVO; import com.win.module.wms.controller.scrapJob.vo.ScrapJobDetailExportReqVO; import com.win.module.wms.controller.scrapJob.vo.ScrapJobDetailPageReqVO; @@ -24,6 +25,13 @@ public interface ScrapJobDetailService { * @return 编号 */ Long createScrapJobDetail(@Valid ScrapJobDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索报废出库任务子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getScrapJobDetailSenior(CustomConditions conditions); /** * 更新报废出库任务子 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobDetailServiceImpl.java index eea95ea6..abc67aae 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.scrapJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.scrapJob.vo.ScrapJobDetailCreateReqVO; import com.win.module.wms.controller.scrapJob.vo.ScrapJobDetailExportReqVO; import com.win.module.wms.controller.scrapJob.vo.ScrapJobDetailPageReqVO; @@ -39,7 +40,10 @@ public class ScrapJobDetailServiceImpl implements ScrapJobDetailService { // 返回 return scrapJobDetail.getId(); } - + @Override + public PageResult getScrapJobDetailSenior(CustomConditions conditions) { + return scrapJobDetailMapper.selectSenior(conditions); + } @Override public void updateScrapJobDetail(ScrapJobDetailUpdateReqVO updateReqVO) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainService.java index ee4088c5..a9472f91 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.scrapJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.scrapJob.vo.ScrapJobMainCreateReqVO; import com.win.module.wms.controller.scrapJob.vo.ScrapJobMainExportReqVO; import com.win.module.wms.controller.scrapJob.vo.ScrapJobMainPageReqVO; @@ -24,6 +25,13 @@ public interface ScrapJobMainService { * @return 编号 */ Long createScrapJobMain(@Valid ScrapJobMainCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getScrapJobMainSenior(CustomConditions conditions); /** * 更新报废出库任务主 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainServiceImpl.java index d1322de0..7a5db239 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainServiceImpl.java @@ -1,11 +1,11 @@ package com.win.module.wms.service.scrapJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.scrapJob.vo.ScrapJobMainCreateReqVO; import com.win.module.wms.controller.scrapJob.vo.ScrapJobMainExportReqVO; import com.win.module.wms.controller.scrapJob.vo.ScrapJobMainPageReqVO; import com.win.module.wms.controller.scrapJob.vo.ScrapJobMainUpdateReqVO; -import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -51,6 +51,11 @@ public class ScrapJobMainServiceImpl implements ScrapJobMainService { scrapJobMainMapper.updateById(updateObj); } + @Override + public PageResult getScrapJobMainSenior(CustomConditions conditions) { + return scrapJobMainMapper.selectSenior(conditions); + } + @Override public void deleteScrapJobMain(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordDetailService.java index 77aaeae3..8de8aa83 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.scrapRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.scrapRecord.vo.ScrapRecordDetailCreateReqVO; import com.win.module.wms.controller.scrapRecord.vo.ScrapRecordDetailExportReqVO; import com.win.module.wms.controller.scrapRecord.vo.ScrapRecordDetailPageReqVO; @@ -32,6 +33,14 @@ public interface ScrapRecordDetailService { */ void updateScrapRecordDetail(@Valid ScrapRecordDetailUpdateReqVO updateReqVO); + /** + * 获得用高级搜索报废出库记录子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getScrapRecordDetailSenior(CustomConditions conditions); + /** * 删除报废出库记录子 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordDetailServiceImpl.java index b8b23990..dc1aacab 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.scrapRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.scrapRecord.vo.ScrapRecordDetailCreateReqVO; import com.win.module.wms.controller.scrapRecord.vo.ScrapRecordDetailExportReqVO; import com.win.module.wms.controller.scrapRecord.vo.ScrapRecordDetailPageReqVO; @@ -56,7 +57,10 @@ public class ScrapRecordDetailServiceImpl implements ScrapRecordDetailService { // 删除 scrapRecordDetailMapper.deleteById(id); } - + @Override + public PageResult getScrapRecordDetailSenior(CustomConditions conditions) { + return scrapRecordDetailMapper.selectSenior(conditions); + } private void validateScrapRecordDetailExists(Long id) { if (scrapRecordDetailMapper.selectById(id) == null) { throw exception(SCRAP_RECORD_DETAIL_NOT_EXISTS); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordMainService.java index fed450cd..8008cfca 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.scrapRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.scrapRecord.vo.ScrapRecordMainCreateReqVO; import com.win.module.wms.controller.scrapRecord.vo.ScrapRecordMainExportReqVO; import com.win.module.wms.controller.scrapRecord.vo.ScrapRecordMainPageReqVO; @@ -24,6 +25,13 @@ public interface ScrapRecordMainService { * @return 编号 */ String createScrapRecordMain(@Valid ScrapRecordMainCreateReqVO createReqVO); + /** + * 获得用高级搜索报废出库记录主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getScrapRecordMainSenior(CustomConditions conditions); /** * 更新报废出库记录主 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordMainServiceImpl.java index fb1e8c73..ffa916b7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.scrapRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.scrapRecord.vo.ScrapRecordMainCreateReqVO; import com.win.module.wms.controller.scrapRecord.vo.ScrapRecordMainExportReqVO; import com.win.module.wms.controller.scrapRecord.vo.ScrapRecordMainPageReqVO; @@ -49,6 +50,11 @@ public class ScrapRecordMainServiceImpl implements ScrapRecordMainService { scrapRecordMainMapper.updateById(updateObj); } + @Override + public PageResult getScrapRecordMainSenior(CustomConditions conditions) { + return scrapRecordMainMapper.selectSenior(conditions); + } + @Override public void deleteScrapRecordMain(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestDetailService.java index d0d98542..805f8262 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestDetailService.java @@ -1,8 +1,7 @@ package com.win.module.wms.service.scrapRequest; - import java.util.*; import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.scrapRequest.vo.ScrapRequestDetailCreateReqVO; import com.win.module.wms.controller.scrapRequest.vo.ScrapRequestDetailExportReqVO; import com.win.module.wms.controller.scrapRequest.vo.ScrapRequestDetailPageReqVO; @@ -31,6 +30,13 @@ public interface ScrapRequestDetailService { * @param updateReqVO 更新信息 */ void updateScrapRequestDetail(@Valid ScrapRequestDetailUpdateReqVO updateReqVO); + /** + * 获得用高级搜索报废出库申请子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getScrapRequestDetailSenior(CustomConditions conditions); /** * 删除报废出库申请子 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestDetailServiceImpl.java index e4cd2711..ca266e47 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.scrapRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.scrapRequest.vo.ScrapRequestDetailCreateReqVO; import com.win.module.wms.controller.scrapRequest.vo.ScrapRequestDetailExportReqVO; import com.win.module.wms.controller.scrapRequest.vo.ScrapRequestDetailPageReqVO; @@ -7,15 +8,11 @@ import com.win.module.wms.controller.scrapRequest.vo.ScrapRequestDetailUpdateReq import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; - import java.util.*; - import com.win.module.wms.dal.dataobject.scrapRequest.ScrapRequestDetailDO; import com.win.framework.common.pojo.PageResult; - import com.win.module.wms.convert.scrapRequest.ScrapRequestDetailConvert; import com.win.module.wms.dal.mysql.scrapRequest.ScrapRequestDetailMapper; - import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.module.wms.enums.ErrorCodeConstants.*; @@ -49,6 +46,11 @@ public class ScrapRequestDetailServiceImpl implements ScrapRequestDetailService scrapRequestDetailMapper.updateById(updateObj); } + @Override + public PageResult getScrapRequestDetailSenior(CustomConditions conditions) { + return scrapRequestDetailMapper.selectSenior(conditions); + } + @Override public void deleteScrapRequestDetail(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestMainService.java index 818e05e1..1803507a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.scrapRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.scrapRequest.vo.ScrapRequestMainCreateReqVO; import com.win.module.wms.controller.scrapRequest.vo.ScrapRequestMainExportReqVO; import com.win.module.wms.controller.scrapRequest.vo.ScrapRequestMainPageReqVO; @@ -25,6 +26,15 @@ public interface ScrapRequestMainService { */ Long createScrapRequestMain(@Valid ScrapRequestMainCreateReqVO createReqVO); + + /** + * 获得用高级搜索报废出库申请主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getScrapRequestMainSenior(CustomConditions conditions); + /** * 更新报废出库申请主 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestMainServiceImpl.java index 04a89170..a58af87f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.scrapRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.scrapRequest.vo.ScrapRequestMainCreateReqVO; import com.win.module.wms.controller.scrapRequest.vo.ScrapRequestMainExportReqVO; import com.win.module.wms.controller.scrapRequest.vo.ScrapRequestMainPageReqVO; @@ -48,7 +49,10 @@ public class ScrapRequestMainServiceImpl implements ScrapRequestMainService { ScrapRequestMainDO updateObj = ScrapRequestMainConvert.INSTANCE.convert(updateReqVO); scrapRequestMainMapper.updateById(updateObj); } - + @Override + public PageResult getScrapRequestMainSenior(CustomConditions conditions) { + return scrapRequestMainMapper.selectSenior(conditions); + } @Override public void deleteScrapRequestMain(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/shift/ShiftService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/shift/ShiftService.java index c16d5f6e..9311496c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/shift/ShiftService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/shift/ShiftService.java @@ -3,8 +3,8 @@ package com.win.module.wms.service.shift; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.shift.vo.*; -import com.win.module.wms.controller.supplier.vo.SupplierImportExcelVo; import com.win.module.wms.dal.dataobject.shift.ShiftDO; import com.win.framework.common.pojo.PageResult; @@ -29,6 +29,13 @@ public interface ShiftService { * @param updateReqVO 更新信息 */ void updateShift(@Valid ShiftUpdateReqVO updateReqVO); + /** + * 获得用高级搜索班次分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getShiftSenior(CustomConditions conditions); /** * 删除班次 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/shift/ShiftServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/shift/ShiftServiceImpl.java index 6c29f3fc..cd816753 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/shift/ShiftServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/shift/ShiftServiceImpl.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.shift.vo.*; @@ -63,7 +64,7 @@ public class ShiftServiceImpl implements ShiftService { // 删除 shiftMapper.deleteById(id); } - + @Override public ShiftDO getShift(Long id) { return shiftMapper.selectById(id); @@ -83,7 +84,10 @@ public class ShiftServiceImpl implements ShiftService { public List getShiftList(ShiftExportReqVO exportReqVO) { return shiftMapper.selectList(exportReqVO); } - + @Override + public PageResult getShiftSenior(CustomConditions conditions) { + return shiftMapper.selectSenior(conditions); + } public List importShiftList(List shifts, Integer mode, boolean updatePart) { @@ -93,26 +97,55 @@ public class ShiftServiceImpl implements ShiftService { List errorList = new ArrayList<>(); shifts.forEach(shift -> { // 校验，判断是否有不符合的原因 - try { - if(mode != null){ - validateShiftForCreateOrUpdate(null,shift.getCode(),shift.getBeginTime(),shift.getEntTime(),shift.getEndAtNextDay(), - shift.getAvailable()); + String massage = ""; + if(mode != null) { + try { + validateShiftExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCodeExists(null, shift.getCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateBeginTimeExists(shift.getBeginTime()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateEndTimeExists(shift.getEntTime()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateEndatnextDayExists(shift.getEndAtNextDay()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(shift.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + if (StrUtil.isNotEmpty(massage)) { + massage.substring(0, massage.length() - 1); + errorList.add(shift); + } + if (errorList == null) { + + // 判断如果不存在，在进行插入 + ShiftDO existShift = shiftMapper.selectByCode(shift.getCode()); + if (existShift == null && mode != 3) { + shiftMapper.insert(ShiftConvert.INSTANCE.convert(shift)); + } else if (existShift != null && mode != 2) {// 如果存在，判断是否允许更新 + ShiftDO shiftDO = ShiftConvert.INSTANCE.convert(shift); + shiftDO.setId(existShift.getId()); + shiftMapper.updateById(shiftDO); + } + } } - } catch (ServiceException ex) { - errorList.add(shift); - return; - } - - // 判断如果不存在，在进行插入 - ShiftDO existShift = shiftMapper.selectByCode(shift.getCode()); - if (existShift == null&& mode != 3) { - shiftMapper.insert(ShiftConvert.INSTANCE.convert(shift)); - } - else if (existShift != null && mode != 2) {// 如果存在，判断是否允许更新 - ShiftDO shiftDO = ShiftConvert.INSTANCE.convert(shift); - shiftDO.setId(existShift.getId()); - shiftMapper.updateById(shiftDO); - } }); //错误不为空并非部分更新，手工回滚 if(!errorList.isEmpty() && !updatePart) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/stdcostprice/StdcostpriceService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/stdcostprice/StdcostpriceService.java index 8a71b52e..87b28e71 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/stdcostprice/StdcostpriceService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/stdcostprice/StdcostpriceService.java @@ -1,11 +1,11 @@ package com.win.module.wms.service.stdcostprice; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.stdcostprice.vo.*; import com.win.module.wms.controller.stdcostprice.vo.StdcostpriceExportReqVO; import com.win.module.wms.controller.stdcostprice.vo.StdcostpricePageReqVO; import com.win.module.wms.controller.stdcostprice.vo.StdcostpriceUpdateReqVO; -import com.win.module.wms.controller.supplier.vo.SupplierImportExcelVo; import com.win.module.wms.dal.dataobject.stdcostprice.StdcostpriceDO; import javax.validation.Valid; @@ -26,6 +26,13 @@ public interface StdcostpriceService { * @return 编号 */ Long createStdcostprice(@Valid StdcostpriceCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getStdcostpriceSenior(CustomConditions conditions); /** * 更新标准成本价格单 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/stdcostprice/StdcostpriceServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/stdcostprice/StdcostpriceServiceImpl.java index 1a6f09b5..8bcefb5f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/stdcostprice/StdcostpriceServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/stdcostprice/StdcostpriceServiceImpl.java @@ -5,11 +5,11 @@ 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.stdcostprice.vo.*; import com.win.module.wms.convert.stdcostprice.StdcostpriceConvert; -import com.win.module.wms.dal.dataobject.itempackaging.ItempackagingDO; import com.win.module.wms.dal.dataobject.stdcostprice.StdcostpriceDO; import com.win.module.wms.dal.mysql.stdcostprice.StdcostpriceMapper; import org.springframework.stereotype.Service; @@ -48,6 +48,12 @@ public class StdcostpriceServiceImpl implements StdcostpriceService { return stdcostprice.getId(); } + @Override + public PageResult getStdcostpriceSenior(CustomConditions conditions) { + return stdcostpriceMapper.selectSenior(conditions); + } + + @Override public void updateStdcostprice(StdcostpriceUpdateReqVO updateReqVO) { // 校验存在 @@ -92,25 +98,56 @@ public class StdcostpriceServiceImpl implements StdcostpriceService { List errorList = new ArrayList<>(); stdcostprices.forEach(stdcostprice -> { // 校验，判断是否有不符合的原因 - try { + String massage = ""; if(mode != null){ - validateStdcostpriceForCreateOrUpdate(null,stdcostprice.getSupplierCode(),stdcostprice.getItemCode(), - stdcostprice.getCurrency(),stdcostprice.getPrice(),stdcostprice.getAvailable()); - } - } catch (ServiceException ex) { + try { + validateStdcostpriceExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCodeExists(null,stdcostprice.getItemCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateSuppercodeExists(stdcostprice.getSupplierCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCurrencyExists(stdcostprice.getCurrency()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validatePriceExists(stdcostprice.getPrice()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(stdcostprice.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + + if(StrUtil.isNotEmpty(massage)){ + massage.substring(0,massage.length()-1); errorList.add(stdcostprice); - return; } + if(errorList == null) { - // 判断如果不存在，在进行插入 - StdcostpriceDO existStdcostprice = stdcostpriceMapper.selectByStdcostpriceCode(stdcostprice.getSupplierCode()); - if (existStdcostprice == null&& mode != 3) { - stdcostpriceMapper.insert(StdcostpriceConvert.INSTANCE.convert(stdcostprice)); - } - else if (existStdcostprice != null && mode != 2) {// 如果存在，判断是否允许更新 - StdcostpriceDO stdcostpriceDO = StdcostpriceConvert.INSTANCE.convert(stdcostprice); - stdcostpriceDO.setId(existStdcostprice.getId()); - stdcostpriceMapper.updateById(stdcostpriceDO); + // 判断如果不存在，在进行插入 + StdcostpriceDO existStdcostprice = stdcostpriceMapper.selectByStdcostpriceCode(stdcostprice.getSupplierCode()); + if (existStdcostprice == null && mode != 3) { + stdcostpriceMapper.insert(StdcostpriceConvert.INSTANCE.convert(stdcostprice)); + } else if (existStdcostprice != null && mode != 2) {// 如果存在，判断是否允许更新 + StdcostpriceDO stdcostpriceDO = StdcostpriceConvert.INSTANCE.convert(stdcostprice); + stdcostpriceDO.setId(existStdcostprice.getId()); + stdcostpriceMapper.updateById(stdcostpriceDO); + + } + } } }); //错误不为空并非部分更新，手工回滚 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/strategy/StrategyService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/strategy/StrategyService.java index f3aafa37..b800d182 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/strategy/StrategyService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/strategy/StrategyService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.strategy; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.strategy.vo.StrategyCreateReqVO; import com.win.module.wms.controller.strategy.vo.StrategyExportReqVO; import com.win.module.wms.controller.strategy.vo.StrategyPageReqVO; @@ -25,6 +26,14 @@ public interface StrategyService { */ Long createStrategy(@Valid StrategyCreateReqVO createReqVO); + /** + * 获得用高级搜索策略分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getStrategySenior(CustomConditions conditions); + /** * 更新策略 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/strategy/StrategyServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/strategy/StrategyServiceImpl.java index fc3d75ee..8cc53121 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/strategy/StrategyServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/strategy/StrategyServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.strategy; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.strategy.vo.StrategyCreateReqVO; import com.win.module.wms.controller.strategy.vo.StrategyExportReqVO; @@ -38,6 +39,11 @@ public class StrategyServiceImpl implements StrategyService { // 返回 return strategy.getId(); } + @Override + public PageResult getStrategySenior(CustomConditions conditions) { + return strategyMapper.selectSenior(conditions); + } + @Override public void updateStrategy(StrategyUpdateReqVO updateReqVO) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierService.java index 22de4b9b..4d968825 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierService.java @@ -1,8 +1,7 @@ package com.win.module.wms.service.supplier; - import java.util.*; import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.supplier.vo.*; import com.win.module.wms.controller.supplier.vo.SupplierImportExcelVo; import com.win.module.wms.dal.dataobject.supplier.SupplierDO; @@ -22,6 +21,13 @@ public interface SupplierService { * @return 编号 */ Long createSupplier(@Valid SupplierCreateReqVO createReqVO); + /** + * 获得用高级搜索供应商分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getSupplierSenior(CustomConditions conditions); /** * 更新供应商 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierServiceImpl.java index 9432b35b..f8c5a2ea 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierServiceImpl.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.supplier.vo.*; @@ -53,7 +54,10 @@ public class SupplierServiceImpl implements SupplierService { SupplierDO updateObj = SupplierConvert.INSTANCE.convert(updateReqVO); supplierMapper.updateById(updateObj); } - + @Override + public PageResult getSupplierSenior(CustomConditions conditions) { + return supplierMapper.selectSenior(conditions); + } @Override public void deleteSupplier(Long id) { // 校验存在 @@ -89,25 +93,45 @@ public class SupplierServiceImpl implements SupplierService { List errorList = new ArrayList<>(); suppliers.forEach(supplier -> { // 校验，判断是否有不符合的原因 - try { - if(mode != null){ - validateSupplierForCreateOrUpdate(null,supplier.getCode(),supplier.getShortName(),supplier.getAvailable()); + String massage = ""; + if (mode != null) { + try { + validateSupplierExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCodeExists(null, supplier.getCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateShortnameExists(supplier.getShortName()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(supplier.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; } - } catch (ServiceException ex) { - errorList.add(supplier); - return; - } - // 判断如果不存在，在进行插入 - SupplierDO existSupplier = supplierMapper.selectByCode(supplier.getCode()); - if (existSupplier == null&& mode != 3) { - supplierMapper.insert(SupplierConvert.INSTANCE.convert(supplier)); + if (StrUtil.isNotEmpty(massage)) { + massage.substring(0, massage.length() - 1); + errorList.add(supplier); } - else if (existSupplier != null && mode != 2) {// 如果存在，判断是否允许更新 - SupplierDO supplierDO = SupplierConvert.INSTANCE.convert(supplier); - supplierDO.setId(existSupplier.getId()); - supplierMapper.updateById(supplierDO); + if (errorList == null) { + // 判断如果不存在，在进行插入 + SupplierDO existSupplier = supplierMapper.selectByCode(supplier.getCode()); + if (existSupplier == null && mode != 3) { + supplierMapper.insert(SupplierConvert.INSTANCE.convert(supplier)); + } else if (existSupplier != null && mode != 2) {// 如果存在，判断是否允许更新 + SupplierDO supplierDO = SupplierConvert.INSTANCE.convert(supplier); + supplierDO.setId(existSupplier.getId()); + supplierMapper.updateById(supplierDO); + } } + } }); //错误不为空并非部分更新，手工回滚 if(!errorList.isEmpty() && !updatePart) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordDetailService.java index 1f5fd95b..113612c7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordDetailService.java @@ -1,8 +1,7 @@ package com.win.module.wms.service.supplierdeliverRecord; - import java.util.*; import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordDetailCreateReqVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordDetailExportReqVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordDetailPageReqVO; @@ -25,6 +24,14 @@ public interface SupplierdeliverRecordDetailService { */ Long createSupplierdeliverRecordDetail(@Valid SupplierdeliverRecordDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索供应商发货记录子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getSupplierdeliverRecordDetailSenior(CustomConditions conditions); + /** * 更新供应商发货记录子 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordDetailServiceImpl.java index ebe24379..3522238a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordDetailServiceImpl.java @@ -1,9 +1,11 @@ package com.win.module.wms.service.supplierdeliverRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordDetailCreateReqVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordDetailExportReqVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordDetailPageReqVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordDetailUpdateReqVO; + import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -48,7 +50,10 @@ public class SupplierdeliverRecordDetailServiceImpl implements SupplierdeliverRe SupplierdeliverRecordDetailDO updateObj = SupplierdeliverRecordDetailConvert.INSTANCE.convert(updateReqVO); supplierdeliverRecordDetailMapper.updateById(updateObj); } - + @Override + public PageResult getSupplierdeliverRecordDetailSenior(CustomConditions conditions) { + return supplierdeliverRecordDetailMapper.selectSenior(conditions); + } @Override public void deleteSupplierdeliverRecordDetail(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainService.java index 23f71f79..43270b01 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.supplierdeliverRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainCreateReqVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainExportReqVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainPageReqVO; @@ -25,6 +26,13 @@ public interface SupplierdeliverRecordMainService { * @return 编号 */ Long createSupplierdeliverRecordMain(@Valid SupplierdeliverRecordMainCreateReqVO createReqVO); + /** + * 获得用高级搜索供应商发货记录主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getSupplierdeliverRecordMainSenior(CustomConditions conditions); /** * 更新供应商发货记录主 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainServiceImpl.java index df36e7fc..b733d7ee 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainServiceImpl.java @@ -1,6 +1,7 @@ package com.win.module.wms.service.supplierdeliverRecord; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainCreateReqVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainExportReqVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainPageReqVO; @@ -53,7 +54,10 @@ public class SupplierdeliverRecordMainServiceImpl implements SupplierdeliverReco SupplierdeliverRecordMainDO updateObj = SupplierdeliverRecordMainConvert.INSTANCE.convert(updateReqVO); supplierdeliverRecordMainMapper.updateById(updateObj); } - + @Override + public PageResult getSupplierdeliverRecordMainSenior(CustomConditions conditions) { + return supplierdeliverRecordMainMapper.selectSenior(conditions); + } @Override public void deleteSupplierdeliverRecordMain(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestDetailService.java index 23f9e270..3c2a2792 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestDetailService.java @@ -1,8 +1,7 @@ package com.win.module.wms.service.supplierdeliverRequest; - import java.util.*; import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.supplierdeliverRequest.vo.SupplierdeliverRequestDetailCreateReqVO; import com.win.module.wms.controller.supplierdeliverRequest.vo.SupplierdeliverRequestDetailExportReqVO; import com.win.module.wms.controller.supplierdeliverRequest.vo.SupplierdeliverRequestDetailPageReqVO; @@ -24,6 +23,13 @@ public interface SupplierdeliverRequestDetailService { * @return 编号 */ Long createSupplierdeliverRequestDetail(@Valid SupplierdeliverRequestDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索供应商发货申请子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getSupplierdeliverRequestDetailSenior(CustomConditions conditions); /** * 更新供应商发货申请子 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestDetailServiceImpl.java index 89fc80e8..e8088c77 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.supplierdeliverRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.supplierdeliverRequest.vo.SupplierdeliverRequestDetailCreateReqVO; import com.win.module.wms.controller.supplierdeliverRequest.vo.SupplierdeliverRequestDetailExportReqVO; import com.win.module.wms.controller.supplierdeliverRequest.vo.SupplierdeliverRequestDetailPageReqVO; @@ -48,6 +49,10 @@ public class SupplierdeliverRequestDetailServiceImpl implements SupplierdeliverR SupplierdeliverRequestDetailDO updateObj = SupplierdeliverRequestDetailConvert.INSTANCE.convert(updateReqVO); supplierdeliverRequestDetailMapper.updateById(updateObj); } + @Override + public PageResult getSupplierdeliverRequestDetailSenior(CustomConditions conditions) { + return supplierdeliverRequestDetailMapper.selectSenior(conditions); + } @Override public void deleteSupplierdeliverRequestDetail(Long id) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainService.java index f2c53db3..3707dfff 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.supplierdeliverRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.supplierdeliverRequest.vo.SupplierdeliverRequestMainCreateReqVO; import com.win.module.wms.controller.supplierdeliverRequest.vo.SupplierdeliverRequestMainExportReqVO; import com.win.module.wms.controller.supplierdeliverRequest.vo.SupplierdeliverRequestMainPageReqVO; @@ -24,6 +25,13 @@ public interface SupplierdeliverRequestMainService { * @return 编号 */ Long createSupplierdeliverRequestMain(@Valid SupplierdeliverRequestMainCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getSupplierdeliverRequestMainSenior(CustomConditions conditions); /** * 更新供应商发货申请主 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java index 3a2370df..7d904fbf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.supplierdeliverRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.supplierdeliverRequest.vo.SupplierdeliverRequestMainCreateReqVO; import com.win.module.wms.controller.supplierdeliverRequest.vo.SupplierdeliverRequestMainExportReqVO; import com.win.module.wms.controller.supplierdeliverRequest.vo.SupplierdeliverRequestMainPageReqVO; @@ -48,7 +49,10 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq SupplierdeliverRequestMainDO updateObj = SupplierdeliverRequestMainConvert.INSTANCE.convert(updateReqVO); supplierdeliverRequestMainMapper.updateById(updateObj); } - + @Override + public PageResult getSupplierdeliverRequestMainSenior(CustomConditions conditions) { + return supplierdeliverRequestMainMapper.selectSenior(conditions); + } @Override public void deleteSupplierdeliverRequestMain(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRecord/SupplierinvoiceRecordDeatilService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRecord/SupplierinvoiceRecordDeatilService.java index 0cd2feb8..f516e72c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRecord/SupplierinvoiceRecordDeatilService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRecord/SupplierinvoiceRecordDeatilService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.supplierinvoiceRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.supplierinvoiceRecord.vo.SupplierinvoiceRecordDeatilCreateReqVO; import com.win.module.wms.controller.supplierinvoiceRecord.vo.SupplierinvoiceRecordDeatilExportReqVO; import com.win.module.wms.controller.supplierinvoiceRecord.vo.SupplierinvoiceRecordDeatilPageReqVO; @@ -25,6 +26,14 @@ public interface SupplierinvoiceRecordDeatilService { */ Long createSupplierinvoiceRecordDeatil(@Valid SupplierinvoiceRecordDeatilCreateReqVO createReqVO); + /** + * 获得用高级搜索供应商发票记录子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getSupplierinvoiceRecordDeatilSenior(CustomConditions conditions); + /** * 更新供应商发票记录子 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRecord/SupplierinvoiceRecordDeatilServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRecord/SupplierinvoiceRecordDeatilServiceImpl.java index 94012125..3791a43b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRecord/SupplierinvoiceRecordDeatilServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRecord/SupplierinvoiceRecordDeatilServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.supplierinvoiceRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.supplierinvoiceRecord.vo.SupplierinvoiceRecordDeatilCreateReqVO; import com.win.module.wms.controller.supplierinvoiceRecord.vo.SupplierinvoiceRecordDeatilExportReqVO; import com.win.module.wms.controller.supplierinvoiceRecord.vo.SupplierinvoiceRecordDeatilPageReqVO; @@ -7,15 +8,11 @@ import com.win.module.wms.controller.supplierinvoiceRecord.vo.SupplierinvoiceRec import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; - import java.util.*; - import com.win.module.wms.dal.dataobject.supplierinvoiceRecord.SupplierinvoiceRecordDeatilDO; import com.win.framework.common.pojo.PageResult; - import com.win.module.wms.convert.supplierinvoiceRecord.SupplierinvoiceRecordDeatilConvert; import com.win.module.wms.dal.mysql.supplierinvoiceRecord.SupplierinvoiceRecordDeatilMapper; - import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.module.wms.enums.ErrorCodeConstants.*; @@ -48,7 +45,10 @@ public class SupplierinvoiceRecordDeatilServiceImpl implements SupplierinvoiceRe SupplierinvoiceRecordDeatilDO updateObj = SupplierinvoiceRecordDeatilConvert.INSTANCE.convert(updateReqVO); supplierinvoiceRecordDeatilMapper.updateById(updateObj); } - + @Override + public PageResult getSupplierinvoiceRecordDeatilSenior(CustomConditions conditions) { + return supplierinvoiceRecordDeatilMapper.selectSenior(conditions); + } @Override public void deleteSupplierinvoiceRecordDeatil(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRecord/SupplierinvoiceRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRecord/SupplierinvoiceRecordMainService.java index 68068be8..9e113464 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRecord/SupplierinvoiceRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRecord/SupplierinvoiceRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.supplierinvoiceRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.supplierinvoiceRecord.vo.SupplierinvoiceRecordMainCreateReqVO; import com.win.module.wms.controller.supplierinvoiceRecord.vo.SupplierinvoiceRecordMainExportReqVO; import com.win.module.wms.controller.supplierinvoiceRecord.vo.SupplierinvoiceRecordMainPageReqVO; @@ -24,6 +25,13 @@ public interface SupplierinvoiceRecordMainService { * @return 编号 */ Long createSupplierinvoiceRecordMain(@Valid SupplierinvoiceRecordMainCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getSupplierinvoiceRecordMainSenior(CustomConditions conditions); /** * 更新供应商发票记录主 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRecord/SupplierinvoiceRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRecord/SupplierinvoiceRecordMainServiceImpl.java index c7eadd77..5b6d4b18 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRecord/SupplierinvoiceRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRecord/SupplierinvoiceRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.supplierinvoiceRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.supplierinvoiceRecord.vo.SupplierinvoiceRecordMainCreateReqVO; import com.win.module.wms.controller.supplierinvoiceRecord.vo.SupplierinvoiceRecordMainExportReqVO; import com.win.module.wms.controller.supplierinvoiceRecord.vo.SupplierinvoiceRecordMainPageReqVO; @@ -48,7 +49,10 @@ public class SupplierinvoiceRecordMainServiceImpl implements SupplierinvoiceReco SupplierinvoiceRecordMainDO updateObj = SupplierinvoiceRecordMainConvert.INSTANCE.convert(updateReqVO); supplierinvoiceRecordMainMapper.updateById(updateObj); } - + @Override + public PageResult getSupplierinvoiceRecordMainSenior(CustomConditions conditions) { + return supplierinvoiceRecordMainMapper.selectSenior(conditions); + } @Override public void deleteSupplierinvoiceRecordMain(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestDetailService.java index d4aaabb6..d53c232b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.supplierinvoiceRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.supplierinvoiceRequest.vo.SupplierinvoiceRequestDetailCreateReqVO; import com.win.module.wms.controller.supplierinvoiceRequest.vo.SupplierinvoiceRequestDetailExportReqVO; import com.win.module.wms.controller.supplierinvoiceRequest.vo.SupplierinvoiceRequestDetailPageReqVO; @@ -24,6 +25,13 @@ public interface SupplierinvoiceRequestDetailService { * @return 编号 */ Long createSupplierinvoiceRequestDetail(@Valid SupplierinvoiceRequestDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索供应商发票申请子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getSupplierinvoiceRequestDetailSenior(CustomConditions conditions); /** * 更新供应商发票申请子 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestDetailServiceImpl.java index 959d693f..d785aa48 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.supplierinvoiceRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.supplierinvoiceRequest.vo.SupplierinvoiceRequestDetailCreateReqVO; import com.win.module.wms.controller.supplierinvoiceRequest.vo.SupplierinvoiceRequestDetailExportReqVO; import com.win.module.wms.controller.supplierinvoiceRequest.vo.SupplierinvoiceRequestDetailPageReqVO; @@ -77,6 +78,10 @@ public class SupplierinvoiceRequestDetailServiceImpl implements SupplierinvoiceR public PageResult getSupplierinvoiceRequestDetailPage(SupplierinvoiceRequestDetailPageReqVO pageReqVO) { return supplierinvoiceRequestDetailMapper.selectPage(pageReqVO); } + @Override + public PageResult getSupplierinvoiceRequestDetailSenior(CustomConditions conditions) { + return supplierinvoiceRequestDetailMapper.selectSenior(conditions); + } @Override public List getSupplierinvoiceRequestDetailList(SupplierinvoiceRequestDetailExportReqVO exportReqVO) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestMainService.java index d59225b9..eebef71d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.supplierinvoiceRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.supplierinvoiceRequest.vo.SupplierinvoiceRequestMainCreateReqVO; import com.win.module.wms.controller.supplierinvoiceRequest.vo.SupplierinvoiceRequestMainExportReqVO; import com.win.module.wms.controller.supplierinvoiceRequest.vo.SupplierinvoiceRequestMainPageReqVO; @@ -24,6 +25,13 @@ public interface SupplierinvoiceRequestMainService { * @return 编号 */ Long createSupplierinvoiceRequestMain(@Valid SupplierinvoiceRequestMainCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getSupplierinvoiceRequestMainSenior(CustomConditions conditions); /** * 更新供应商发票申请主 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestMainServiceImpl.java index 755b832e..32d35a10 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.supplierinvoiceRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.supplierinvoiceRequest.vo.SupplierinvoiceRequestMainCreateReqVO; import com.win.module.wms.controller.supplierinvoiceRequest.vo.SupplierinvoiceRequestMainExportReqVO; import com.win.module.wms.controller.supplierinvoiceRequest.vo.SupplierinvoiceRequestMainPageReqVO; @@ -48,6 +49,10 @@ public class SupplierinvoiceRequestMainServiceImpl implements SupplierinvoiceReq SupplierinvoiceRequestMainDO updateObj = SupplierinvoiceRequestMainConvert.INSTANCE.convert(updateReqVO); supplierinvoiceRequestMainMapper.updateById(updateObj); } + @Override + public PageResult getSupplierinvoiceRequestMainSenior(CustomConditions conditions) { + return supplierinvoiceRequestMainMapper.selectSenior(conditions); + } @Override public void deleteSupplierinvoiceRequestMain(Long id) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplieritem/SupplieritemService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplieritem/SupplieritemService.java index 8c19d6e9..3d3320c9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplieritem/SupplieritemService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplieritem/SupplieritemService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.supplieritem; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.supplieritem.vo.SupplieritemCreateReqVO; import com.win.module.wms.controller.supplieritem.vo.SupplieritemExportReqVO; import com.win.module.wms.controller.supplieritem.vo.SupplieritemPageReqVO; @@ -26,6 +27,14 @@ public interface SupplieritemService { */ Long createSupplieritem(@Valid SupplieritemCreateReqVO createReqVO); + /** + * 获得用高级搜索供应商物品分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getSupplieritemSenior(CustomConditions conditions); + /** * 更新供应商物品 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplieritem/SupplieritemServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplieritem/SupplieritemServiceImpl.java index 14d88033..61c4c3a6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplieritem/SupplieritemServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplieritem/SupplieritemServiceImpl.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.supplieritem.vo.*; @@ -59,7 +60,10 @@ public class SupplieritemServiceImpl implements SupplieritemService { SupplieritemDO updateObj = SupplieritemConvert.INSTANCE.convert(updateReqVO); supplieritemMapper.updateById(updateObj); } - + @Override + public PageResult getSupplieritemSenior(CustomConditions conditions) { + return supplieritemMapper.selectSenior(conditions); + } @Override public void deleteSupplieritem(Long id) { // 校验存在 @@ -95,15 +99,40 @@ public class SupplieritemServiceImpl implements SupplieritemService { List errorList = new ArrayList<>(); supplieriteams.forEach(supplieriteam -> { // 校验，判断是否有不符合的原因 - try { + String massage = ""; if(mode != null){ - validateSupplieriteamForCreateOrUpdate(null,supplieriteam.getSupplierCode(), - supplieriteam.getItemCode(),supplieriteam.getPackUnit(),supplieriteam.getPackQty(),supplieriteam.getAvailable()); + try { + validateSupplieritemExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateItemCodeExists(null,supplieriteam.getItemCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateSupperCodeExists(supplieriteam.getSupplierCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validatePackunitExists(supplieriteam.getPackUnit()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validatePackQtyExists(supplieriteam.getPackQty()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(supplieriteam.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } } - } catch (ServiceException ex) { - errorList.add(supplieriteam); - return; - } + // 判断如果不存在，在进行插入 SupplieritemDO existSupplieriteam = supplieritemMapper.selectBySuppercode(supplieriteam.getSupplierCode()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/systemcalendar/SystemcalendarService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/systemcalendar/SystemcalendarService.java index 9823b6c2..35516d41 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/systemcalendar/SystemcalendarService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/systemcalendar/SystemcalendarService.java @@ -3,8 +3,8 @@ package com.win.module.wms.service.systemcalendar; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.systemcalendar.vo.*; -import com.win.module.wms.controller.team.vo.TeamImportExcelVo; import com.win.module.wms.dal.dataobject.systemcalendar.SystemcalendarDO; import com.win.framework.common.pojo.PageResult; @@ -29,6 +29,13 @@ public interface SystemcalendarService { * @param updateReqVO 更新信息 */ void updateSystemcalendar(@Valid SystemcalendarUpdateReqVO updateReqVO); + /** + * 获得用高级搜索系统日历分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getSystemcalendarSenior(CustomConditions conditions); /** * 删除系统日历 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/systemcalendar/SystemcalendarServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/systemcalendar/SystemcalendarServiceImpl.java index 44f9efa3..de419b03 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/systemcalendar/SystemcalendarServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/systemcalendar/SystemcalendarServiceImpl.java @@ -1,8 +1,10 @@ package com.win.module.wms.service.systemcalendar; 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.systemcalendar.vo.*; @@ -50,7 +52,10 @@ public class SystemcalendarServiceImpl implements SystemcalendarService { SystemcalendarDO updateObj = SystemcalendarConvert.INSTANCE.convert(updateReqVO); systemcalendarMapper.updateById(updateObj); } - + @Override + public PageResult getSystemcalendarSenior(CustomConditions conditions) { + return systemcalendarMapper.selectSenior(conditions); + } @Override public void deleteSystemcalendar(Long id) { // 校验存在 @@ -85,25 +90,41 @@ public class SystemcalendarServiceImpl implements SystemcalendarService { List errorList = new ArrayList<>(); systemcalendars.forEach(systemcalendar -> { // 校验，判断是否有不符合的原因 - try { - if(mode != null){ - validateSystemcalendarForCreateOrUpdate(null,systemcalendar.getModule(),systemcalendar.getAvailable()); + String massage = ""; + if (mode != null) { + try { + validateSystemcalendarExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; } - } catch (ServiceException ex) { - errorList.add(systemcalendar); - return; - } - // 判断如果不存在，在进行插入 - SystemcalendarDO existSystemcalendar = null; - if (existSystemcalendar == null&& mode != 3) { - systemcalendarMapper.insert(SystemcalendarConvert.INSTANCE.convert(systemcalendar)); - } - else if (existSystemcalendar != null && mode != 2) {// 如果存在，判断是否允许更新 - SystemcalendarDO systemcalendarDO = SystemcalendarConvert.INSTANCE.convert(systemcalendar); - systemcalendarDO.setId(existSystemcalendar.getId()); - systemcalendarMapper.updateById(systemcalendarDO); + try { + validateMoubleExists(systemcalendar.getModule()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(systemcalendar.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + if (StrUtil.isNotEmpty(massage)) { + massage.substring(0, massage.length() - 1); + errorList.add(systemcalendar); + } + if (errorList == null) { + // 判断如果不存在，在进行插入 + SystemcalendarDO existSystemcalendar = null; + if (existSystemcalendar == null && mode != 3) { + systemcalendarMapper.insert(SystemcalendarConvert.INSTANCE.convert(systemcalendar)); + } else if (existSystemcalendar != null && mode != 2) {// 如果存在，判断是否允许更新 + SystemcalendarDO systemcalendarDO = SystemcalendarConvert.INSTANCE.convert(systemcalendar); + systemcalendarDO.setId(existSystemcalendar.getId()); + systemcalendarMapper.updateById(systemcalendarDO); + } + } } + }); //错误不为空并非部分更新，手工回滚 if(!errorList.isEmpty() && !updatePart) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/team/TeamService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/team/TeamService.java index 24ffa395..6c6e7ecf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/team/TeamService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/team/TeamService.java @@ -3,12 +3,12 @@ package com.win.module.wms.service.team; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.team.vo.TeamCreateReqVO; import com.win.module.wms.controller.team.vo.TeamExportReqVO; import com.win.module.wms.controller.team.vo.TeamPageReqVO; import com.win.module.wms.controller.team.vo.TeamUpdateReqVO; import com.win.module.wms.controller.team.vo.TeamImportExcelVo; -import com.win.module.wms.controller.transactiontype.vo.TransactiontypeImportExcelVo; import com.win.module.wms.dal.dataobject.team.TeamDO; import com.win.framework.common.pojo.PageResult; @@ -27,6 +27,14 @@ public interface TeamService { */ Long createTeam(@Valid TeamCreateReqVO createReqVO); + /** + * 获得用高级搜索信息分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getTeamSenior(CustomConditions conditions); + /** * 更新班组 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/team/TeamServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/team/TeamServiceImpl.java index 1a710634..6005192a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/team/TeamServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/team/TeamServiceImpl.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.team.vo.*; @@ -53,6 +54,11 @@ public class TeamServiceImpl implements TeamService { teamMapper.updateById(updateObj); } + @Override + public PageResult getTeamSenior(CustomConditions conditions) { + return teamMapper.selectSenior(conditions); + } + @Override public void deleteTeam(Long id) { // 校验存在 @@ -88,26 +94,44 @@ public class TeamServiceImpl implements TeamService { List errorList = new ArrayList<>(); teams.forEach(team -> { // 校验，判断是否有不符合的原因 - try { - if(mode != null){ - validateTeamForCreateOrUpdate(null,team.getCode(),team.getAvailable()); + String massage = ""; + + if(mode != null) { + try { + validateTeamExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCodeExists(null, team.getCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(team.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + + if (StrUtil.isNotEmpty(massage)) { + massage.substring(0, massage.length() - 1); + errorList.add(team); + } + + if (errorList == null) { + // 判断如果不存在，在进行插入 + TeamDO existTeam = teamMapper.selectByCode(team.getCode()); + if (existTeam == null && mode != 3) { + teamMapper.insert(TeamConvert.INSTANCE.convert(team)); + } else if (existTeam != null && mode != 2) {// 如果存在，判断是否允许更新 + TeamDO teamDO = TeamConvert.INSTANCE.convert(team); + teamDO.setId(existTeam.getId()); + teamMapper.updateById(teamDO); + } + } } - } catch (ServiceException ex) { - errorList.add(team); - return; - } - - // 判断如果不存在，在进行插入 - TeamDO existTeam = teamMapper.selectByCode(team.getCode()); - if (existTeam == null&& mode != 3) { - teamMapper.insert(TeamConvert.INSTANCE.convert(team)); - } - else if (existTeam != null && mode != 2) {// 如果存在，判断是否允许更新 - TeamDO teamDO = TeamConvert.INSTANCE.convert(team); - teamDO.setId(existTeam.getId()); - teamMapper.updateById(teamDO); - } }); + //错误不为空并非部分更新，手工回滚 if(!errorList.isEmpty() && !updatePart) { TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transaction/TransactionService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transaction/TransactionService.java index c8d73424..e341038e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transaction/TransactionService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transaction/TransactionService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.transaction; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO; import com.win.module.wms.controller.transaction.vo.TransactionExportReqVO; import com.win.module.wms.controller.transaction.vo.TransactionPageReqVO; @@ -24,6 +25,13 @@ public interface TransactionService { * @return 编号 */ String createTransaction(@Valid TransactionCreateReqVO createReqVO); + /** + * 获得用高级搜索库存事务分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getTransactionSenior(CustomConditions conditions); /** * 更新库存事务 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transaction/TransactionServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transaction/TransactionServiceImpl.java index 0a14e4c0..9b8a072f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transaction/TransactionServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transaction/TransactionServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.transaction; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO; import com.win.module.wms.controller.transaction.vo.TransactionExportReqVO; import com.win.module.wms.controller.transaction.vo.TransactionPageReqVO; @@ -48,7 +49,10 @@ public class TransactionServiceImpl implements TransactionService { TransactionDO updateObj = TransactionConvert.INSTANCE.convert(updateReqVO); transactionMapper.updateById(updateObj); } - + @Override + public PageResult getTransactionSenior(CustomConditions conditions) { + return transactionMapper.selectSenior(conditions); + } @Override public void deleteTransaction(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transactiontype/TransactiontypeService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transactiontype/TransactiontypeService.java index 341c7b8d..73d9a8f3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transactiontype/TransactiontypeService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transactiontype/TransactiontypeService.java @@ -3,13 +3,12 @@ package com.win.module.wms.service.transactiontype; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transactiontype.vo.TransactiontypeCreateReqVO; import com.win.module.wms.controller.transactiontype.vo.TransactiontypeExportReqVO; import com.win.module.wms.controller.transactiontype.vo.TransactiontypePageReqVO; import com.win.module.wms.controller.transactiontype.vo.TransactiontypeUpdateReqVO; import com.win.module.wms.controller.transactiontype.vo.TransactiontypeImportExcelVo; -import com.win.module.wms.controller.warehouse.vo.WarehouseImportExcelVo; -import com.win.module.wms.controller.workshop.vo.WorkshopImportExcelVo; import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO; import com.win.framework.common.pojo.PageResult; @@ -27,7 +26,13 @@ public interface TransactiontypeService { * @return 编号 */ Long createTransactiontype(@Valid TransactiontypeCreateReqVO createReqVO); - + /** + * 获得用高级搜索事务类型分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getTransactiontypeSenior(CustomConditions conditions); /** * 更新事务类型 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transactiontype/TransactiontypeServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transactiontype/TransactiontypeServiceImpl.java index bc3c57c0..93abf8ce 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transactiontype/TransactiontypeServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transactiontype/TransactiontypeServiceImpl.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.transactiontype.vo.*; @@ -54,7 +55,10 @@ public class TransactiontypeServiceImpl implements TransactiontypeService { TransactiontypeDO updateObj = TransactiontypeConvert.INSTANCE.convert(updateReqVO); transactiontypeMapper.updateById(updateObj); } - + @Override + public PageResult getTransactiontypeSenior(CustomConditions conditions) { + return transactiontypeMapper.selectSenior(conditions); + } @Override public void deleteTransactiontype(Long id) { // 校验存在 @@ -88,27 +92,47 @@ public class TransactiontypeServiceImpl implements TransactiontypeService { } List errorList = new ArrayList<>(); transactiontypes.forEach(transactiontype -> { + String massage = ""; // 校验，判断是否有不符合的原因 - try { - if(mode != null){ - validateTransactiontypeForCreateOrUpdate(null,transactiontype.getCode(),transactiontype.getAvailable()); - } - } catch (ServiceException ex) { - errorList.add(transactiontype); - return; - } - - // 判断如果不存在，在进行插入 - TransactiontypeDO existTransactiontype = transactiontypeMapper.selectByCode(transactiontype.getCode()); - if (existTransactiontype == null&& mode != 3) { - transactiontypeMapper.insert(TransactiontypeConvert.INSTANCE.convert(transactiontype)); - } - else if (existTransactiontype != null && mode != 2) {// 如果存在，判断是否允许更新 - TransactiontypeDO transactiontypeDO = TransactiontypeConvert.INSTANCE.convert(transactiontype); - transactiontypeDO.setId(existTransactiontype.getId()); - transactiontypeMapper.updateById(transactiontypeDO); - } - }); + if(mode != null) { + try { + validateTransactiontypeExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCodeExists(null, transactiontype.getCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(transactiontype.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + + + if (StrUtil.isNotEmpty(massage)) { + massage.substring(0, massage.length() - 1); + errorList.add(transactiontype); + } + // 判断如果不存在，在进行插入 + TransactiontypeDO existTransactiontype = transactiontypeMapper.selectByCode(transactiontype.getCode()); + if (errorList == null) { + if (existTransactiontype == null && mode != 3) { + transactiontypeMapper.insert(TransactiontypeConvert.INSTANCE.convert(transactiontype)); + } else if (existTransactiontype != null && mode != 2) {// 如果存在，判断是否允许更新 + TransactiontypeDO transactiontypeDO = TransactiontypeConvert.INSTANCE.convert(transactiontype); + transactiontypeDO.setId(existTransactiontype.getId()); + transactiontypeMapper.updateById(transactiontypeDO); + } + } + } + + + + }); + //错误不为空并非部分更新，手工回滚 if(!errorList.isEmpty() && !updatePart) { TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobDetailService.java index 814ed2a3..62c0f47d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.transferissueJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobDetailCreateReqVO; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobDetailExportReqVO; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobDetailPageReqVO; @@ -25,6 +26,14 @@ public interface TransferissueJobDetailService { */ Long createTransferissueJobDetail(@Valid TransferissueJobDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索调拨出库任务子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getTransferissueJobDetailSenior(CustomConditions conditions); + /** * 更新调拨出库任务子 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobDetailServiceImpl.java index 3d61d435..6d27e024 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.transferissueJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobDetailCreateReqVO; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobDetailExportReqVO; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobDetailPageReqVO; @@ -48,6 +49,10 @@ public class TransferissueJobDetailServiceImpl implements TransferissueJobDetail TransferissueJobDetailDO updateObj = TransferissueJobDetailConvert.INSTANCE.convert(updateReqVO); transferissueJobDetailMapper.updateById(updateObj); } + @Override + public PageResult getTransferissueJobDetailSenior(CustomConditions conditions) { + return transferissueJobDetailMapper.selectSenior(conditions); + } @Override public void deleteTransferissueJobDetail(Long id) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainService.java index 99b2b52b..0d0817c0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.transferissueJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobMainCreateReqVO; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobMainExportReqVO; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobMainPageReqVO; @@ -24,6 +25,13 @@ public interface TransferissueJobMainService { * @return 编号 */ Long createTransferissueJobMain(@Valid TransferissueJobMainCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getTransferissueJobMainSenior(CustomConditions conditions); /** * 更新调拨出库任务主 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainServiceImpl.java index 7b01caf0..5ead2f1a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainServiceImpl.java @@ -1,11 +1,11 @@ package com.win.module.wms.service.transferissueJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobMainCreateReqVO; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobMainExportReqVO; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobMainPageReqVO; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobMainUpdateReqVO; -import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -50,7 +50,10 @@ public class TransferissueJobMainServiceImpl implements TransferissueJobMainServ TransferissueJobMainDO updateObj = TransferissueJobMainConvert.INSTANCE.convert(updateReqVO); transferissueJobMainMapper.updateById(updateObj); } - + @Override + public PageResult getTransferissueJobMainSenior(CustomConditions conditions) { + return transferissueJobMainMapper.selectSenior(conditions); + } @Override public void deleteTransferissueJobMain(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordDetailService.java index 2b4b2fc1..3c0ef1d9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.transferissueRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordDetailCreateReqVO; import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordDetailExportReqVO; import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordDetailPageReqVO; @@ -25,6 +26,13 @@ public interface TransferissueRecordDetailService { */ String createTransferissueRecordDetail(@Valid TransferissueRecordDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getTransferissueRequestDetailSenior(CustomConditions conditions); /** * 更新调拨出库记录子 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordDetailServiceImpl.java index 0f35825d..0e08dddc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.transferissueRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordDetailCreateReqVO; import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordDetailExportReqVO; import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordDetailPageReqVO; @@ -48,7 +49,10 @@ public class TransferissueRecordDetailServiceImpl implements TransferissueRecord TransferissueRecordDetailDO updateObj = TransferissueRecordDetailConvert.INSTANCE.convert(updateReqVO); transferissueRecordDetailMapper.updateById(updateObj); } - + @Override + public PageResult getTransferissueRequestDetailSenior(CustomConditions conditions) { + return transferissueRecordDetailMapper.selectSenior(conditions); + } @Override public void deleteTransferissueRecordDetail(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordMainService.java index 28ebc359..e1a7bffe 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.transferissueRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordMainCreateReqVO; import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordMainExportReqVO; import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordMainPageReqVO; @@ -24,6 +25,13 @@ public interface TransferissueRecordMainService { * @return 编号 */ Long createTransferissueRecordMain(@Valid TransferissueRecordMainCreateReqVO createReqVO); + /** + * 获得用高级搜索调拨出库记录主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getTransferissueRecordMainSenior(CustomConditions conditions); /** * 更新调拨出库记录主 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordMainServiceImpl.java index 52a81103..d8f5b95a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.transferissueRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordMainCreateReqVO; import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordMainExportReqVO; import com.win.module.wms.controller.transferissueRecord.vo.TransferissueRecordMainPageReqVO; @@ -48,7 +49,10 @@ public class TransferissueRecordMainServiceImpl implements TransferissueRecordMa TransferissueRecordMainDO updateObj = TransferissueRecordMainConvert.INSTANCE.convert(updateReqVO); transferissueRecordMainMapper.updateById(updateObj); } - + @Override + public PageResult getTransferissueRecordMainSenior(CustomConditions conditions) { + return transferissueRecordMainMapper.selectSenior(conditions); + } @Override public void deleteTransferissueRecordMain(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestDetailService.java index 03adfcd3..e8b5329a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.transferissueRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferissueRequest.vo.TransferissueRequestDetailCreateReqVO; import com.win.module.wms.controller.transferissueRequest.vo.TransferissueRequestDetailExportReqVO; import com.win.module.wms.controller.transferissueRequest.vo.TransferissueRequestDetailPageReqVO; @@ -25,6 +26,15 @@ public interface TransferissueRequestDetailService { */ Long createTransferissueRequestDetail(@Valid TransferissueRequestDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索调拨出库申请子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getTransferissueRequestDetailSenior(CustomConditions conditions); + + /** * 更新调拨出库申请子 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestDetailServiceImpl.java index ebfff054..424f5da5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.transferissueRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferissueRequest.vo.TransferissueRequestDetailCreateReqVO; import com.win.module.wms.controller.transferissueRequest.vo.TransferissueRequestDetailExportReqVO; import com.win.module.wms.controller.transferissueRequest.vo.TransferissueRequestDetailPageReqVO; @@ -39,7 +40,10 @@ public class TransferissueRequestDetailServiceImpl implements TransferissueReque // 返回 return transferissueRequestDetail.getId(); } - + @Override + public PageResult getTransferissueRequestDetailSenior(CustomConditions conditions) { + return transferissueRequestDetailMapper.selectSenior(conditions); + } @Override public void updateTransferissueRequestDetail(TransferissueRequestDetailUpdateReqVO updateReqVO) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestMainService.java index 689516a2..3635aead 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.transferissueRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferissueRequest.vo.TransferissueRequestMainCreateReqVO; import com.win.module.wms.controller.transferissueRequest.vo.TransferissueRequestMainExportReqVO; import com.win.module.wms.controller.transferissueRequest.vo.TransferissueRequestMainPageReqVO; @@ -24,6 +25,13 @@ public interface TransferissueRequestMainService { * @return 编号 */ Long createTransferissueRequestMain(@Valid TransferissueRequestMainCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getTransferissueRequestMainSenior(CustomConditions conditions); /** * 更新调拨出库申请主 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestMainServiceImpl.java index 0f9cca97..0b595cd7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.transferissueRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferissueRequest.vo.TransferissueRequestMainCreateReqVO; import com.win.module.wms.controller.transferissueRequest.vo.TransferissueRequestMainExportReqVO; import com.win.module.wms.controller.transferissueRequest.vo.TransferissueRequestMainPageReqVO; @@ -48,6 +49,10 @@ public class TransferissueRequestMainServiceImpl implements TransferissueRequest TransferissueRequestMainDO updateObj = TransferissueRequestMainConvert.INSTANCE.convert(updateReqVO); transferissueRequestMainMapper.updateById(updateObj); } + @Override + public PageResult getTransferissueRequestMainSenior(CustomConditions conditions) { + return transferissueRequestMainMapper.selectSenior(conditions); + } @Override public void deleteTransferissueRequestMain(Long id) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferlog/TransferlogService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferlog/TransferlogService.java index eaf874bb..699ad76b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferlog/TransferlogService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferlog/TransferlogService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.transferlog; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferlog.vo.TransferlogCreateReqVO; import com.win.module.wms.controller.transferlog.vo.TransferlogExportReqVO; import com.win.module.wms.controller.transferlog.vo.TransferlogPageReqVO; @@ -24,6 +25,13 @@ public interface TransferlogService { * @return 编号 */ String createTransferlog(@Valid TransferlogCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getTransferlogSenior(CustomConditions conditions); /** * 更新库存转移日志 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferlog/TransferlogServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferlog/TransferlogServiceImpl.java index 2938c5a4..c013fa44 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferlog/TransferlogServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferlog/TransferlogServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.transferlog; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferlog.vo.TransferlogCreateReqVO; import com.win.module.wms.controller.transferlog.vo.TransferlogExportReqVO; import com.win.module.wms.controller.transferlog.vo.TransferlogPageReqVO; @@ -48,6 +49,10 @@ public class TransferlogServiceImpl implements TransferlogService { TransferlogDO updateObj = TransferlogConvert.INSTANCE.convert(updateReqVO); transferlogMapper.updateById(updateObj); } + @Override + public PageResult getTransferlogSenior(CustomConditions conditions) { + return transferlogMapper.selectSenior(conditions); + } @Override public void deleteTransferlog(Long id) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobDetailService.java index a886edeb..57811783 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.transferreceiptJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobDetailCreateReqVO; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobDetailExportReqVO; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobDetailPageReqVO; @@ -24,6 +25,13 @@ public interface TransferreceiptJobDetailService { * @return 编号 */ Long createTransferreceiptJobDetail(@Valid TransferreceiptJobDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getTransferreceiptJobDetailSenior(CustomConditions conditions); /** * 更新调拨入库任务子 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobDetailServiceImpl.java index 81f60e04..1536e076 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.transferreceiptJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobDetailCreateReqVO; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobDetailExportReqVO; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobDetailPageReqVO; @@ -39,7 +40,10 @@ public class TransferreceiptJobDetailServiceImpl implements TransferreceiptJobDe // 返回 return transferreceiptJobDetail.getId(); } - + @Override + public PageResult getTransferreceiptJobDetailSenior(CustomConditions conditions) { + return transferreceiptJobDetailMapper.selectSenior(conditions); + } @Override public void updateTransferreceiptJobDetail(TransferreceiptJobDetailUpdateReqVO updateReqVO) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainService.java index 8ec36992..c1fe948f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.transferreceiptJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobMainCreateReqVO; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobMainExportReqVO; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobMainPageReqVO; @@ -24,6 +25,13 @@ public interface TransferreceiptJobMainService { * @return 编号 */ Long createTransferreceiptJobMain(@Valid TransferreceiptJobMainCreateReqVO createReqVO); + /** + * 获得用高级搜索调拨入库任务主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getTransferreceiptJobMainSenior(CustomConditions conditions); /** * 更新调拨入库任务主 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java index 653e39a0..4ee21b13 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java @@ -1,11 +1,11 @@ package com.win.module.wms.service.transferreceiptJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobMainCreateReqVO; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobMainExportReqVO; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobMainPageReqVO; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobMainUpdateReqVO; -import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -50,7 +50,10 @@ public class TransferreceiptJobMainServiceImpl implements TransferreceiptJobMain TransferreceiptJobMainDO updateObj = TransferreceiptJobMainConvert.INSTANCE.convert(updateReqVO); transferreceiptJobMainMapper.updateById(updateObj); } - + @Override + public PageResult getTransferreceiptJobMainSenior(CustomConditions conditions) { + return transferreceiptJobMainMapper.selectSenior(conditions); + } @Override public void deleteTransferreceiptJobMain(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordDetailService.java index 21d9ff64..ea3f6381 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.transferreceiptRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordDetailCreateReqVO; import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordDetailExportReqVO; import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordDetailPageReqVO; @@ -24,6 +25,13 @@ public interface TransferreceiptRecordDetailService { * @return 编号 */ Long createTransferreceiptRecordDetail(@Valid TransferreceiptRecordDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索调拨入库记录子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getTransferreceiptRecordDetailSenior(CustomConditions conditions); /** * 更新调拨入库记录子 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordDetailServiceImpl.java index 0bc7d045..7c16ecd7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.transferreceiptRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordDetailCreateReqVO; import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordDetailExportReqVO; import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordDetailPageReqVO; @@ -40,6 +41,11 @@ public class TransferreceiptRecordDetailServiceImpl implements TransferreceiptRe return transferreceiptRecordDetail.getId(); } + @Override + public PageResult getTransferreceiptRecordDetailSenior(CustomConditions conditions) { + return transferreceiptRecordDetailMapper.selectSenior(conditions); + } + @Override public void updateTransferreceiptRecordDetail(TransferreceiptRecordDetailUpdateReqVO updateReqVO) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordMainService.java index fb2a8a77..377aa55b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.transferreceiptRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordMainCreateReqVO; import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordMainExportReqVO; import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordMainPageReqVO; @@ -24,6 +25,13 @@ public interface TransferreceiptRecordMainService { * @return 编号 */ Long createTransferreceiptRecordMain(@Valid TransferreceiptRecordMainCreateReqVO createReqVO); + /** + * 获得用高级搜索调拨入库记录主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getTransferreceiptRecordMainSenior(CustomConditions conditions); /** * 更新调拨入库记录主 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordMainServiceImpl.java index e5c520bb..3dee910a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.transferreceiptRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordMainCreateReqVO; import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordMainExportReqVO; import com.win.module.wms.controller.transferreceiptRecord.vo.TransferreceiptRecordMainPageReqVO; @@ -48,7 +49,10 @@ public class TransferreceiptRecordMainServiceImpl implements TransferreceiptReco TransferreceiptRecordMainDO updateObj = TransferreceiptRecordMainConvert.INSTANCE.convert(updateReqVO); transferreceiptRecordMainMapper.updateById(updateObj); } - + @Override + public PageResult getTransferreceiptRecordMainSenior(CustomConditions conditions) { + return transferreceiptRecordMainMapper.selectSenior(conditions); + } @Override public void deleteTransferreceiptRecordMain(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestDetailService.java index 9b4eacd5..81a5b544 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.transferreceiptRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferreceiptRequest.vo.TransferreceiptRequestDetailCreateReqVO; import com.win.module.wms.controller.transferreceiptRequest.vo.TransferreceiptRequestDetailExportReqVO; import com.win.module.wms.controller.transferreceiptRequest.vo.TransferreceiptRequestDetailPageReqVO; @@ -31,6 +32,13 @@ public interface TransferreceiptRequestDetailService { * @param updateReqVO 更新信息 */ void updateTransferreceiptRequestDetail(@Valid TransferreceiptRequestDetailUpdateReqVO updateReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getTransferreceiptRequestDetailSenior(CustomConditions conditions); /** * 删除调拨入库申请子 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestMainService.java index 656f33bb..7545b3d8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.transferreceiptRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferreceiptRequest.vo.TransferreceiptRequestMainCreateReqVO; import com.win.module.wms.controller.transferreceiptRequest.vo.TransferreceiptRequestMainExportReqVO; import com.win.module.wms.controller.transferreceiptRequest.vo.TransferreceiptRequestMainPageReqVO; @@ -24,6 +25,13 @@ public interface TransferreceiptRequestMainService { * @return 编号 */ Long createTransferreceiptRequestMain(@Valid TransferreceiptRequestMainCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getTransferreceiptRequestMainSenior(CustomConditions conditions); /** * 更新调拨入库申请主 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestMainServiceImpl.java index f1e53728..cde12788 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.transferreceiptRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.transferreceiptRequest.vo.TransferreceiptRequestMainCreateReqVO; import com.win.module.wms.controller.transferreceiptRequest.vo.TransferreceiptRequestMainExportReqVO; import com.win.module.wms.controller.transferreceiptRequest.vo.TransferreceiptRequestMainPageReqVO; @@ -40,6 +41,11 @@ public class TransferreceiptRequestMainServiceImpl implements TransferreceiptReq return transferreceiptRequestMain.getId(); } + @Override + public PageResult getTransferreceiptRequestMainSenior(CustomConditions conditions) { + return transferreceiptRequestMainMapper.selectSenior(conditions); + } + @Override public void updateTransferreceiptRequestMain(TransferreceiptRequestMainUpdateReqVO updateReqVO) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobDetailService.java index ba9ae548..e7d5a25e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.unplannedissueJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobDetailCreateReqVO; import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobDetailExportReqVO; import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobDetailPageReqVO; @@ -24,6 +25,13 @@ public interface UnplannedissueJobDetailService { * @return 编号 */ Long createUnplannedissueJobDetail(@Valid UnplannedissueJobDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getUnplannedissueJobDetailSenior(CustomConditions conditions); /** * 更新计划外出库任务子 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobDetailServiceImpl.java index cbf21953..1087044f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.unplannedissueJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobDetailCreateReqVO; import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobDetailExportReqVO; import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobDetailPageReqVO; @@ -48,6 +49,10 @@ public class UnplannedissueJobDetailServiceImpl implements UnplannedissueJobDeta UnplannedissueJobDetailDO updateObj = UnplannedissueJobDetailConvert.INSTANCE.convert(updateReqVO); unplannedissueJobDetailMapper.updateById(updateObj); } + @Override + public PageResult getUnplannedissueJobDetailSenior(CustomConditions conditions) { + return unplannedissueJobDetailMapper.selectSenior(conditions); + } @Override public void deleteUnplannedissueJobDetail(Long id) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainService.java index c8132298..6762c8d1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.unplannedissueJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobMainCreateReqVO; import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobMainExportReqVO; import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobMainPageReqVO; @@ -24,6 +25,13 @@ public interface UnplannedissueJobMainService { * @return 编号 */ Long createUnplannedissueJobMain(@Valid UnplannedissueJobMainCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getUnplannedissueJobMainSenior(CustomConditions conditions); /** * 更新计划外出库任务主 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainServiceImpl.java index 7ced0576..2e5cd419 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainServiceImpl.java @@ -1,11 +1,11 @@ package com.win.module.wms.service.unplannedissueJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobMainCreateReqVO; import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobMainExportReqVO; import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobMainPageReqVO; import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobMainUpdateReqVO; -import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -50,7 +50,10 @@ public class UnplannedissueJobMainServiceImpl implements UnplannedissueJobMainSe UnplannedissueJobMainDO updateObj = UnplannedissueJobMainConvert.INSTANCE.convert(updateReqVO); unplannedissueJobMainMapper.updateById(updateObj); } - + @Override + public PageResult getUnplannedissueJobMainSenior(CustomConditions conditions) { + return unplannedissueJobMainMapper.selectSenior(conditions); + } @Override public void deleteUnplannedissueJobMain(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordDetailService.java index d4248b02..bf28dea4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.unplannedissueRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordDetailCreateReqVO; import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordDetailExportReqVO; import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordDetailPageReqVO; @@ -24,6 +25,13 @@ public interface UnplannedissueRecordDetailService { * @return 编号 */ Long createUnplannedissueRecordDetail(@Valid UnplannedissueRecordDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getUnplannedissueRecordDetailSenior(CustomConditions conditions); /** * 更新计划外出库记录子 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordDetailServiceImpl.java index b6223efd..12142024 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.unplannedissueRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordDetailCreateReqVO; import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordDetailExportReqVO; import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordDetailPageReqVO; @@ -56,6 +57,10 @@ public class UnplannedissueRecordDetailServiceImpl implements UnplannedissueReco // 删除 unplannedissueRecordDetailMapper.deleteById(id); } + @Override + public PageResult getUnplannedissueRecordDetailSenior(CustomConditions conditions) { + return unplannedissueRecordDetailMapper.selectSenior(conditions); + } private void validateUnplannedissueRecordDetailExists(Long id) { if (unplannedissueRecordDetailMapper.selectById(id) == null) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordMainService.java index 5de1c971..d160193d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.unplannedissueRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordMainCreateReqVO; import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordMainExportReqVO; import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordMainPageReqVO; @@ -24,6 +25,13 @@ public interface UnplannedissueRecordMainService { * @return 编号 */ Long createUnplannedissueRecordMain(@Valid UnplannedissueRecordMainCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getUnplannedissueRecordMainSenior(CustomConditions conditions); /** * 更新计划外出库记录主 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordMainServiceImpl.java index 9faf71a6..89c23f9b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.unplannedissueRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordMainCreateReqVO; import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordMainExportReqVO; import com.win.module.wms.controller.unplannedissueRecord.vo.UnplannedissueRecordMainPageReqVO; @@ -77,7 +78,10 @@ public class UnplannedissueRecordMainServiceImpl implements UnplannedissueRecord public PageResult getUnplannedissueRecordMainPage(UnplannedissueRecordMainPageReqVO pageReqVO) { return unplannedissueRecordMainMapper.selectPage(pageReqVO); } - + @Override + public PageResult getUnplannedissueRecordMainSenior(CustomConditions conditions) { + return unplannedissueRecordMainMapper.selectSenior(conditions); + } @Override public List getUnplannedissueRecordMainList(UnplannedissueRecordMainExportReqVO exportReqVO) { return unplannedissueRecordMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestDetailService.java index 353f02c0..07d5bf46 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.unplannedissueRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.unplannedissueRequest.vo.UnplannedissueRequestDetailCreateReqVO; import com.win.module.wms.controller.unplannedissueRequest.vo.UnplannedissueRequestDetailExportReqVO; import com.win.module.wms.controller.unplannedissueRequest.vo.UnplannedissueRequestDetailPageReqVO; @@ -24,6 +25,13 @@ public interface UnplannedissueRequestDetailService { * @return 编号 */ Long createUnplannedissueRequestDetail(@Valid UnplannedissueRequestDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索计划外出库申请子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getUnplannedissueRequestDetailSenior(CustomConditions conditions); /** * 更新计划外出库申请子 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestDetailServiceImpl.java index f52aa000..e80ad7a1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.unplannedissueRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.unplannedissueRequest.vo.UnplannedissueRequestDetailCreateReqVO; import com.win.module.wms.controller.unplannedissueRequest.vo.UnplannedissueRequestDetailExportReqVO; import com.win.module.wms.controller.unplannedissueRequest.vo.UnplannedissueRequestDetailPageReqVO; @@ -48,7 +49,10 @@ public class UnplannedissueRequestDetailServiceImpl implements UnplannedissueReq UnplannedissueRequestDetailDO updateObj = UnplannedissueRequestDetailConvert.INSTANCE.convert(updateReqVO); unplannedissueRequestDetailMapper.updateById(updateObj); } - + @Override + public PageResult getUnplannedissueRequestDetailSenior(CustomConditions conditions) { + return unplannedissueRequestDetailMapper.selectSenior(conditions); + } @Override public void deleteUnplannedissueRequestDetail(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainService.java index 0da78f03..a7b36905 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.unplannedissueRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.dict.dto.DictDataRespDTO; import com.win.module.wms.controller.unplannedissueRequest.vo.UnplannedissueRequestMainCreateReqVO; import com.win.module.wms.controller.unplannedissueRequest.vo.UnplannedissueRequestMainExportReqVO; @@ -25,6 +26,13 @@ public interface UnplannedissueRequestMainService { * @return 编号 */ Long createUnplannedissueRequestMain(@Valid UnplannedissueRequestMainCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getUnplannedissueRequestMainSenior(CustomConditions conditions); /** * 更新计划外出库申请主 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainServiceImpl.java index 497a4fb0..81346cd8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.unplannedissueRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.dict.DictDataApi; import com.win.module.system.api.dict.dto.DictDataRespDTO; import com.win.module.wms.controller.unplannedissueRequest.vo.UnplannedissueRequestMainCreateReqVO; @@ -51,7 +52,10 @@ public class UnplannedissueRequestMainServiceImpl implements UnplannedissueReque UnplannedissueRequestMainDO updateObj = UnplannedissueRequestMainConvert.INSTANCE.convert(updateReqVO); unplannedissueRequestMainMapper.updateById(updateObj); } - + @Override + public PageResult getUnplannedissueRequestMainSenior(CustomConditions conditions) { + return unplannedissueRequestMainMapper.selectSenior(conditions); + } @Override public void deleteUnplannedissueRequestMain(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobDetailService.java index e08bd95b..b5b69b92 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.unplannedreceiptJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobDetailCreateReqVO; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobDetailExportReqVO; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobDetailPageReqVO; @@ -24,6 +25,13 @@ public interface UnplannedreceiptJobDetailService { * @return 编号 */ Long createUnplannedreceiptJobDetail(@Valid UnplannedreceiptJobDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getUnplannedreceiptJobDetailSenior(CustomConditions conditions); /** * 更新计划外入库任务子 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobDetailServiceImpl.java index 0be493b1..6b2ad27f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.unplannedreceiptJob; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobDetailCreateReqVO; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobDetailExportReqVO; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobDetailPageReqVO; @@ -40,6 +41,11 @@ public class UnplannedreceiptJobDetailServiceImpl implements UnplannedreceiptJob return unplannedreceiptJobDetail.getId(); } + @Override + public PageResult getUnplannedreceiptJobDetailSenior(CustomConditions conditions) { + return unplannedreceiptJobDetailMapper.selectSenior(conditions); + } + @Override public void updateUnplannedreceiptJobDetail(UnplannedreceiptJobDetailUpdateReqVO updateReqVO) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainService.java index 2d82c5f0..56010f97 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.unplannedreceiptJob; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobMainCreateReqVO; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobMainExportReqVO; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobMainPageReqVO; @@ -24,6 +25,13 @@ public interface UnplannedreceiptJobMainService { * @return 编号 */ Long createUnplannedreceiptJobMain(@Valid UnplannedreceiptJobMainCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getUnplannedreceiptJobMainSenior(CustomConditions conditions); /** * 更新计划外入库任务主 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainServiceImpl.java index 15cbf16b..ed0ec730 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainServiceImpl.java @@ -1,23 +1,19 @@ package com.win.module.wms.service.unplannedreceiptJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobMainCreateReqVO; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobMainExportReqVO; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobMainPageReqVO; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobMainUpdateReqVO; -import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; - import java.util.*; - import com.win.module.wms.dal.dataobject.unplannedreceiptJob.UnplannedreceiptJobMainDO; import com.win.framework.common.pojo.PageResult; - import com.win.module.wms.convert.unplannedreceiptJob.UnplannedreceiptJobMainConvert; import com.win.module.wms.dal.mysql.unplannedreceiptJob.UnplannedreceiptJobMainMapper; - import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.module.wms.enums.ErrorCodeConstants.*; @@ -59,6 +55,8 @@ public class UnplannedreceiptJobMainServiceImpl implements UnplannedreceiptJobMa unplannedreceiptJobMainMapper.deleteById(id); } + + private void validateUnplannedreceiptJobMainExists(Long id) { if (unplannedreceiptJobMainMapper.selectById(id) == null) { throw exception(UNPLANNEDRECEIPT_JOB_MAIN_NOT_EXISTS); @@ -74,6 +72,10 @@ public class UnplannedreceiptJobMainServiceImpl implements UnplannedreceiptJobMa public List getUnplannedreceiptJobMainList(Collection ids) { return unplannedreceiptJobMainMapper.selectBatchIds(ids); } + @Override + public PageResult getUnplannedreceiptJobMainSenior(CustomConditions conditions) { + return unplannedreceiptJobMainMapper.selectSenior(conditions); + } @Override public PageResult getUnplannedreceiptJobMainPage(UnplannedreceiptJobMainPageReqVO pageReqVO) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordDetailService.java index 94a6a18e..7796d1d6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.unplannedreceiptRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.unplannedreceiptRecord.vo.UnplannedreceiptRecordDetailCreateReqVO; import com.win.module.wms.controller.unplannedreceiptRecord.vo.UnplannedreceiptRecordDetailExportReqVO; import com.win.module.wms.controller.unplannedreceiptRecord.vo.UnplannedreceiptRecordDetailPageReqVO; @@ -24,6 +25,13 @@ public interface UnplannedreceiptRecordDetailService { * @return 编号 */ Long createUnplannedreceiptRecordDetail(@Valid UnplannedreceiptRecordDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索计划外入库记录子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getUnplannedreceiptRecordDetailSenior(CustomConditions conditions); /** * 更新计划外入库记录子 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordDetailServiceImpl.java index 5dda2640..8199fab6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.unplannedreceiptRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.unplannedreceiptRecord.vo.UnplannedreceiptRecordDetailCreateReqVO; import com.win.module.wms.controller.unplannedreceiptRecord.vo.UnplannedreceiptRecordDetailExportReqVO; import com.win.module.wms.controller.unplannedreceiptRecord.vo.UnplannedreceiptRecordDetailPageReqVO; @@ -7,15 +8,11 @@ import com.win.module.wms.controller.unplannedreceiptRecord.vo.UnplannedreceiptR import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; - import java.util.*; - import com.win.module.wms.dal.dataobject.unplannedreceiptRecord.UnplannedreceiptRecordDetailDO; import com.win.framework.common.pojo.PageResult; - import com.win.module.wms.convert.unplannedreceiptRecord.UnplannedreceiptRecordDetailConvert; import com.win.module.wms.dal.mysql.unplannedreceiptRecord.UnplannedreceiptRecordDetailMapper; - import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.module.wms.enums.ErrorCodeConstants.*; @@ -39,7 +36,10 @@ public class UnplannedreceiptRecordDetailServiceImpl implements Unplannedreceipt // 返回 return unplannedreceiptRecordDetail.getId(); } - + @Override + public PageResult getUnplannedreceiptRecordDetailSenior(CustomConditions conditions) { + return unplannedreceiptRecordDetailMapper.selectSenior(conditions); + } @Override public void updateUnplannedreceiptRecordDetail(UnplannedreceiptRecordDetailUpdateReqVO updateReqVO) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordMainService.java index a3b55e4c..1dfb4e11 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.unplannedreceiptRecord; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.unplannedreceiptRecord.vo.UnplannedreceiptRecordMainCreateReqVO; import com.win.module.wms.controller.unplannedreceiptRecord.vo.UnplannedreceiptRecordMainExportReqVO; import com.win.module.wms.controller.unplannedreceiptRecord.vo.UnplannedreceiptRecordMainPageReqVO; @@ -25,6 +26,14 @@ public interface UnplannedreceiptRecordMainService { */ Long createUnplannedreceiptRecordMain(@Valid UnplannedreceiptRecordMainCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getUnplannedreceiptRecordMainSenior(CustomConditions conditions); + /** * 更新计划外入库记录主 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordMainServiceImpl.java index c24b8aab..cdddc87e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.unplannedreceiptRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.unplannedreceiptRecord.vo.UnplannedreceiptRecordMainCreateReqVO; import com.win.module.wms.controller.unplannedreceiptRecord.vo.UnplannedreceiptRecordMainExportReqVO; import com.win.module.wms.controller.unplannedreceiptRecord.vo.UnplannedreceiptRecordMainPageReqVO; @@ -7,15 +8,11 @@ import com.win.module.wms.controller.unplannedreceiptRecord.vo.UnplannedreceiptR import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; - import java.util.*; - import com.win.module.wms.dal.dataobject.unplannedreceiptRecord.UnplannedreceiptRecordMainDO; import com.win.framework.common.pojo.PageResult; - import com.win.module.wms.convert.unplannedreceiptRecord.UnplannedreceiptRecordMainConvert; import com.win.module.wms.dal.mysql.unplannedreceiptRecord.UnplannedreceiptRecordMainMapper; - import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.module.wms.enums.ErrorCodeConstants.*; @@ -31,6 +28,12 @@ public class UnplannedreceiptRecordMainServiceImpl implements UnplannedreceiptRe @Resource private UnplannedreceiptRecordMainMapper unplannedreceiptRecordMainMapper; + @Override + public PageResult getUnplannedreceiptRecordMainSenior(CustomConditions conditions) { + return unplannedreceiptRecordMainMapper.selectSenior(conditions); + } + + @Override public Long createUnplannedreceiptRecordMain(UnplannedreceiptRecordMainCreateReqVO createReqVO) { // 插入 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestDetailService.java index 95a84d27..13b75b0c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.unplannedreceiptRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.unplannedreceiptRequest.vo.UnplannedreceiptRequestDetailCreateReqVO; import com.win.module.wms.controller.unplannedreceiptRequest.vo.UnplannedreceiptRequestDetailExportReqVO; import com.win.module.wms.controller.unplannedreceiptRequest.vo.UnplannedreceiptRequestDetailPageReqVO; @@ -24,6 +25,13 @@ public interface UnplannedreceiptRequestDetailService { * @return 编号 */ Long createUnplannedreceiptRequestDetail(@Valid UnplannedreceiptRequestDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getUnplannedreceiptRequestDetailSenior(CustomConditions conditions); /** * 更新计划外入库申请子 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestDetailServiceImpl.java index 6bc1a50f..5f98b9f1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.unplannedreceiptRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.unplannedreceiptRequest.vo.UnplannedreceiptRequestDetailCreateReqVO; import com.win.module.wms.controller.unplannedreceiptRequest.vo.UnplannedreceiptRequestDetailExportReqVO; import com.win.module.wms.controller.unplannedreceiptRequest.vo.UnplannedreceiptRequestDetailPageReqVO; @@ -57,6 +58,11 @@ public class UnplannedreceiptRequestDetailServiceImpl implements Unplannedreceip unplannedreceiptRequestDetailMapper.deleteById(id); } + @Override + public PageResult getUnplannedreceiptRequestDetailSenior(CustomConditions conditions) { + return unplannedreceiptRequestDetailMapper.selectSenior(conditions); + } + private void validateUnplannedreceiptRequestDetailExists(Long id) { if (unplannedreceiptRequestDetailMapper.selectById(id) == null) { throw exception(UNPLANNEDRECEIPT_REQUEST_DETAIL_NOT_EXISTS); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestMainService.java index a60a6429..53a752bf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.unplannedreceiptRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.unplannedreceiptRequest.vo.UnplannedreceiptRequestMainCreateReqVO; import com.win.module.wms.controller.unplannedreceiptRequest.vo.UnplannedreceiptRequestMainExportReqVO; import com.win.module.wms.controller.unplannedreceiptRequest.vo.UnplannedreceiptRequestMainPageReqVO; @@ -25,6 +26,14 @@ public interface UnplannedreceiptRequestMainService { */ Long createUnplannedreceiptRequestMain(@Valid UnplannedreceiptRequestMainCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getUnplannedreceiptRequestMainSenior(CustomConditions conditions); + /** * 更新计划外入库申请主 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestMainServiceImpl.java index 639ee908..9a9e07ff 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.unplannedreceiptRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.unplannedreceiptRequest.vo.UnplannedreceiptRequestMainCreateReqVO; import com.win.module.wms.controller.unplannedreceiptRequest.vo.UnplannedreceiptRequestMainExportReqVO; import com.win.module.wms.controller.unplannedreceiptRequest.vo.UnplannedreceiptRequestMainPageReqVO; @@ -48,7 +49,10 @@ public class UnplannedreceiptRequestMainServiceImpl implements UnplannedreceiptR UnplannedreceiptRequestMainDO updateObj = UnplannedreceiptRequestMainConvert.INSTANCE.convert(updateReqVO); unplannedreceiptRequestMainMapper.updateById(updateObj); } - + @Override + public PageResult getUnplannedreceiptRequestMainSenior(CustomConditions conditions) { + return unplannedreceiptRequestMainMapper.selectSenior(conditions); + } @Override public void deleteUnplannedreceiptRequestMain(Long id) { // 校验存在 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseService.java index 980a5da7..4e8faf06 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseService.java @@ -3,9 +3,11 @@ package com.win.module.wms.service.warehouse; import java.util.*; import javax.validation.*; -import com.win.module.wms.controller.itembasic.vo.ItembasicImportExcelVo; +import com.win.framework.common.pojo.CustomConditions; +import com.win.module.wms.controller.warehouse.vo.WarehouseImportExcelVo; import com.win.module.wms.controller.warehouse.vo.*; import com.win.module.wms.dal.dataobject.warehouse.WarehouseDO; +import com.win.module.wms.dal.dataobject.warehouse.WarehouseDO; import com.win.framework.common.pojo.PageResult; /** @@ -22,6 +24,13 @@ public interface WarehouseService { * @return 编号 */ Long createWarehouse(@Valid WarehouseCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getWarehouseSenior(CustomConditions conditions); /** * 更新仓库 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseServiceImpl.java index b070a7c5..968b54cf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseServiceImpl.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.warehouse.vo.WarehouseCreateReqVO; @@ -13,6 +14,7 @@ import com.win.module.wms.controller.warehouse.vo.WarehousePageReqVO; import com.win.module.wms.controller.warehouse.vo.WarehouseUpdateReqVO; import com.win.module.wms.controller.warehouse.vo.WarehouseImportExcelVo; import com.win.module.wms.convert.warehouse.WarehouseConvert; +import com.win.module.wms.dal.dataobject.warehouse.WarehouseDO; import com.win.module.wms.dal.dataobject.packageMassage.PackageDO; import com.win.module.wms.dal.dataobject.warehouse.WarehouseDO; import com.win.module.wms.dal.mysql.warehouse.WarehouseMapper; @@ -78,6 +80,7 @@ public class WarehouseServiceImpl implements WarehouseService { return warehouseMapper.selectBatchIds(ids); } + @Override public PageResult getWarehousePage(WarehousePageReqVO pageReqVO) { return warehouseMapper.selectPage(pageReqVO); @@ -87,6 +90,10 @@ public class WarehouseServiceImpl implements WarehouseService { public List getWarehouseList(WarehouseExportReqVO exportReqVO) { return warehouseMapper.selectList(exportReqVO); } + @Override + public PageResult getWarehouseSenior(CustomConditions conditions) { + return warehouseMapper.selectSenior(conditions); + } public List importWarehouseList(List warehouses, Integer mode, boolean updatePart) { if (CollUtil.isEmpty(warehouses)) { @@ -95,24 +102,38 @@ public class WarehouseServiceImpl implements WarehouseService { List errorList = new ArrayList<>(); warehouses.forEach(warehouse -> { // 校验，判断是否有不符合的原因 - try { + String massage = ""; + if(mode != null){ - validateWarehouseForCreateOrUpdate(null,warehouse.getCode(),warehouse.getAvailable()); + try { + validateWarehouseExists(null); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateCodeExists(null,warehouse.getCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(warehouse.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } } - } catch (ServiceException ex) { + if(StrUtil.isNotEmpty(massage)){ + massage.substring(0,massage.length()-1); errorList.add(warehouse); - return; } - // 判断如果不存在，在进行插入 - WarehouseDO existWarehouse = warehouseMapper.selectByCode(warehouse.getCode()); - if (existWarehouse == null&& mode != 3) { - warehouseMapper.insert(WarehouseConvert.INSTANCE.convert(warehouse)); - } - else if (existWarehouse != null && mode != 2) {// 如果存在，判断是否允许更新 - WarehouseDO warehouseDO = WarehouseConvert.INSTANCE.convert(warehouse); - warehouseDO.setId(existWarehouse.getId()); - warehouseMapper.updateById(warehouseDO); + if(errorList == null){ WarehouseDO existWarehouse = warehouseMapper.selectByCode(warehouse.getCode()); + if (existWarehouse == null&& mode != 3) { + warehouseMapper.insert(WarehouseConvert.INSTANCE.convert(warehouse)); + } + else if (existWarehouse != null && mode != 2) {// 如果存在，判断是否允许更新 + WarehouseDO warehouseDO = WarehouseConvert.INSTANCE.convert(warehouse); + warehouseDO.setId(existWarehouse.getId()); + warehouseMapper.updateById(warehouseDO);} } }); //错误不为空并非部分更新，手工回滚 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/work/WorkDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/work/WorkDetailService.java index e92f968f..7fed2b26 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/work/WorkDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/work/WorkDetailService.java @@ -3,10 +3,12 @@ package com.win.module.wms.service.work; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.work.vo.WorkDetailCreateReqVO; import com.win.module.wms.controller.work.vo.WorkDetailExportReqVO; import com.win.module.wms.controller.work.vo.WorkDetailPageReqVO; import com.win.module.wms.controller.work.vo.WorkDetailUpdateReqVO; + import com.win.module.wms.dal.dataobject.work.WorkDetailDO; import com.win.framework.common.pojo.PageResult; @@ -24,6 +26,13 @@ public interface WorkDetailService { * @return 编号 */ Long createWorkDetail(@Valid WorkDetailCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getWorkDetailSenior(CustomConditions conditions); /** * 更新生产订单子 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/work/WorkDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/work/WorkDetailServiceImpl.java index 5cf3bc2c..61eaa818 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/work/WorkDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/work/WorkDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.work; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.work.vo.WorkDetailCreateReqVO; import com.win.module.wms.controller.work.vo.WorkDetailExportReqVO; import com.win.module.wms.controller.work.vo.WorkDetailPageReqVO; @@ -67,6 +68,11 @@ public class WorkDetailServiceImpl implements WorkDetailService { public WorkDetailDO getWorkDetail(Long id) { return workDetailMapper.selectById(id); } + + @Override + public PageResult getWorkDetailSenior(CustomConditions conditions) { + return workDetailMapper.selectSenior(conditions); + } @Override public List getWorkDetailList(Collection ids) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/work/WorkMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/work/WorkMainService.java index 7002e830..0dc1ae67 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/work/WorkMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/work/WorkMainService.java @@ -3,10 +3,12 @@ package com.win.module.wms.service.work; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.work.vo.WorkMainCreateReqVO; import com.win.module.wms.controller.work.vo.WorkMainExportReqVO; import com.win.module.wms.controller.work.vo.WorkMainPageReqVO; import com.win.module.wms.controller.work.vo.WorkMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.work.WorkMainDO; import com.win.framework.common.pojo.PageResult; @@ -24,6 +26,13 @@ public interface WorkMainService { * @return 编号 */ Long createWorkMain(@Valid WorkMainCreateReqVO createReqVO); + /** + * 获得用高级搜索订单主分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getWorkMainSenior(CustomConditions conditions); /** * 更新生产订单主 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/work/WorkMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/work/WorkMainServiceImpl.java index 73db138a..c75089ee 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/work/WorkMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/work/WorkMainServiceImpl.java @@ -1,9 +1,11 @@ package com.win.module.wms.service.work; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.work.vo.WorkMainCreateReqVO; import com.win.module.wms.controller.work.vo.WorkMainExportReqVO; import com.win.module.wms.controller.work.vo.WorkMainPageReqVO; import com.win.module.wms.controller.work.vo.WorkMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -77,6 +79,10 @@ public class WorkMainServiceImpl implements WorkMainService { public PageResult getWorkMainPage(WorkMainPageReqVO pageReqVO) { return workMainMapper.selectPage(pageReqVO); } + @Override + public PageResult getWorkMainSenior(CustomConditions conditions) { + return workMainMapper.selectSenior(conditions); + } @Override public List getWorkMainList(WorkMainExportReqVO exportReqVO) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workshop/WorkshopService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workshop/WorkshopService.java index 5e303599..41302a42 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workshop/WorkshopService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workshop/WorkshopService.java @@ -3,9 +3,11 @@ package com.win.module.wms.service.workshop; import java.util.*; import javax.validation.*; -import com.win.module.wms.controller.itembasic.vo.ItembasicImportExcelVo; +import com.win.framework.common.pojo.CustomConditions; +import com.win.module.wms.controller.workshop.vo.WorkshopImportExcelVo; import com.win.module.wms.controller.workshop.vo.*; import com.win.module.wms.dal.dataobject.workshop.WorkshopDO; +import com.win.module.wms.dal.dataobject.workshop.WorkshopDO; import com.win.framework.common.pojo.PageResult; /** @@ -44,6 +46,13 @@ public interface WorkshopService { * @return 车间 */ WorkshopDO getWorkshop(Long id); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getWorkshopSenior(CustomConditions conditions); /** * 获得车间列表 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workshop/WorkshopServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workshop/WorkshopServiceImpl.java index bcc767cd..124da091 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workshop/WorkshopServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workshop/WorkshopServiceImpl.java @@ -5,10 +5,12 @@ 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.workshop.vo.*; import com.win.module.wms.convert.workshop.WorkshopConvert; +import com.win.module.wms.dal.dataobject.workshop.WorkshopDO; import com.win.module.wms.dal.dataobject.itempackaging.ItempackagingDO; import com.win.module.wms.dal.dataobject.workshop.WorkshopDO; import com.win.module.wms.dal.mysql.workshop.WorkshopMapper; @@ -83,33 +85,53 @@ public class WorkshopServiceImpl implements WorkshopService { return workshopMapper.selectList(exportReqVO); } + @Override + public PageResult getWorkshopSenior(CustomConditions conditions) { + return workshopMapper.selectSenior(conditions); + } + public List importUserList(List importWork, Integer mode, boolean updatePart) { if (CollUtil.isEmpty(importWork)) { throw exception(WORKSHOP_IMPORT_LIST_IS_EMPTY); } List errorList = new ArrayList<>(); importWork.forEach(importWorkshop -> { - // 校验，判断是否有不符合的原因 - try { - if(mode != null){ - validateWorkshopForCreateOrUpdate(null,importWorkshop.getCode(),importWorkshop.getAvailable()); + String massage = ""; + // 校验，判断是否有不符合的原因 + + if (mode != null) { + try { + validateWorkshopExists(null); + } catch(ServiceException ex){ + massage += ex.getMessage() + ","; + } + try { + validateCodeExists(null,importWorkshop.getCode()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } + try { + validateAvailableExists(importWorkshop.getAvailable()); + } catch (ServiceException ex) { + massage += ex.getMessage() + ","; + } } - } catch (ServiceException ex) { + if(StrUtil.isNotEmpty(massage)){ + massage.substring(0,massage.length()-1); errorList.add(importWorkshop); - return; } - // 判断如果不存在，在进行插入 - WorkshopDO existWorkshop = workshopMapper.selectByCode(importWorkshop.getCode()); - if (existWorkshop == null&& mode != 3) { - workshopMapper.insert(WorkshopConvert.INSTANCE.convert(importWorkshop)); - } - else if (existWorkshop != null && mode != 2) {// 如果存在，判断是否允许更新 - WorkshopDO workshopDO = WorkshopConvert.INSTANCE.convert(importWorkshop); - workshopDO.setId(existWorkshop.getId()); - workshopMapper.updateById(workshopDO); - } - }); + if(errorList == null) { + WorkshopDO existWorkshop = workshopMapper.selectByCode(importWorkshop.getCode()); + if (existWorkshop == null && mode != 3) { + workshopMapper.insert(WorkshopConvert.INSTANCE.convert(importWorkshop)); + } else if (existWorkshop != null && mode != 2) {// 如果存在，判断是否允许更新 + WorkshopDO workshopDO = WorkshopConvert.INSTANCE.convert(importWorkshop); + workshopDO.setId(existWorkshop.getId()); + workshopMapper.updateById(workshopDO); + } + } + }); //错误不为空并非部分更新，手工回滚 if(!errorList.isEmpty() && !updatePart) { TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workstation/WorkstationService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workstation/WorkstationService.java index df832fb2..8e0d6ac9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workstation/WorkstationService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workstation/WorkstationService.java @@ -1,7 +1,9 @@ package com.win.module.wms.service.workstation; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.workstation.vo.*; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.workstation.WorkstationDO; import javax.validation.Valid; @@ -23,6 +25,14 @@ public interface WorkstationService { */ Long createWorkstation(@Valid WorkstationCreateReqVO createReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getWorkstationSenior(CustomConditions conditions); + /** * 更新工位 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workstation/WorkstationServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workstation/WorkstationServiceImpl.java index 71735fbb..00fcd30b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workstation/WorkstationServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workstation/WorkstationServiceImpl.java @@ -6,11 +6,11 @@ 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.workstation.vo.*; import com.win.module.wms.convert.workstation.WorkstationConvert; -import com.win.module.wms.dal.dataobject.itempackaging.ItempackagingDO; import com.win.module.wms.dal.dataobject.workstation.WorkstationDO; import com.win.module.wms.dal.mysql.workstation.WorkstationMapper; import org.springframework.stereotype.Service; @@ -95,26 +95,51 @@ public class WorkstationServiceImpl implements WorkstationService { } List errorList = new ArrayList<>(); workstations.forEach(workstation -> { + String massage = ""; // 校验，判断是否有不符合的原因 - try { if(mode != null){ - validateWorkstationForCreateOrUpdate(null,workstation.getCode(),workstation.getWorkshopCode(),workstation.getProductionLineCode(),workstation.getAvailable()); + try{ + validateWorkstationExists(null); + } catch(ServiceException ex){ + massage += ex.getMessage() + ","; + } + try{ + validateCodeExists(null,workstation.getCode()); + } catch(ServiceException ex){ + massage += ex.getMessage() + ","; + } + try{ + validateWorkshopCodeExists(workstation.getWorkshopCode()); + } catch(ServiceException ex){ + massage += ex.getMessage() + ","; + } + try{ + validateProductionLineCodeExists(workstation.getProductionLineCode()); + } catch(ServiceException ex){ + massage += ex.getMessage() + ","; + } + try{ + validateAvailableExists(workstation.getAvailable()); + } catch(ServiceException ex){ + massage += ex.getMessage() + ","; + } + if(StrUtil.isNotEmpty(massage)){ + massage.substring(0,massage.length()-1); + errorList.add(workstation); + } + // 判断如果不存在，在进行插入 + if(errorList == null){ + WorkstationDO existAccountcalendar = workstationMapper.selectByCode(workstation.getCode()); + if (existAccountcalendar == null&& mode != 3) { + workstationMapper.insert(WorkstationConvert.INSTANCE.convert(workstation)); + } + else if (existAccountcalendar != null && mode != 2) {// 如果存在，判断是否允许更新 + WorkstationDO workstationDo = WorkstationConvert.INSTANCE.convert(workstation); + workstationDo.setId(existAccountcalendar.getId()); + workstationMapper.updateById(workstationDo); + } + } } - } - catch (ServiceException ex) { - errorList.add(workstation); - return; - } - // 判断如果不存在，在进行插入 - WorkstationDO existAccountcalendar = workstationMapper.selectByCode(workstation.getCode()); - if (existAccountcalendar == null&& mode != 3) { - workstationMapper.insert(WorkstationConvert.INSTANCE.convert(workstation)); - } - else if (existAccountcalendar != null && mode != 2) {// 如果存在，判断是否允许更新 - WorkstationDO workstationDo = WorkstationConvert.INSTANCE.convert(workstation); - workstationDo.setId(existAccountcalendar.getId()); - workstationMapper.updateById(workstationDo); - } }); //错误不为空并非部分更新，手工回滚 if(!errorList.isEmpty() && !updatePart) { @@ -182,6 +207,11 @@ public class WorkstationServiceImpl implements WorkstationService { throw exception(WORKSTATION_AVAIABLE_NOT_EXISTS); } } + @Override + public PageResult getWorkstationSenior(CustomConditions conditions) { + return workstationMapper.selectSenior(conditions); + } + @Override public WorkstationDO selectWorkstationExist(String pcode){ QueryWrapper queryWrapperWorkstation = new QueryWrapper();