diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/PackageController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/PackageController.java index fc047f03..3c9c630e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/PackageController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/PackageController.java @@ -1,39 +1,33 @@ package com.win.module.wms.controller.packageMassage; -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.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.packageMassage.vo.*; +import com.win.module.wms.convert.packageMassage.PackageConvert; +import com.win.module.wms.dal.dataobject.packageMassage.PackageDO; import com.win.module.wms.dal.mysql.packageMassage.PackageMapper; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.service.packageMassage.PackageService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +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 com.win.framework.common.pojo.PageResult; -import com.win.framework.common.pojo.CommonResult; - -import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; 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 static com.win.module.wms.enums.ErrorCodeConstants.PACKAGE_NOT_EXISTS; - -import com.win.module.wms.controller.packageMassage.vo.*; -import com.win.module.wms.dal.dataobject.packageMassage.PackageDO; -import com.win.module.wms.convert.packageMassage.PackageConvert; -import com.win.module.wms.service.packageMassage.PackageService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 包装") @RestController @@ -114,4 +108,18 @@ public class PackageController { ExcelUtils.write(response, "包装.xls", "数据", PackageExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得包装分页") + @PreAuthorize("@ss.hasPermission('wms:package:query')") + public CommonResult> getPackageSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = packageService.getPackageSenior(conditions); + PageResult result = PackageConvert.INSTANCE.convertPage(pageResult); + for(PackageRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageBaseVO.java index f79ee339..88851001 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageBaseVO.java @@ -1,17 +1,13 @@ package com.win.module.wms.controller.packageMassage.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.math.BigDecimal; -import java.math.BigDecimal; -import java.math.BigDecimal; -import javax.validation.constraints.*; +import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; +import javax.validation.constraints.NotNull; +import java.math.BigDecimal; +import java.time.LocalDateTime; + import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; /** @@ -152,4 +148,7 @@ public class PackageBaseVO { @Schema(description = "体积") private String volume; + @Schema(description = "创建者用户名") + private String creator; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/paramsetting/ParamsettingController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/paramsetting/ParamsettingController.java index 68fa2d12..5cbf98eb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/paramsetting/ParamsettingController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/paramsetting/ParamsettingController.java @@ -1,6 +1,7 @@ package com.win.module.wms.controller.paramsetting; 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; @@ -148,4 +149,18 @@ public class ParamsettingController { returnMap.put("errorFile", url); } } + + @PostMapping("/senior") + @Operation(summary = "高级搜索获得参数设置分页") + @PreAuthorize("@ss.hasPermission('wms:paramsetting:query')") + public CommonResult> getParamsettingSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = paramsettingService.getParamsettingSenior(conditions); + PageResult result = ParamsettingConvert.INSTANCE.convertPage(pageResult); + for(ParamsettingRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/paramsetting/vo/ParamsettingBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/paramsetting/vo/ParamsettingBaseVO.java index b14af73f..dcae6046 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/paramsetting/vo/ParamsettingBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/paramsetting/vo/ParamsettingBaseVO.java @@ -1,9 +1,9 @@ package com.win.module.wms.controller.paramsetting.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import javax.validation.constraints.*; +import lombok.Data; + +import javax.validation.constraints.NotNull; /** * 参数设置 Base VO，提供给添加、修改、详细的子 VO 使用 @@ -48,4 +48,7 @@ public class ParamsettingBaseVO { @NotNull(message = "必填不能为空") private String isRequired; + @Schema(description = "创建者用户名") + private String creator; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/PickJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/PickJobDetailController.java index 4a06cda4..cc175a3a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/PickJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/PickJobDetailController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.pickJob; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.pickJob.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.convert.pickJob.PickJobDetailConvert; +import com.win.module.wms.dal.dataobject.pickJob.PickJobDetailDO; +import com.win.module.wms.service.pickJob.PickJobDetailService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +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 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.pickJob.vo.*; -import com.win.module.wms.dal.dataobject.pickJob.PickJobDetailDO; -import com.win.module.wms.convert.pickJob.PickJobDetailConvert; -import com.win.module.wms.service.pickJob.PickJobDetailService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 拣料任务子") @RestController @@ -109,4 +107,18 @@ public class PickJobDetailController { ExcelUtils.write(response, "拣料任务子.xls", "数据", PickJobDetailExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得拣料任务子分页") + @PreAuthorize("@ss.hasPermission('wms:pick-job-detail:query')") + public CommonResult> getPickJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = pickJobDetailService.getPickJobDetailSenior(conditions); + PageResult result = PickJobDetailConvert.INSTANCE.convertPage(pageResult); + for(PickJobDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/PickJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/PickJobMainController.java index da114a53..b29d918e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/PickJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/PickJobMainController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.pickJob; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.pickJob.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.convert.pickJob.PickJobMainConvert; +import com.win.module.wms.dal.dataobject.pickJob.PickJobMainDO; +import com.win.module.wms.service.pickJob.PickJobMainService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +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 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.pickJob.vo.*; -import com.win.module.wms.dal.dataobject.pickJob.PickJobMainDO; -import com.win.module.wms.convert.pickJob.PickJobMainConvert; -import com.win.module.wms.service.pickJob.PickJobMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 拣料任务主") @RestController @@ -108,4 +106,18 @@ public class PickJobMainController { ExcelUtils.write(response, "拣料任务主.xls", "数据", PickJobMainExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得拣料任务主分页") + @PreAuthorize("@ss.hasPermission('wms:pick-job-main:query')") + public CommonResult> getPickJobMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = pickJobMainService.getPickJobMainSenior(conditions); + PageResult result = PickJobMainConvert.INSTANCE.convertPage(pageResult); + for(PickJobMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/vo/PickJobDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/vo/PickJobDetailBaseVO.java index ce22a9e8..fc8286f0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/vo/PickJobDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/vo/PickJobDetailBaseVO.java @@ -1,12 +1,12 @@ package com.win.module.wms.controller.pickJob.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotNull; import java.math.BigDecimal; import java.time.LocalDateTime; -import javax.validation.constraints.*; -import org.springframework.format.annotation.DateTimeFormat; import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @@ -83,4 +83,7 @@ public class PickJobDetailBaseVO { @Schema(description = "到货主代码") private String toOwnerCode; + @Schema(description = "创建者用户名") + private String creator; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRecord/PickRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRecord/PickRecordDetailController.java index 123be98d..33b6d4cc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRecord/PickRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRecord/PickRecordDetailController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.pickRecord; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.pickRecord.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.convert.pickRecord.PickRecordDetailConvert; +import com.win.module.wms.dal.dataobject.pickRecord.PickRecordDetailDO; +import com.win.module.wms.service.pickRecord.PickRecordDetailService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +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 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.pickRecord.vo.*; -import com.win.module.wms.dal.dataobject.pickRecord.PickRecordDetailDO; -import com.win.module.wms.convert.pickRecord.PickRecordDetailConvert; -import com.win.module.wms.service.pickRecord.PickRecordDetailService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 拣料记录子") @RestController @@ -109,4 +107,17 @@ public class PickRecordDetailController { ExcelUtils.write(response, "拣料记录子.xls", "数据", PickRecordDetailExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得拣料记录子分页") + @PreAuthorize("@ss.hasPermission('wms:pick-record-detail:query')") + public CommonResult> getPickRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = pickRecordDetailService.getPickRecordDetailSenior(conditions); + PageResult result = PickRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(PickRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRecord/PickRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRecord/PickRecordMainController.java index b4745fc2..e6bcf7a0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRecord/PickRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRecord/PickRecordMainController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.pickRecord; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.pickRecord.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.convert.pickRecord.PickRecordMainConvert; +import com.win.module.wms.dal.dataobject.pickRecord.PickRecordMainDO; +import com.win.module.wms.service.pickRecord.PickRecordMainService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +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 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.pickRecord.vo.*; -import com.win.module.wms.dal.dataobject.pickRecord.PickRecordMainDO; -import com.win.module.wms.convert.pickRecord.PickRecordMainConvert; -import com.win.module.wms.service.pickRecord.PickRecordMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 拣料记录主") @RestController @@ -109,4 +107,17 @@ public class PickRecordMainController { ExcelUtils.write(response, "拣料记录主.xls", "数据", PickRecordMainExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得拣料记录主分页") + @PreAuthorize("@ss.hasPermission('wms:pick-record-main:query')") + public CommonResult> getPickRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = pickRecordMainService.getPickRecordMainSenior(conditions); + PageResult result = PickRecordMainConvert.INSTANCE.convertPage(pageResult); + for(PickRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/PickRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/PickRequestDetailController.java index ea5740b0..9f20f017 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/PickRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/PickRequestDetailController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.pickRequest; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.pickRequest.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.convert.pickRequest.PickRequestDetailConvert; +import com.win.module.wms.dal.dataobject.pickRequest.PickRequestDetailDO; +import com.win.module.wms.service.pickRequest.PickRequestDetailService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +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 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.pickRequest.vo.*; -import com.win.module.wms.dal.dataobject.pickRequest.PickRequestDetailDO; -import com.win.module.wms.convert.pickRequest.PickRequestDetailConvert; -import com.win.module.wms.service.pickRequest.PickRequestDetailService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 拣料申请子") @RestController @@ -109,4 +107,18 @@ public class PickRequestDetailController { ExcelUtils.write(response, "拣料申请子.xls", "数据", PickRequestDetailExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得拣料申请子分页") + @PreAuthorize("@ss.hasPermission('wms:pick-request-detail:query')") + public CommonResult> getPickRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = pickRequestDetailService.getPickRequestDetailSenior(conditions); + PageResult result = PickRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(PickRequestDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/PickRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/PickRequestMainController.java index 4173d244..63f3cbd6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/PickRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/PickRequestMainController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.pickRequest; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.pickRequest.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.convert.pickRequest.PickRequestMainConvert; +import com.win.module.wms.dal.dataobject.pickRequest.PickRequestMainDO; +import com.win.module.wms.service.pickRequest.PickRequestMainService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +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 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.pickRequest.vo.*; -import com.win.module.wms.dal.dataobject.pickRequest.PickRequestMainDO; -import com.win.module.wms.convert.pickRequest.PickRequestMainConvert; -import com.win.module.wms.service.pickRequest.PickRequestMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 拣料申请主") @RestController @@ -109,4 +107,18 @@ public class PickRequestMainController { ExcelUtils.write(response, "拣料申请主.xls", "数据", PickRequestMainExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得拣料申请主分页") + @PreAuthorize("@ss.hasPermission('wms:pick-request-main:query')") + public CommonResult> getPickRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = pickRequestMainService.getPickRequestMainSenior(conditions); + PageResult result = PickRequestMainConvert.INSTANCE.convertPage(pageResult); + for(PickRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/PreparetoissueDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/PreparetoissueDetailController.java index a5db71a0..a806644d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/PreparetoissueDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/PreparetoissueDetailController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.preparetoissue; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.preparetoissue.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.convert.preparetoissue.PreparetoissueDetailConvert; +import com.win.module.wms.dal.dataobject.preparetoissue.PreparetoissueDetailDO; +import com.win.module.wms.service.preparetoissue.PreparetoissueDetailService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +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 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.preparetoissue.vo.*; -import com.win.module.wms.dal.dataobject.preparetoissue.PreparetoissueDetailDO; -import com.win.module.wms.convert.preparetoissue.PreparetoissueDetailConvert; -import com.win.module.wms.service.preparetoissue.PreparetoissueDetailService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 备料计划子") @RestController @@ -109,4 +107,18 @@ public class PreparetoissueDetailController { ExcelUtils.write(response, "备料计划子.xls", "数据", PreparetoissueDetailExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得备料计划子分页") + @PreAuthorize("@ss.hasPermission('wms:preparetoissue-detail:query')") + public CommonResult> getPreparetoissueDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = preparetoissueDetailService.getPreparetoissueDetailSenior(conditions); + PageResult result = PreparetoissueDetailConvert.INSTANCE.convertPage(pageResult); + for(PreparetoissueDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/PreparetoissueMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/PreparetoissueMainController.java index a3ad13c7..b295f232 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/PreparetoissueMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/PreparetoissueMainController.java @@ -1,33 +1,32 @@ package com.win.module.wms.controller.preparetoissue; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.preparetoissue.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.convert.preparetoissue.PreparetoissueMainConvert; +import com.win.module.wms.dal.dataobject.preparetoissue.PreparetoissueMainDO; +import com.win.module.wms.service.preparetoissue.PreparetoissueMainService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +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 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.preparetoissue.PreparetoissueMainDO; -import com.win.module.wms.convert.preparetoissue.PreparetoissueMainConvert; -import com.win.module.wms.service.preparetoissue.PreparetoissueMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 备料计划主") @RestController @@ -107,4 +106,18 @@ public class PreparetoissueMainController { ExcelUtils.write(response, "备料计划主.xls", "数据", PreparetoissueMainExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得备料计划主分页") + @PreAuthorize("@ss.hasPermission('wms:preparetoissue-main:query')") + public CommonResult> getPreparetoissueMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = preparetoissueMainService.getPreparetoissueMainSenior(conditions); + PageResult result = PreparetoissueMainConvert.INSTANCE.convertPage(pageResult); + for(PreparetoissueMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/process/ProcessController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/process/ProcessController.java index 4eeaf2a5..7521584a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/process/ProcessController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/process/ProcessController.java @@ -1,6 +1,7 @@ package com.win.module.wms.controller.process; 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; @@ -145,4 +146,19 @@ public class ProcessController { returnMap.put("errorFile", url); } } + + @PostMapping("/senior") + @Operation(summary = "高级搜索获得工序分页") + @PreAuthorize("@ss.hasPermission('wms:process:query')") + public CommonResult> getProcessSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = processService.getProcessSenior(conditions); + PageResult result = ProcessConvert.INSTANCE.convertPage(pageResult); + for(ProcessRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/ProductdismantleJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/ProductdismantleJobDetailController.java index bbe8daab..191c7c9f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/ProductdismantleJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/ProductdismantleJobDetailController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.productdismantleJob; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productdismantleJob.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.convert.productdismantleJob.ProductdismantleJobDetailConvert; +import com.win.module.wms.dal.dataobject.productdismantleJob.ProductdismantleJobDetailDO; +import com.win.module.wms.service.productdismantleJob.ProductdismantleJobDetailService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +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 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.productdismantleJob.vo.*; -import com.win.module.wms.dal.dataobject.productdismantleJob.ProductdismantleJobDetailDO; -import com.win.module.wms.convert.productdismantleJob.ProductdismantleJobDetailConvert; -import com.win.module.wms.service.productdismantleJob.ProductdismantleJobDetailService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品拆解任务子") @RestController @@ -108,5 +106,20 @@ public class ProductdismantleJobDetailController { } ExcelUtils.write(response, "制品拆解任务子.xls", "数据", ProductdismantleJobDetailExcelVO.class, datas); } + + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品拆解任务子分页") + @PreAuthorize("@ss.hasPermission('wms:productdismantle-job-detail:query')") + public CommonResult> getProductdismantleJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productdismantleJobDetailService.getProductdismantleJobDetailSenior(conditions); + PageResult result = ProductdismantleJobDetailConvert.INSTANCE.convertPage(pageResult); + for(ProductdismantleJobDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/ProductdismantleJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/ProductdismantleJobMainController.java index 35d852aa..0fcb2706 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/ProductdismantleJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/ProductdismantleJobMainController.java @@ -1,33 +1,32 @@ package com.win.module.wms.controller.productdismantleJob; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productdismantleJob.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.convert.productdismantleJob.ProductdismantleJobMainConvert; +import com.win.module.wms.dal.dataobject.productdismantleJob.ProductdismantleJobMainDO; +import com.win.module.wms.service.productdismantleJob.ProductdismantleJobMainService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +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 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.productdismantleJob.ProductdismantleJobMainDO; -import com.win.module.wms.convert.productdismantleJob.ProductdismantleJobMainConvert; -import com.win.module.wms.service.productdismantleJob.ProductdismantleJobMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品拆解任务主") @RestController @@ -108,4 +107,18 @@ public class ProductdismantleJobMainController { ExcelUtils.write(response, "制品拆解任务主.xls", "数据", ProductdismantleJobMainExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品拆解任务主分页") + @PreAuthorize("@ss.hasPermission('wms:productdismantle-job-main:query')") + public CommonResult> getProductdismantleJobMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productdismantleJobMainService.getProductdismantleJobMainSenior(conditions); + PageResult result = ProductdismantleJobMainConvert.INSTANCE.convertPage(pageResult); + for(ProductdismantleJobMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/ProductdismantleRecordDetailaController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/ProductdismantleRecordDetailaController.java index 36e3d75a..3c76e9a9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/ProductdismantleRecordDetailaController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/ProductdismantleRecordDetailaController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.productdismantleRecord; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productdismantleRecord.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.convert.productdismantleRecord.ProductdismantleRecordDetailaConvert; +import com.win.module.wms.dal.dataobject.productdismantleRecord.ProductdismantleRecordDetailaDO; +import com.win.module.wms.service.productdismantleRecord.ProductdismantleRecordDetailaService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +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 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.productdismantleRecord.vo.*; -import com.win.module.wms.dal.dataobject.productdismantleRecord.ProductdismantleRecordDetailaDO; -import com.win.module.wms.convert.productdismantleRecord.ProductdismantleRecordDetailaConvert; -import com.win.module.wms.service.productdismantleRecord.ProductdismantleRecordDetailaService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品拆解记录子") @RestController @@ -109,4 +107,18 @@ public class ProductdismantleRecordDetailaController { ExcelUtils.write(response, "制品拆解记录子.xls", "数据", ProductdismantleRecordDetailaExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品拆解记录子分页") + @PreAuthorize("@ss.hasPermission('wms:productdismantle-record-detaila:query')") + public CommonResult> getProductdismantleRecordDetailaSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productdismantleRecordDetailaService.getProductdismantleRecordDetailaSenior(conditions); + PageResult result = ProductdismantleRecordDetailaConvert.INSTANCE.convertPage(pageResult); + for(ProductdismantleRecordDetailaRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/ProductdismantleRequestDetailaController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/ProductdismantleRequestDetailaController.java index 5cc436fa..8763d435 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/ProductdismantleRequestDetailaController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/ProductdismantleRequestDetailaController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.productdismantleRequest; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productdismantleRequest.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.convert.productdismantleRequest.ProductdismantleRequestDetailaConvert; +import com.win.module.wms.dal.dataobject.productdismantleRequest.ProductdismantleRequestDetailaDO; +import com.win.module.wms.service.productdismantleRequest.ProductdismantleRequestDetailaService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +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 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.productdismantleRequest.vo.*; -import com.win.module.wms.dal.dataobject.productdismantleRequest.ProductdismantleRequestDetailaDO; -import com.win.module.wms.convert.productdismantleRequest.ProductdismantleRequestDetailaConvert; -import com.win.module.wms.service.productdismantleRequest.ProductdismantleRequestDetailaService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品拆解申请子") @RestController @@ -109,4 +107,18 @@ public class ProductdismantleRequestDetailaController { ExcelUtils.write(response, "制品拆解申请子.xls", "数据", ProductdismantleRequestDetailaExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品拆解申请子分页") + @PreAuthorize("@ss.hasPermission('wms:productdismantle-request-detaila:query')") + public CommonResult> getProductdismantleRequestDetailaSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productdismantleRequestDetailaService.getProductdismantleRequestDetailaSenior(conditions); + PageResult result = ProductdismantleRequestDetailaConvert.INSTANCE.convertPage(pageResult); + for(ProductdismantleRequestDetailaRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/ProductdismantleRequestDetailbController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/ProductdismantleRequestDetailbController.java index 4bf7cfe0..c02d200a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/ProductdismantleRequestDetailbController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/ProductdismantleRequestDetailbController.java @@ -1,6 +1,7 @@ package com.win.module.wms.controller.productdismantleRequest; 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; @@ -106,4 +107,19 @@ public class ProductdismantleRequestDetailbController { ExcelUtils.write(response, "制品拆解申请子.xls", "数据", ProductdismantleRequestDetailbExcelVO.class, datas); } + + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品拆解申请子分页") + @PreAuthorize("@ss.hasPermission('wms:dismantle-request-detailb:query')") + public CommonResult> getProductdismantleRequestDetailbSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productdismantleRequestDetailbService.getProductdismantleRequestDetailbSenior(conditions); + PageResult result = ProductdismantleRequestDetailbConvert.INSTANCE.convertPage(pageResult); + for(ProductdismantleRequestDetailbRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/ProductdismantleRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/ProductdismantleRequestMainController.java index 1530c948..5a87f3ee 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/ProductdismantleRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/ProductdismantleRequestMainController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.productdismantleRequest; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productdismantleRequest.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.convert.productdismantleRequest.ProductdismantleRequestMainConvert; +import com.win.module.wms.dal.dataobject.productdismantleRequest.ProductdismantleRequestMainDO; +import com.win.module.wms.service.productdismantleRequest.ProductdismantleRequestMainService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +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 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.productdismantleRequest.vo.*; -import com.win.module.wms.dal.dataobject.productdismantleRequest.ProductdismantleRequestMainDO; -import com.win.module.wms.convert.productdismantleRequest.ProductdismantleRequestMainConvert; -import com.win.module.wms.service.productdismantleRequest.ProductdismantleRequestMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品拆解申请主") @RestController @@ -109,4 +107,18 @@ public class ProductdismantleRequestMainController { ExcelUtils.write(response, "制品拆解申请主.xls", "数据", ProductdismantleRequestMainExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品拆解申请主分页") + @PreAuthorize("@ss.hasPermission('wms:productdismantle-request-main:query')") + public CommonResult> getProductdismantleRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productdismantleRequestMainService.getProductdismantleRequestMainSenior(conditions); + PageResult result = ProductdismantleRequestMainConvert.INSTANCE.convertPage(pageResult); + for(ProductdismantleRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/ProductionDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/ProductionDetailController.java index 1dcfa47b..c3501444 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/ProductionDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/ProductionDetailController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.production; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.production.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.convert.production.ProductionDetailConvert; +import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; +import com.win.module.wms.service.production.ProductionDetailService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +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 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.production.vo.*; -import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; -import com.win.module.wms.convert.production.ProductionDetailConvert; -import com.win.module.wms.service.production.ProductionDetailService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 生产计划子") @RestController @@ -109,4 +107,18 @@ public class ProductionDetailController { ExcelUtils.write(response, "生产计划子.xls", "数据", ProductionDetailExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得生产计划子分页") + @PreAuthorize("@ss.hasPermission('wms:production-detail:query')") + public CommonResult> getProductionDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productionDetailService.getProductionDetailSenior(conditions); + PageResult result = ProductionDetailConvert.INSTANCE.convertPage(pageResult); + for(ProductionDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/ProductionMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/ProductionMainController.java index 9d72d587..7a62d6ea 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/ProductionMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/ProductionMainController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.production; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.production.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.convert.production.ProductionMainConvert; +import com.win.module.wms.dal.dataobject.production.ProductionMainDO; +import com.win.module.wms.service.production.ProductionMainService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +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 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.production.vo.*; -import com.win.module.wms.dal.dataobject.production.ProductionMainDO; -import com.win.module.wms.convert.production.ProductionMainConvert; -import com.win.module.wms.service.production.ProductionMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 生产计划主") @RestController @@ -109,4 +107,18 @@ public class ProductionMainController { ExcelUtils.write(response, "生产计划主.xls", "数据", ProductionMainExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得生产计划主分页") + @PreAuthorize("@ss.hasPermission('wms:production-main:query')") + public CommonResult> getProductionMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productionMainService.getProductionMainSenior(conditions); + PageResult result = ProductionMainConvert.INSTANCE.convertPage(pageResult); + for(ProductionMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionline/ProductionlineController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionline/ProductionlineController.java index ff676f83..3b13305b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionline/ProductionlineController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionline/ProductionlineController.java @@ -1,13 +1,13 @@ package com.win.module.wms.controller.productionline; 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.productionline.vo.ProductionlineImportExcelVO; import com.win.module.wms.controller.productionline.vo.*; import com.win.module.wms.convert.productionline.ProductionlineConvert; import com.win.module.wms.dal.dataobject.productionline.ProductionlineDO; @@ -145,4 +145,18 @@ public class ProductionlineController { returnMap.put("errorFile", url); } } + + @PostMapping("/senior") + @Operation(summary = "高级搜索获得生产线分页") + @PreAuthorize("@ss.hasPermission('wms:productionline:query')") + public CommonResult> getProductionlineSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productionlineService.getProductionlineSenior(conditions); + PageResult result = ProductionlineConvert.INSTANCE.convertPage(pageResult); + for(ProductionlineRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/ProductionlineitemController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/ProductionlineitemController.java index 7de06016..d081e576 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/ProductionlineitemController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/ProductionlineitemController.java @@ -1,13 +1,13 @@ package com.win.module.wms.controller.productionlineitem; 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.productionlineitem.vo.ProductionlineItemImportExcelVO; import com.win.module.wms.controller.productionlineitem.vo.*; import com.win.module.wms.convert.productionlineitem.ProductionlineitemConvert; import com.win.module.wms.dal.dataobject.productionlineitem.ProductionlineitemDO; @@ -144,4 +144,18 @@ public class ProductionlineitemController { returnMap.put("errorFile", url); } } + + @PostMapping("/senior") + @Operation(summary = "高级搜索获得生产线物料关系分页") + @PreAuthorize("@ss.hasPermission('wms:productionlineitem:query')") + public CommonResult> getProductionlineitemSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productionlineitemService.getProductionlineitemSenior(conditions); + PageResult result = ProductionlineitemConvert.INSTANCE.convertPage(pageResult); + for(ProductionlineitemRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/ProductionreceiptJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/ProductionreceiptJobDetailController.java index ccb2145d..ed01463f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/ProductionreceiptJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/ProductionreceiptJobDetailController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.productionreceiptJob; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productionreceiptJob.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.convert.productionreceiptJob.ProductionreceiptJobDetailConvert; +import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobDetailDO; +import com.win.module.wms.service.productionreceiptJob.ProductionreceiptJobDetailService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +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 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.productionreceiptJob.vo.*; -import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobDetailDO; -import com.win.module.wms.convert.productionreceiptJob.ProductionreceiptJobDetailConvert; -import com.win.module.wms.service.productionreceiptJob.ProductionreceiptJobDetailService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 生产收料任务子") @RestController @@ -110,4 +108,18 @@ public class ProductionreceiptJobDetailController { ExcelUtils.write(response, "生产收料任务子.xls", "数据", ProductionreceiptJobDetailExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得生产收料任务子分页") + @PreAuthorize("@ss.hasPermission('wms:productionreceipt-job-detail:query')") + public CommonResult> getProductionreceiptJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productionreceiptJobDetailService.getProductionreceiptJobDetailSenior(conditions); + PageResult result = ProductionreceiptJobDetailConvert.INSTANCE.convertPage(pageResult); + for(ProductionreceiptJobDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/ProductionreceiptJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/ProductionreceiptJobMainController.java index c0454fe3..ce9434fb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/ProductionreceiptJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/ProductionreceiptJobMainController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.productionreceiptJob; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productionreceiptJob.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.convert.productionreceiptJob.ProductionreceiptJobMainConvert; +import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobMainDO; +import com.win.module.wms.service.productionreceiptJob.ProductionreceiptJobMainService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +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 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.productionreceiptJob.vo.*; -import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobMainDO; -import com.win.module.wms.convert.productionreceiptJob.ProductionreceiptJobMainConvert; -import com.win.module.wms.service.productionreceiptJob.ProductionreceiptJobMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 生产收料任务主") @RestController @@ -108,4 +106,18 @@ public class ProductionreceiptJobMainController { ExcelUtils.write(response, "生产收料任务主.xls", "数据", ProductionreceiptJobMainExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得生产收料任务主分页") + @PreAuthorize("@ss.hasPermission('wms:productionreceipt-job-main:query')") + public CommonResult> getProductionreceiptJobMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productionreceiptJobMainService.getProductionreceiptJobMainSenior(conditions); + PageResult result = ProductionreceiptJobMainConvert.INSTANCE.convertPage(pageResult); + for(ProductionreceiptJobMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/ProductionreceiptRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/ProductionreceiptRecordDetailController.java index 5ddeef1f..215b154b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/ProductionreceiptRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/ProductionreceiptRecordDetailController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.productionreceiptRecord; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productionreceiptRecord.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.convert.productionreceiptRecord.ProductionreceiptRecordDetailConvert; +import com.win.module.wms.dal.dataobject.productionreceiptRecord.ProductionreceiptRecordDetailDO; +import com.win.module.wms.service.productionreceiptRecord.ProductionreceiptRecordDetailService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +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 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.productionreceiptRecord.vo.*; -import com.win.module.wms.dal.dataobject.productionreceiptRecord.ProductionreceiptRecordDetailDO; -import com.win.module.wms.convert.productionreceiptRecord.ProductionreceiptRecordDetailConvert; -import com.win.module.wms.service.productionreceiptRecord.ProductionreceiptRecordDetailService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 生产收料记录子") @RestController @@ -108,4 +106,18 @@ public class ProductionreceiptRecordDetailController { ExcelUtils.write(response, "生产收料记录子.xls", "数据", ProductionreceiptRecordDetailExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得生产收料记录子分页") + @PreAuthorize("@ss.hasPermission('wms:productionreceipt-record-detail:query')") + public CommonResult> getProductionreceiptRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productionreceiptRecordDetailService.getProductionreceiptRecordDetailSenior(conditions); + PageResult result = ProductionreceiptRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(ProductionreceiptRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/ProductionreceiptRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/ProductionreceiptRecordMainController.java index cb8bc188..d6c681be 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/ProductionreceiptRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/ProductionreceiptRecordMainController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.productionreceiptRecord; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productionreceiptRecord.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.convert.productionreceiptRecord.ProductionreceiptRecordMainConvert; +import com.win.module.wms.dal.dataobject.productionreceiptRecord.ProductionreceiptRecordMainDO; +import com.win.module.wms.service.productionreceiptRecord.ProductionreceiptRecordMainService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +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 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.productionreceiptRecord.vo.*; -import com.win.module.wms.dal.dataobject.productionreceiptRecord.ProductionreceiptRecordMainDO; -import com.win.module.wms.convert.productionreceiptRecord.ProductionreceiptRecordMainConvert; -import com.win.module.wms.service.productionreceiptRecord.ProductionreceiptRecordMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 生产收料记录主") @RestController @@ -109,4 +107,18 @@ public class ProductionreceiptRecordMainController { ExcelUtils.write(response, "生产收料记录主.xls", "数据", ProductionreceiptRecordMainExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得生产收料记录主分页") + @PreAuthorize("@ss.hasPermission('wms:productionreceipt-record-main:query')") + public CommonResult> getProductionreceiptRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productionreceiptRecordMainService.getProductionreceiptRecordMainSenior(conditions); + PageResult result = ProductionreceiptRecordMainConvert.INSTANCE.convertPage(pageResult); + for(ProductionreceiptRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/ProductionreturnJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/ProductionreturnJobDetailController.java index ecf36ca8..858e7140 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/ProductionreturnJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/ProductionreturnJobDetailController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.productionreturnJob; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productionreturnJob.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.convert.productionreturnJob.ProductionreturnJobDetailConvert; +import com.win.module.wms.dal.dataobject.productionreturnJob.ProductionreturnJobDetailDO; +import com.win.module.wms.service.productionreturnJob.ProductionreturnJobDetailService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +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 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.productionreturnJob.vo.*; -import com.win.module.wms.dal.dataobject.productionreturnJob.ProductionreturnJobDetailDO; -import com.win.module.wms.convert.productionreturnJob.ProductionreturnJobDetailConvert; -import com.win.module.wms.service.productionreturnJob.ProductionreturnJobDetailService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 生产退料任务子") @RestController @@ -109,4 +107,18 @@ public class ProductionreturnJobDetailController { ExcelUtils.write(response, "生产退料任务子.xls", "数据", ProductionreturnJobDetailExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得生产退料任务子分页") + @PreAuthorize("@ss.hasPermission('wms:productionreturn-job-detail:query')") + public CommonResult> getProductionreturnJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productionreturnJobDetailService.getProductionreturnJobDetailSenior(conditions); + PageResult result = ProductionreturnJobDetailConvert.INSTANCE.convertPage(pageResult); + for(ProductionreturnJobDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/ProductionreturnJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/ProductionreturnJobMainController.java index edd5a799..c8018175 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/ProductionreturnJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/ProductionreturnJobMainController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.productionreturnJob; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productionreturnJob.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.convert.productionreturnJob.ProductionreturnJobMainConvert; +import com.win.module.wms.dal.dataobject.productionreturnJob.ProductionreturnJobMainDO; +import com.win.module.wms.service.productionreturnJob.ProductionreturnJobMainService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +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 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.productionreturnJob.vo.*; -import com.win.module.wms.dal.dataobject.productionreturnJob.ProductionreturnJobMainDO; -import com.win.module.wms.convert.productionreturnJob.ProductionreturnJobMainConvert; -import com.win.module.wms.service.productionreturnJob.ProductionreturnJobMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 生产退料任务主") @RestController @@ -109,4 +107,18 @@ public class ProductionreturnJobMainController { ExcelUtils.write(response, "生产退料任务主.xls", "数据", ProductionreturnJobMainExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得生产退料任务主分页") + @PreAuthorize("@ss.hasPermission('wms:productionreturn-job-main:query')") + public CommonResult> getProductionreturnJobMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productionreturnJobMainService.getProductionreturnJobMainSenior(conditions); + PageResult result = ProductionreturnJobMainConvert.INSTANCE.convertPage(pageResult); + for(ProductionreturnJobMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/ProductionreturnRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/ProductionreturnRecordDetailController.java index e98013ab..49ffb425 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/ProductionreturnRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/ProductionreturnRecordDetailController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.productionreturnRecord; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productionreturnRecord.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.convert.productionreturnRecord.ProductionreturnRecordDetailConvert; +import com.win.module.wms.dal.dataobject.productionreturnRecord.ProductionreturnRecordDetailDO; +import com.win.module.wms.service.productionreturnRecord.ProductionreturnRecordDetailService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +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 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.productionreturnRecord.vo.*; -import com.win.module.wms.dal.dataobject.productionreturnRecord.ProductionreturnRecordDetailDO; -import com.win.module.wms.convert.productionreturnRecord.ProductionreturnRecordDetailConvert; -import com.win.module.wms.service.productionreturnRecord.ProductionreturnRecordDetailService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 生产退料记录子") @RestController @@ -109,4 +107,18 @@ public class ProductionreturnRecordDetailController { ExcelUtils.write(response, "生产退料记录子.xls", "数据", ProductionreturnRecordDetailExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得生产退料记录子分页") + @PreAuthorize("@ss.hasPermission('wms:productionreturn-record-detail:query')") + public CommonResult> getProductionreturnRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productionreturnRecordDetailService.getProductionreturnRecordDetailSenior(conditions); + PageResult result = ProductionreturnRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(ProductionreturnRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/ProductionreturnRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/ProductionreturnRecordMainController.java index d53902e2..80ebf72e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/ProductionreturnRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/ProductionreturnRecordMainController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.productionreturnRecord; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productionreturnRecord.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.convert.productionreturnRecord.ProductionreturnRecordMainConvert; +import com.win.module.wms.dal.dataobject.productionreturnRecord.ProductionreturnRecordMainDO; +import com.win.module.wms.service.productionreturnRecord.ProductionreturnRecordMainService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +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 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.productionreturnRecord.vo.*; -import com.win.module.wms.dal.dataobject.productionreturnRecord.ProductionreturnRecordMainDO; -import com.win.module.wms.convert.productionreturnRecord.ProductionreturnRecordMainConvert; -import com.win.module.wms.service.productionreturnRecord.ProductionreturnRecordMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 生产退料记录主") @RestController @@ -109,4 +107,19 @@ public class ProductionreturnRecordMainController { ExcelUtils.write(response, "生产退料记录主.xls", "数据", ProductionreturnRecordMainExcelVO.class, datas); } + + @PostMapping("/senior") + @Operation(summary = "高级搜索获得生产退料记录主分页") + @PreAuthorize("@ss.hasPermission('wms:productionreturn-record-main:query')") + public CommonResult> getProductionreturnRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productionreturnRecordMainService.getProductionreturnRecordMainSenior(conditions); + PageResult result = ProductionreturnRecordMainConvert.INSTANCE.convertPage(pageResult); + for(ProductionreturnRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/ProductionreturnRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/ProductionreturnRequestDetailController.java index af78e8b6..bb0a13a8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/ProductionreturnRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/ProductionreturnRequestDetailController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.productionreturnRequest; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productionreturnRequest.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.convert.productionreturnRequest.ProductionreturnRequestDetailConvert; +import com.win.module.wms.dal.dataobject.productionreturnRequest.ProductionreturnRequestDetailDO; +import com.win.module.wms.service.productionreturnRequest.ProductionreturnRequestDetailService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +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 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.productionreturnRequest.vo.*; -import com.win.module.wms.dal.dataobject.productionreturnRequest.ProductionreturnRequestDetailDO; -import com.win.module.wms.convert.productionreturnRequest.ProductionreturnRequestDetailConvert; -import com.win.module.wms.service.productionreturnRequest.ProductionreturnRequestDetailService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 生产退料申请子") @RestController @@ -109,4 +107,18 @@ public class ProductionreturnRequestDetailController { ExcelUtils.write(response, "生产退料申请子.xls", "数据", ProductionreturnRequestDetailExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得生产退料申请子分页") + @PreAuthorize("@ss.hasPermission('wms:productionreturn-request-detail:query')") + public CommonResult> getProductionreturnRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productionreturnRequestDetailService.getProductionreturnRequestDetailSenior(conditions); + PageResult result = ProductionreturnRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(ProductionreturnRequestDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/ProductionreturnRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/ProductionreturnRequestMainController.java index 519e2fbd..fc2d0bd7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/ProductionreturnRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/ProductionreturnRequestMainController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.productionreturnRequest; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productionreturnRequest.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.convert.productionreturnRequest.ProductionreturnRequestMainConvert; +import com.win.module.wms.dal.dataobject.productionreturnRequest.ProductionreturnRequestMainDO; +import com.win.module.wms.service.productionreturnRequest.ProductionreturnRequestMainService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +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 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.productionreturnRequest.vo.*; -import com.win.module.wms.dal.dataobject.productionreturnRequest.ProductionreturnRequestMainDO; -import com.win.module.wms.convert.productionreturnRequest.ProductionreturnRequestMainConvert; -import com.win.module.wms.service.productionreturnRequest.ProductionreturnRequestMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 生产退料申请主") @RestController @@ -109,4 +107,18 @@ public class ProductionreturnRequestMainController { ExcelUtils.write(response, "生产退料申请主.xls", "数据", ProductionreturnRequestMainExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得生产退料申请主分页") + @PreAuthorize("@ss.hasPermission('wms:productionreturn-request-main:query')") + public CommonResult> getProductionreturnRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productionreturnRequestMainService.getProductionreturnRequestMainSenior(conditions); + PageResult result = ProductionreturnRequestMainConvert.INSTANCE.convertPage(pageResult); + for(ProductionreturnRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/ProductputawayJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/ProductputawayJobDetailController.java index 7a9de4cd..acad8d88 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/ProductputawayJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/ProductputawayJobDetailController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.productputawayJob; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productputawayJob.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.convert.productputawayJob.ProductputawayJobDetailConvert; +import com.win.module.wms.dal.dataobject.productputawayJob.ProductputawayJobDetailDO; +import com.win.module.wms.service.productputawayJob.ProductputawayJobDetailService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +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 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.productputawayJob.vo.*; -import com.win.module.wms.dal.dataobject.productputawayJob.ProductputawayJobDetailDO; -import com.win.module.wms.convert.productputawayJob.ProductputawayJobDetailConvert; -import com.win.module.wms.service.productputawayJob.ProductputawayJobDetailService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品上架任务子") @RestController @@ -108,4 +106,18 @@ public class ProductputawayJobDetailController { ExcelUtils.write(response, "制品上架任务子.xls", "数据", ProductputawayJobDetailExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品上架任务子分页") + @PreAuthorize("@ss.hasPermission('wms:productputaway-job-detail:query')") + public CommonResult> getProductputawayJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productputawayJobDetailService.getProductputawayJobDetailSeniorList(conditions); + PageResult result = ProductputawayJobDetailConvert.INSTANCE.convertPage(pageResult); + for(ProductputawayJobDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/ProductputawayJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/ProductputawayJobMainController.java index 9f18df24..d24b8dba 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/ProductputawayJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/ProductputawayJobMainController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.productputawayJob; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productputawayJob.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.convert.productputawayJob.ProductputawayJobMainConvert; +import com.win.module.wms.dal.dataobject.productputawayJob.ProductputawayJobMainDO; +import com.win.module.wms.service.productputawayJob.ProductputawayJobMainService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +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 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.productputawayJob.vo.*; -import com.win.module.wms.dal.dataobject.productputawayJob.ProductputawayJobMainDO; -import com.win.module.wms.convert.productputawayJob.ProductputawayJobMainConvert; -import com.win.module.wms.service.productputawayJob.ProductputawayJobMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品上架任务主") @RestController @@ -109,4 +107,18 @@ public class ProductputawayJobMainController { ExcelUtils.write(response, "制品上架任务主.xls", "数据", ProductputawayJobMainExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品上架任务主分页") + @PreAuthorize("@ss.hasPermission('wms:productputaway-job-main:query')") + public CommonResult> getProductputawayJobMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productputawayJobMainService.getProductputawayJobMainSenior(conditions); + PageResult result = ProductputawayJobMainConvert.INSTANCE.convertPage(pageResult); + for(ProductputawayJobMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/ProductputawayRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/ProductputawayRecordDetailController.java index a2206c96..ec4e1050 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/ProductputawayRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/ProductputawayRecordDetailController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.productputawayRecord; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productputawayRecord.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.convert.productputawayRecord.ProductputawayRecordDetailConvert; +import com.win.module.wms.dal.dataobject.productputawayRecord.ProductputawayRecordDetailDO; +import com.win.module.wms.service.productputawayRecord.ProductputawayRecordDetailService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +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 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.productputawayRecord.vo.*; -import com.win.module.wms.dal.dataobject.productputawayRecord.ProductputawayRecordDetailDO; -import com.win.module.wms.convert.productputawayRecord.ProductputawayRecordDetailConvert; -import com.win.module.wms.service.productputawayRecord.ProductputawayRecordDetailService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品上架记录子") @RestController @@ -109,4 +107,18 @@ public class ProductputawayRecordDetailController { ExcelUtils.write(response, "制品上架记录子.xls", "数据", ProductputawayRecordDetailExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品上架记录子分页") + @PreAuthorize("@ss.hasPermission('wms:productputaway-record-detail:query')") + public CommonResult> getProductputawayRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productputawayRecordDetailService.getProductputawayRecordDetailSenior(conditions); + PageResult result = ProductputawayRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(ProductputawayRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/ProductputawayRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/ProductputawayRecordMainController.java index 9294da5b..d8b3a2fc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/ProductputawayRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/ProductputawayRecordMainController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.productputawayRecord; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productputawayRecord.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.convert.productputawayRecord.ProductputawayRecordMainConvert; +import com.win.module.wms.dal.dataobject.productputawayRecord.ProductputawayRecordMainDO; +import com.win.module.wms.service.productputawayRecord.ProductputawayRecordMainService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +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 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.productputawayRecord.vo.*; -import com.win.module.wms.dal.dataobject.productputawayRecord.ProductputawayRecordMainDO; -import com.win.module.wms.convert.productputawayRecord.ProductputawayRecordMainConvert; -import com.win.module.wms.service.productputawayRecord.ProductputawayRecordMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品上架记录主") @RestController @@ -109,4 +107,18 @@ public class ProductputawayRecordMainController { ExcelUtils.write(response, "制品上架记录主.xls", "数据", ProductputawayRecordMainExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品上架记录主分页") + @PreAuthorize("@ss.hasPermission('wms:productputaway-record-main:query')") + public CommonResult> getProductputawayRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productputawayRecordMainService.getProductputawayRecordMainSenior(conditions); + PageResult result = ProductputawayRecordMainConvert.INSTANCE.convertPage(pageResult); + for(ProductputawayRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/ProductputawayRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/ProductputawayRequestDetailController.java index ea5e989a..24951430 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/ProductputawayRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/ProductputawayRequestDetailController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.productputawayRequest; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productputawayRequest.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.convert.productputawayRequest.ProductputawayRequestDetailConvert; +import com.win.module.wms.dal.dataobject.productputawayRequest.ProductputawayRequestDetailDO; +import com.win.module.wms.service.productputawayRequest.ProductputawayRequestDetailService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +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 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.productputawayRequest.vo.*; -import com.win.module.wms.dal.dataobject.productputawayRequest.ProductputawayRequestDetailDO; -import com.win.module.wms.convert.productputawayRequest.ProductputawayRequestDetailConvert; -import com.win.module.wms.service.productputawayRequest.ProductputawayRequestDetailService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品上架申请子") @RestController @@ -109,4 +107,18 @@ public class ProductputawayRequestDetailController { ExcelUtils.write(response, "制品上架申请子.xls", "数据", ProductputawayRequestDetailExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品上架申请子分页") + @PreAuthorize("@ss.hasPermission('wms:productputaway-request-detail:query')") + public CommonResult> getProductputawayRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productputawayRequestDetailService.getProductputawayRequestDetailSenior(conditions); + PageResult result = ProductputawayRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(ProductputawayRequestDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/ProductputawayRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/ProductputawayRequestMainController.java index 21ffd7dc..ffadb35f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/ProductputawayRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/ProductputawayRequestMainController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.productputawayRequest; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productputawayRequest.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.convert.productputawayRequest.ProductputawayRequestMainConvert; +import com.win.module.wms.dal.dataobject.productputawayRequest.ProductputawayRequestMainDO; +import com.win.module.wms.service.productputawayRequest.ProductputawayRequestMainService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +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 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.productputawayRequest.vo.*; -import com.win.module.wms.dal.dataobject.productputawayRequest.ProductputawayRequestMainDO; -import com.win.module.wms.convert.productputawayRequest.ProductputawayRequestMainConvert; -import com.win.module.wms.service.productputawayRequest.ProductputawayRequestMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品上架申请主") @RestController @@ -108,5 +106,19 @@ public class ProductputawayRequestMainController { } ExcelUtils.write(response, "制品上架申请主.xls", "数据", ProductputawayRequestMainExcelVO.class, datas); } + + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品上架申请主分页") + @PreAuthorize("@ss.hasPermission('wms:productputaway-request-main:query')") + public CommonResult> getProductputawayRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productputawayRequestMainService.getProductputawayRequestMainSenior(conditions); + PageResult result = ProductputawayRequestMainConvert.INSTANCE.convertPage(pageResult); + for(ProductputawayRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/ProductreceiptJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/ProductreceiptJobDetailController.java index 788532f1..ec4f8bce 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/ProductreceiptJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/ProductreceiptJobDetailController.java @@ -1,33 +1,32 @@ package com.win.module.wms.controller.productreceiptJob; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productreceiptJob.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.convert.productreceiptJob.ProductreceiptJobDetailConvert; +import com.win.module.wms.dal.dataobject.productreceiptJob.ProductreceiptJobDetailDO; +import com.win.module.wms.service.productreceiptJob.ProductreceiptJobDetailService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +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 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.productreceiptJob.vo.*; -import com.win.module.wms.dal.dataobject.productreceiptJob.ProductreceiptJobDetailDO; -import com.win.module.wms.convert.productreceiptJob.ProductreceiptJobDetailConvert; -import com.win.module.wms.service.productreceiptJob.ProductreceiptJobDetailService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品收货任务子") @RestController @@ -103,4 +102,18 @@ public class ProductreceiptJobDetailController { ExcelUtils.write(response, "制品收货任务子.xls", "数据", ProductreceiptJobDetailExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品收货任务子分页") + @PreAuthorize("@ss.hasPermission('wms:productreceipt-job-detail:query')") + public CommonResult> getProductreceiptJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productreceiptJobDetailService.getProductreceiptJobDetailSenior(conditions); + PageResult result = ProductreceiptJobDetailConvert.INSTANCE.convertPage(pageResult); + for(ProductreceiptJobDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/ProductreceiptJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/ProductreceiptJobMainController.java index 6abd3332..31ecfd03 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/ProductreceiptJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/ProductreceiptJobMainController.java @@ -1,34 +1,35 @@ package com.win.module.wms.controller.productreceiptJob; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.accountcalendar.vo.ProductreceiptJobMainRespVO; import com.win.module.wms.controller.productreceiptJob.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.convert.accountcalendar.ProductreceiptJobMainConvert; +import com.win.module.wms.convert.productreceiptJob.ProductreceiptJobMainConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.ProductreceiptJobMainDO; +import com.win.module.wms.dal.dataobject.productreceiptJob.ProductreceiptJobMainDO; +import com.win.module.wms.service.productreceiptJob.ProductreceiptJobMainService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +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 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.productreceiptJob.vo.*; -import com.win.module.wms.dal.dataobject.productreceiptJob.ProductreceiptJobMainDO; -import com.win.module.wms.convert.productreceiptJob.ProductreceiptJobMainConvert; -import com.win.module.wms.service.productreceiptJob.ProductreceiptJobMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品收货任务主") @RestController @@ -109,4 +110,19 @@ public class ProductreceiptJobMainController { ExcelUtils.write(response, "制品收货任务主.xls", "数据", ProductreceiptJobMainExcelVO.class, datas); } + + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品收货任务主分页") + @PreAuthorize("@ss.hasPermission('wms:productreceipt-job-main:query')") + public CommonResult> getProductreceiptJobMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productreceiptJobMainService.getProductreceiptJobMainSenior(conditions); + PageResult result = ProductreceiptJobMainConvert.INSTANCE.convertPage(pageResult); + for(ProductreceiptJobMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/BackflushRecordDetailbController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/BackflushRecordDetailbController.java index ec5c5a06..a4e81f0d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/BackflushRecordDetailbController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/BackflushRecordDetailbController.java @@ -1,13 +1,17 @@ package com.win.module.wms.controller.productreceiptRecord; import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.accountcalendar.vo.BackflushRecordDetailbRespVO; import com.win.module.wms.controller.productreceiptRecord.vo.*; +import com.win.module.wms.convert.accountcalendar.BackflushRecordDetailbConvert; import com.win.module.wms.convert.productreceiptRecord.BackflushRecordDetailbConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.BackflushRecordDetailbDO; import com.win.module.wms.dal.dataobject.productreceiptRecord.BackflushRecordDetailbDO; import com.win.module.wms.service.productreceiptRecord.BackflushRecordDetailbService; import io.swagger.v3.oas.annotations.Operation; @@ -105,4 +109,19 @@ public class BackflushRecordDetailbController { ExcelUtils.write(response, "制品收货记录子.xls", "数据", BackflushRecordDetailbExcelVO.class, datas); } + + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品收货记录子分页") + @PreAuthorize("@ss.hasPermission('wms:backflush-record-detailb:query')") + public CommonResult> getBackflushRecordDetailbSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = backflushRecordDetailbService.getBackflushRecordDetailbSenior(conditions); + PageResult result = BackflushRecordDetailbConvert.INSTANCE.convertPage(pageResult); + for(BackflushRecordDetailbRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/ProductreceiptRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/ProductreceiptRecordDetailController.java index 06aad426..2336f159 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/ProductreceiptRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/ProductreceiptRecordDetailController.java @@ -1,34 +1,35 @@ package com.win.module.wms.controller.productreceiptRecord; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.accountcalendar.vo.ProductreceiptRecordDetailRespVO; import com.win.module.wms.controller.productreceiptRecord.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.convert.accountcalendar.ProductreceiptRecordDetailConvert; +import com.win.module.wms.convert.productreceiptRecord.ProductreceiptRecordDetailConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.ProductreceiptRecordDetailDO; +import com.win.module.wms.dal.dataobject.productreceiptRecord.ProductreceiptRecordDetailDO; +import com.win.module.wms.service.productreceiptRecord.ProductreceiptRecordDetailService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +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 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.productreceiptRecord.vo.*; -import com.win.module.wms.dal.dataobject.productreceiptRecord.ProductreceiptRecordDetailDO; -import com.win.module.wms.convert.productreceiptRecord.ProductreceiptRecordDetailConvert; -import com.win.module.wms.service.productreceiptRecord.ProductreceiptRecordDetailService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品收货记录子") @RestController @@ -109,4 +110,18 @@ public class ProductreceiptRecordDetailController { ExcelUtils.write(response, "制品收货记录子.xls", "数据", ProductreceiptRecordDetailExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品收货记录子分页") + @PreAuthorize("@ss.hasPermission('wms:productreceipt-record-detail:query')") + public CommonResult> getProductreceiptRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productreceiptRecordDetailService.getProductreceiptRecordDetailSenior(conditions); + PageResult result = ProductreceiptRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(ProductreceiptRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/ProductreceiptRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/ProductreceiptRecordMainController.java index 9779f29d..ae9198d6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/ProductreceiptRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/ProductreceiptRecordMainController.java @@ -1,34 +1,35 @@ package com.win.module.wms.controller.productreceiptRecord; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.accountcalendar.vo.ProductreceiptRecordMainRespVO; import com.win.module.wms.controller.productreceiptRecord.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.convert.accountcalendar.ProductreceiptRecordMainConvert; +import com.win.module.wms.convert.productreceiptRecord.ProductreceiptRecordMainConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.ProductreceiptRecordMainDO; +import com.win.module.wms.dal.dataobject.productreceiptRecord.ProductreceiptRecordMainDO; +import com.win.module.wms.service.productreceiptRecord.ProductreceiptRecordMainService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +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 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.productreceiptRecord.vo.*; -import com.win.module.wms.dal.dataobject.productreceiptRecord.ProductreceiptRecordMainDO; -import com.win.module.wms.convert.productreceiptRecord.ProductreceiptRecordMainConvert; -import com.win.module.wms.service.productreceiptRecord.ProductreceiptRecordMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品收货记录主") @RestController @@ -109,4 +110,18 @@ public class ProductreceiptRecordMainController { ExcelUtils.write(response, "制品收货记录主.xls", "数据", ProductreceiptRecordMainExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品收货记录主分页") + @PreAuthorize("@ss.hasPermission('wms:productreceipt-record-main:query')") + public CommonResult> getProductreceiptRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productreceiptRecordMainService.getProductreceiptRecordMainSenior(conditions); + PageResult result = ProductreceiptRecordMainConvert.INSTANCE.convertPage(pageResult); + for(ProductreceiptRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/ProductreceiptRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/ProductreceiptRequestDetailController.java index 09a2092b..52b4b01e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/ProductreceiptRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/ProductreceiptRequestDetailController.java @@ -1,34 +1,35 @@ package com.win.module.wms.controller.productreceiptRequest; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.accountcalendar.vo.ProductreceiptRequestDetailRespVO; import com.win.module.wms.controller.productreceiptRequest.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.convert.accountcalendar.ProductreceiptRequestDetailConvert; +import com.win.module.wms.convert.productreceiptRequest.ProductreceiptRequestDetailConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.ProductreceiptRequestDetailDO; +import com.win.module.wms.dal.dataobject.productreceiptRequest.ProductreceiptRequestDetailDO; +import com.win.module.wms.service.productreceiptRequest.ProductreceiptRequestDetailService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +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 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.productreceiptRequest.vo.*; -import com.win.module.wms.dal.dataobject.productreceiptRequest.ProductreceiptRequestDetailDO; -import com.win.module.wms.convert.productreceiptRequest.ProductreceiptRequestDetailConvert; -import com.win.module.wms.service.productreceiptRequest.ProductreceiptRequestDetailService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品收货申请子") @RestController @@ -109,4 +110,17 @@ public class ProductreceiptRequestDetailController { ExcelUtils.write(response, "制品收货申请子.xls", "数据", ProductreceiptRequestDetailExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品收货申请子分页") + @PreAuthorize("@ss.hasPermission('wms:productreceipt-request-detail:query')") + public CommonResult> getProductreceiptRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productreceiptRequestDetailService.getProductreceiptRequestDetailSenior(conditions); + PageResult result = ProductreceiptRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(ProductreceiptRequestDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/ProductreceiptRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/ProductreceiptRequestMainController.java index b2dd4753..a7a93dec 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/ProductreceiptRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/ProductreceiptRequestMainController.java @@ -1,33 +1,35 @@ package com.win.module.wms.controller.productreceiptRequest; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.accountcalendar.vo.ProductreceiptRequestMainRespVO; import com.win.module.wms.controller.productreceiptRequest.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.convert.accountcalendar.ProductreceiptRequestMainConvert; +import com.win.module.wms.convert.productreceiptRequest.ProductreceiptRequestMainConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.ProductreceiptRequestMainDO; +import com.win.module.wms.dal.dataobject.productreceiptRequest.ProductreceiptRequestMainDO; +import com.win.module.wms.service.productreceiptRequest.ProductreceiptRequestMainService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +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 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.productreceiptRequest.ProductreceiptRequestMainDO; -import com.win.module.wms.convert.productreceiptRequest.ProductreceiptRequestMainConvert; -import com.win.module.wms.service.productreceiptRequest.ProductreceiptRequestMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品收货申请主") @RestController @@ -108,4 +110,18 @@ public class ProductreceiptRequestMainController { ExcelUtils.write(response, "制品收货申请主.xls", "数据", ProductreceiptRequestMainExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得账期日历分页") + @PreAuthorize("@ss.hasPermission('wms:productreceipt-request-main:query')") + public CommonResult> getProductreceiptRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productreceiptRequestMainService.getProductreceiptRequestMainSenior(conditions); + PageResult result = ProductreceiptRequestMainConvert.INSTANCE.convertPage(pageResult); + for(ProductreceiptRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/ConsumeRecordDetailbController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/ConsumeRecordDetailbController.java index fe5a78a0..da15c2fe 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/ConsumeRecordDetailbController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/ConsumeRecordDetailbController.java @@ -1,6 +1,7 @@ package com.win.module.wms.controller.productrepairRecord; 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; @@ -106,4 +107,17 @@ public class ConsumeRecordDetailbController { ExcelUtils.write(response, "制品返修记录子.xls", "数据", ConsumeRecordDetailbExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品返修记录子分页") + @PreAuthorize("@ss.hasPermission('wms:consume-record-detailb:query')") + public CommonResult> getConsumeRecordDetailbSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = consumeRecordDetailbService.getConsumeRecordDetailbSenior(conditions); + PageResult result = ConsumeRecordDetailbConvert.INSTANCE.convertPage(pageResult); + for(ConsumeRecordDetailbRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/ProductrepairRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/ProductrepairRecordDetailController.java index dac7f27a..04879ca3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/ProductrepairRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/ProductrepairRecordDetailController.java @@ -1,34 +1,35 @@ package com.win.module.wms.controller.productrepairRecord; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.accountcalendar.vo.ProductrepairRecordDetailRespVO; import com.win.module.wms.controller.productrepairRecord.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.convert.accountcalendar.ProductrepairRecordDetailConvert; +import com.win.module.wms.convert.productrepairRecord.ProductrepairRecordDetailConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.ProductrepairRecordDetailDO; +import com.win.module.wms.dal.dataobject.productrepairRecord.ProductrepairRecordDetailDO; +import com.win.module.wms.service.productrepairRecord.ProductrepairRecordDetailService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +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 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.productrepairRecord.vo.*; -import com.win.module.wms.dal.dataobject.productrepairRecord.ProductrepairRecordDetailDO; -import com.win.module.wms.convert.productrepairRecord.ProductrepairRecordDetailConvert; -import com.win.module.wms.service.productrepairRecord.ProductrepairRecordDetailService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品返修记录子") @RestController @@ -110,4 +111,18 @@ public class ProductrepairRecordDetailController { ExcelUtils.write(response, "制品返修记录子.xls", "数据", ProductrepairRecordDetailExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品返修记录子分页") + @PreAuthorize("@ss.hasPermission('wms:productrepair-record-detail:query')") + public CommonResult> getProductrepairRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productrepairRecordDetailService.getProductrepairRecordDetailSenior(conditions); + PageResult result = ProductrepairRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(ProductrepairRecordDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/ProductrepairRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/ProductrepairRecordMainController.java index 26c8380e..aef2e613 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/ProductrepairRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/ProductrepairRecordMainController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.productrepairRecord; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productrepairRecord.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.convert.productrepairRecord.ProductrepairRecordMainConvert; +import com.win.module.wms.dal.dataobject.productrepairRecord.ProductrepairRecordMainDO; +import com.win.module.wms.service.productrepairRecord.ProductrepairRecordMainService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +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 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.productrepairRecord.vo.*; -import com.win.module.wms.dal.dataobject.productrepairRecord.ProductrepairRecordMainDO; -import com.win.module.wms.convert.productrepairRecord.ProductrepairRecordMainConvert; -import com.win.module.wms.service.productrepairRecord.ProductrepairRecordMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品返修记录主") @RestController @@ -107,5 +105,18 @@ public class ProductrepairRecordMainController { } ExcelUtils.write(response, "制品返修记录主.xls", "数据", ProductrepairRecordMainExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品返修记录主分页") + @PreAuthorize("@ss.hasPermission('wms:productrepair-record-main:query')") + public CommonResult> getProductrepairRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productrepairRecordMainService.getProductrepairRecordMainSenior(conditions); + PageResult result = ProductrepairRecordMainConvert.INSTANCE.convertPage(pageResult); + for(ProductrepairRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestDetailaController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestDetailaController.java index a9442636..1d671704 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestDetailaController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestDetailaController.java @@ -1,34 +1,32 @@ package com.win.module.wms.controller.productrepairRequest; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productrepairRequest.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.convert.productrepairRequest.ProductrepairRequestDetailaConvert; +import com.win.module.wms.dal.dataobject.productrepairRequest.ProductrepairRequestDetailaDO; +import com.win.module.wms.service.productrepairRequest.ProductrepairRequestDetailaService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +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 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.productrepairRequest.vo.*; -import com.win.module.wms.dal.dataobject.productrepairRequest.ProductrepairRequestDetailaDO; -import com.win.module.wms.convert.productrepairRequest.ProductrepairRequestDetailaConvert; -import com.win.module.wms.service.productrepairRequest.ProductrepairRequestDetailaService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品返修申请子") @RestController @@ -109,4 +107,18 @@ public class ProductrepairRequestDetailaController { ExcelUtils.write(response, "制品返修申请子.xls", "数据", ProductrepairRequestDetailaExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得账期日历分页") + @PreAuthorize("@ss.hasPermission('wms:accountcalendar:query')") + public CommonResult> getProductrepairRequestDetailaSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productrepairRequestDetailaService.getProductrepairRequestDetailaSenior(conditions); + PageResult result = ProductrepairRequestDetailaConvert.INSTANCE.convertPage(pageResult); + for(ProductrepairRequestDetailaRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestDetailbController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestDetailbController.java index 8f79bc0c..75d66e29 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestDetailbController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestDetailbController.java @@ -119,4 +119,18 @@ public class ProductrepairRequestDetailbController { ExcelUtils.write(response, "制品返修申请子.xls", "数据", ProductrepairRequestDetailbExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品返修申请子分页") + @PreAuthorize("@ss.hasPermission('wms:consumere-request-detailb:query')") + public CommonResult> getProductrepairRequestDetailbSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productrepairRequestDetailbService.getProductrepairRequestDetailbSenior(conditions); + PageResult result = ProductrepairRequestDetailbConvert.INSTANCE.convertPage(pageResult); + for(ProductrepairRequestDetailbRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestMainController.java index c78bdf38..8f4d1461 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestMainController.java @@ -1,34 +1,35 @@ package com.win.module.wms.controller.productrepairRequest; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.accountcalendar.vo.ProductrepairRequestMainRespVO; import com.win.module.wms.controller.productrepairRequest.vo.*; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; +import com.win.module.wms.convert.accountcalendar.ProductrepairRequestMainConvert; +import com.win.module.wms.convert.productrepairRequest.ProductrepairRequestMainConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.ProductrepairRequestMainDO; +import com.win.module.wms.dal.dataobject.productrepairRequest.ProductrepairRequestMainDO; +import com.win.module.wms.service.productrepairRequest.ProductrepairRequestMainService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; +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 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.productrepairRequest.vo.*; -import com.win.module.wms.dal.dataobject.productrepairRequest.ProductrepairRequestMainDO; -import com.win.module.wms.convert.productrepairRequest.ProductrepairRequestMainConvert; -import com.win.module.wms.service.productrepairRequest.ProductrepairRequestMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品返修申请主") @RestController @@ -109,4 +110,18 @@ public class ProductrepairRequestMainController { ExcelUtils.write(response, "制品返修申请主.xls", "数据", ProductrepairRequestMainExcelVO.class, datas); } + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品返修申请主分页") + @PreAuthorize("@ss.hasPermission('wms:productrepair-request-main:query')") + public CommonResult> getProductrepairRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = productrepairRequestMainService.getProductrepairRequestMainSenior(conditions); + PageResult result = ProductrepairRequestMainConvert.INSTANCE.convertPage(pageResult); + for(ProductrepairRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packageMassage/PackageMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packageMassage/PackageMapper.java index 6f465cbb..ee232b30 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packageMassage/PackageMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packageMassage/PackageMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.packageMassage; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.packageMassage.vo.PackageExportReqVO; import com.win.module.wms.controller.packageMassage.vo.PackagePageReqVO; import com.win.module.wms.dal.dataobject.packageMassage.PackageDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 包装 Mapper * @@ -64,6 +66,10 @@ public interface PackageMapper extends BaseMapperX { .orderByDesc(PackageDO::getId)); } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(PackageExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PackageDO::getNumber, reqVO.getNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/paramsetting/ParamsettingMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/paramsetting/ParamsettingMapper.java index 6574c689..987df32c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/paramsetting/ParamsettingMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/paramsetting/ParamsettingMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.paramsetting; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.paramsetting.vo.ParamsettingExportReqVO; import com.win.module.wms.controller.paramsetting.vo.ParamsettingPageReqVO; import com.win.module.wms.dal.dataobject.paramsetting.ParamsettingDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 参数设置 Mapper * @@ -32,6 +34,10 @@ public interface ParamsettingMapper extends BaseMapperX { .orderByDesc(ParamsettingDO::getId)); } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ParamsettingExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ParamsettingDO::getStrategyType, reqVO.getStrategyType()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickJob/PickJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickJob/PickJobDetailMapper.java index 629d05ea..b0ae72e5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickJob/PickJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickJob/PickJobDetailMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.pickJob; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.pickJob.vo.PickJobDetailExportReqVO; import com.win.module.wms.controller.pickJob.vo.PickJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.pickJob.PickJobDetailDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 拣料任务子 Mapper * @@ -42,6 +44,10 @@ public interface PickJobDetailMapper extends BaseMapperX { .orderByDesc(PickJobDetailDO::getId)); } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(PickJobDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PickJobDetailDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickJob/PickJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickJob/PickJobMainMapper.java index f94db3eb..3f1be3c1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickJob/PickJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickJob/PickJobMainMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.pickJob; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.pickJob.vo.PickJobMainExportReqVO; import com.win.module.wms.controller.pickJob.vo.PickJobMainPageReqVO; import com.win.module.wms.dal.dataobject.pickJob.PickJobMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 拣料任务主 Mapper * @@ -59,6 +61,10 @@ public interface PickJobMainMapper extends BaseMapperX { .orderByDesc(PickJobMainDO::getId)); } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(PickJobMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PickJobMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickRecord/PickRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickRecord/PickRecordDetailMapper.java index af90506a..62c0bcf4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickRecord/PickRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickRecord/PickRecordDetailMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.pickRecord; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.pickRecord.vo.PickRecordDetailExportReqVO; import com.win.module.wms.controller.pickRecord.vo.PickRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.pickRecord.PickRecordDetailDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 拣料记录子 Mapper * @@ -51,6 +53,9 @@ public interface PickRecordDetailMapper extends BaseMapperX .eqIfPresent(PickRecordDetailDO::getToBatch, reqVO.getToBatch()) .orderByDesc(PickRecordDetailDO::getId)); } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PickRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickRecord/PickRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickRecord/PickRecordMainMapper.java index 72da154d..e264a22d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickRecord/PickRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickRecord/PickRecordMainMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.pickRecord; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.pickRecord.vo.PickRecordMainExportReqVO; import com.win.module.wms.controller.pickRecord.vo.PickRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.pickRecord.PickRecordMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 拣料记录主 Mapper * @@ -46,6 +48,10 @@ public interface PickRecordMainMapper extends BaseMapperX { .orderByDesc(PickRecordMainDO::getId)); } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(PickRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PickRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickRequest/PickRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickRequest/PickRequestDetailMapper.java index 0c9f00e3..5d6f73e8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickRequest/PickRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickRequest/PickRequestDetailMapper.java @@ -2,11 +2,14 @@ package com.win.module.wms.dal.mysql.pickRequest; 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.pickRequest.vo.PickRequestDetailExportReqVO; import com.win.module.wms.controller.pickRequest.vo.PickRequestDetailPageReqVO; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import com.win.module.wms.dal.dataobject.pickRequest.PickRequestDetailDO; import org.apache.ibatis.annotations.Mapper; @@ -39,6 +42,9 @@ public interface PickRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(PickRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickRequest/PickRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickRequest/PickRequestMainMapper.java index a149abf9..3f9b3b2d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickRequest/PickRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickRequest/PickRequestMainMapper.java @@ -2,11 +2,14 @@ package com.win.module.wms.dal.mysql.pickRequest; 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.pickRequest.vo.PickRequestMainExportReqVO; import com.win.module.wms.controller.pickRequest.vo.PickRequestMainPageReqVO; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import com.win.module.wms.dal.dataobject.pickRequest.PickRequestMainDO; import org.apache.ibatis.annotations.Mapper; @@ -44,6 +47,10 @@ public interface PickRequestMainMapper extends BaseMapperX { .orderByDesc(PickRequestMainDO::getId)); } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(PickRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PickRequestMainDO::getFromWarehouseCode, reqVO.getFromWarehouseCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/preparetoissue/PreparetoissueDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/preparetoissue/PreparetoissueDetailMapper.java index 08784a16..c57c7f06 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/preparetoissue/PreparetoissueDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/preparetoissue/PreparetoissueDetailMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.preparetoissue; 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.preparetoissue.vo.PreparetoissueDetailExportReqVO; import com.win.module.wms.controller.preparetoissue.vo.PreparetoissueDetailPageReqVO; import com.win.module.wms.dal.dataobject.preparetoissue.PreparetoissueDetailDO; @@ -36,6 +38,10 @@ public interface PreparetoissueDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(PreparetoissueDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PreparetoissueDetailDO::getToLocationCode, reqVO.getToLocationCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/preparetoissue/PreparetoissueMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/preparetoissue/PreparetoissueMainMapper.java index 3638c99a..185b3b63 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/preparetoissue/PreparetoissueMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/preparetoissue/PreparetoissueMainMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.preparetoissue; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.preparetoissue.vo.PreparetoissueMainExportReqVO; import com.win.module.wms.controller.preparetoissue.vo.PreparetoissueMainPageReqVO; import com.win.module.wms.dal.dataobject.preparetoissue.PreparetoissueMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 备料计划主 Mapper * @@ -40,6 +42,10 @@ public interface PreparetoissueMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(PreparetoissueMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(PreparetoissueMainDO::getProductionPlanNumber, reqVO.getProductionPlanNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/process/ProcessMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/process/ProcessMapper.java index 871a562f..8d463244 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/process/ProcessMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/process/ProcessMapper.java @@ -1,10 +1,13 @@ package com.win.module.wms.dal.mysql.process; +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.process.vo.ProcessExportReqVO; import com.win.module.wms.controller.process.vo.ProcessPageReqVO; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import com.win.module.wms.dal.dataobject.process.ProcessDO; import org.apache.ibatis.annotations.Mapper; @@ -35,6 +38,10 @@ public interface ProcessMapper extends BaseMapperX { .orderByDesc(ProcessDO::getId)); } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProcessExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProcessDO::getCode, reqVO.getCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleJob/ProductdismantleJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleJob/ProductdismantleJobDetailMapper.java index bac05f66..fe32a00d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleJob/ProductdismantleJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleJob/ProductdismantleJobDetailMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productdismantleJob; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobDetailExportReqVO; import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.productdismantleJob.ProductdismantleJobDetailDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品拆解任务子 Mapper * @@ -48,6 +50,10 @@ public interface ProductdismantleJobDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductdismantleJobDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductdismantleJobDetailDO::getProductionLineCode, reqVO.getProductionLineCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleJob/ProductdismantleJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleJob/ProductdismantleJobMainMapper.java index 4af42c67..43c73450 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleJob/ProductdismantleJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleJob/ProductdismantleJobMainMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productdismantleJob; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobMainExportReqVO; import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobMainPageReqVO; import com.win.module.wms.dal.dataobject.productdismantleJob.ProductdismantleJobMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品拆解任务主 Mapper * @@ -60,6 +62,10 @@ public interface ProductdismantleJobMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductdismantleJobMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductdismantleJobMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRecord/ProductdismantleRecordDetailaMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRecord/ProductdismantleRecordDetailaMapper.java index 35558007..d5dbfe36 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRecord/ProductdismantleRecordDetailaMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRecord/ProductdismantleRecordDetailaMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productdismantleRecord; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordDetailaExportReqVO; import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordDetailaPageReqVO; import com.win.module.wms.dal.dataobject.productdismantleRecord.ProductdismantleRecordDetailaDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品拆解记录子 Mapper * @@ -50,6 +52,10 @@ public interface ProductdismantleRecordDetailaMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductdismantleRecordDetailaExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductdismantleRecordDetailaDO::getFromOwnerCode, reqVO.getFromOwnerCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRecord/ProductdismantleRecordDetailbMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRecord/ProductdismantleRecordDetailbMapper.java index 2a13430a..2796556f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRecord/ProductdismantleRecordDetailbMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRecord/ProductdismantleRecordDetailbMapper.java @@ -48,6 +48,7 @@ public interface ProductdismantleRecordDetailbMapper extends BaseMapperX selectSenior(CustomConditions conditions) { return selectPage(conditions, QueryWrapperUtils.structure(conditions)); } + default List selectList(ProductdismantleRecordDetailbExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductdismantleRecordDetailbDO::getProcessCode, reqVO.getProcessCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRequest/ProductdismantleRequestDetailaMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRequest/ProductdismantleRequestDetailaMapper.java index e48e0f22..28706f5d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRequest/ProductdismantleRequestDetailaMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRequest/ProductdismantleRequestDetailaMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productdismantleRequest; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailaExportReqVO; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailaPageReqVO; import com.win.module.wms.dal.dataobject.productdismantleRequest.ProductdismantleRequestDetailaDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品拆解申请子 Mapper * @@ -49,6 +51,10 @@ public interface ProductdismantleRequestDetailaMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductdismantleRequestDetailaExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductdismantleRequestDetailaDO::getProductionLineCode, reqVO.getProductionLineCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRequest/ProductdismantleRequestDetailbMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRequest/ProductdismantleRequestDetailbMapper.java index d2c55952..5c9664f6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRequest/ProductdismantleRequestDetailbMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRequest/ProductdismantleRequestDetailbMapper.java @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.productdismantleRequest; +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.productdismantleRequest.vo.ProductdismantleRequestDetailbExportReqVO; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailbPageReqVO; import com.win.module.wms.dal.dataobject.productdismantleRequest.ProductdismantleRequestDetailbDO; @@ -39,6 +41,10 @@ public interface ProductdismantleRequestDetailbMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductdismantleRequestDetailbExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductdismantleRequestDetailbDO::getProcessCode, reqVO.getProcessCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRequest/ProductdismantleRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRequest/ProductdismantleRequestMainMapper.java index 92bdc9e9..108157e8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRequest/ProductdismantleRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productdismantleRequest/ProductdismantleRequestMainMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productdismantleRequest; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestMainExportReqVO; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.productdismantleRequest.ProductdismantleRequestMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品拆解申请主 Mapper * @@ -44,6 +46,10 @@ public interface ProductdismantleRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductdismantleRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductdismantleRequestMainDO::getWorkshopCode, reqVO.getWorkshopCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/production/ProductionDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/production/ProductionDetailMapper.java index ebbd8983..2feabc8d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/production/ProductionDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/production/ProductionDetailMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.production; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.production.vo.ProductionDetailExportReqVO; import com.win.module.wms.controller.production.vo.ProductionDetailPageReqVO; import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 生产计划子 Mapper * @@ -36,6 +38,10 @@ public interface ProductionDetailMapper extends BaseMapperX .orderByDesc(ProductionDetailDO::getId)); } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductionDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductionDetailDO::getBomVersion, reqVO.getBomVersion()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/production/ProductionMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/production/ProductionMainMapper.java index 4b908faa..f4f5006a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/production/ProductionMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/production/ProductionMainMapper.java @@ -1,16 +1,17 @@ package com.win.module.wms.dal.mysql.production; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.production.vo.ProductionMainExportReqVO; import com.win.module.wms.controller.production.vo.ProductionMainPageReqVO; -import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; import com.win.module.wms.dal.dataobject.production.ProductionMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 生产计划主 Mapper * @@ -43,6 +44,10 @@ public interface ProductionMainMapper extends BaseMapperX { .orderByDesc(ProductionMainDO::getId)); } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductionMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductionMainDO::getDisplayOrder, reqVO.getDisplayOrder()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionline/ProductionlineMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionline/ProductionlineMapper.java index 0a6850d8..056c1faa 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionline/ProductionlineMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionline/ProductionlineMapper.java @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.productionline; +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.productionline.vo.ProductionlineExportReqVO; import com.win.module.wms.controller.productionline.vo.ProductionlinePageReqVO; import com.win.module.wms.dal.dataobject.productionline.ProductionlineDO; @@ -36,6 +38,10 @@ public interface ProductionlineMapper extends BaseMapperX { .orderByDesc(ProductionlineDO::getId)); } + default PageResult selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductionlineExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductionlineDO::getCode, reqVO.getCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionlineitem/ProductionlineitemMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionlineitem/ProductionlineitemMapper.java index 25ac668f..ffd0da42 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionlineitem/ProductionlineitemMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionlineitem/ProductionlineitemMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productionlineitem; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productionlineitem.vo.ProductionlineitemExportReqVO; import com.win.module.wms.controller.productionlineitem.vo.ProductionlineitemPageReqVO; import com.win.module.wms.dal.dataobject.productionlineitem.ProductionlineitemDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 生产线物料关系 Mapper * @@ -31,7 +33,9 @@ public interface ProductionlineitemMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ProductionlineitemExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductionlineitemDO::getFgLocationCode, reqVO.getFgLocationCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptJob/ProductionreceiptJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptJob/ProductionreceiptJobDetailMapper.java index dd555537..73f44945 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptJob/ProductionreceiptJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptJob/ProductionreceiptJobDetailMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productionreceiptJob; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobDetailExportReqVO; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobDetailDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 生产收料任务子 Mapper * @@ -45,6 +47,10 @@ public interface ProductionreceiptJobDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductionreceiptJobDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductionreceiptJobDetailDO::getProductionLineCode, reqVO.getProductionLineCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptJob/ProductionreceiptJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptJob/ProductionreceiptJobMainMapper.java index 964d0196..15c1d0da 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptJob/ProductionreceiptJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptJob/ProductionreceiptJobMainMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productionreceiptJob; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobMainExportReqVO; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobMainPageReqVO; import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 生产收料任务主 Mapper * @@ -61,6 +63,10 @@ public interface ProductionreceiptJobMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductionreceiptJobMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductionreceiptJobMainDO::getIssueJobNumber, reqVO.getIssueJobNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptRecord/ProductionreceiptRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptRecord/ProductionreceiptRecordDetailMapper.java index 2258a5cc..878d2258 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptRecord/ProductionreceiptRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptRecord/ProductionreceiptRecordDetailMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productionreceiptRecord; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productionreceiptRecord.vo.ProductionreceiptRecordDetailExportReqVO; import com.win.module.wms.controller.productionreceiptRecord.vo.ProductionreceiptRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.productionreceiptRecord.ProductionreceiptRecordDetailDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 生产收料记录子 Mapper * @@ -55,6 +57,10 @@ public interface ProductionreceiptRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductionreceiptRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductionreceiptRecordDetailDO::getProductionLineCode, reqVO.getProductionLineCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptRecord/ProductionreceiptRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptRecord/ProductionreceiptRecordMainMapper.java index 073dd067..3e0111a2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptRecord/ProductionreceiptRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptRecord/ProductionreceiptRecordMainMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productionreceiptRecord; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productionreceiptRecord.vo.ProductionreceiptRecordMainExportReqVO; import com.win.module.wms.controller.productionreceiptRecord.vo.ProductionreceiptRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.productionreceiptRecord.ProductionreceiptRecordMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 生产收料记录主 Mapper * @@ -48,6 +50,10 @@ public interface ProductionreceiptRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductionreceiptRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductionreceiptRecordMainDO::getIssueJobNumber, reqVO.getIssueJobNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnJob/ProductionreturnJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnJob/ProductionreturnJobDetailMapper.java index 4468e41a..4d7ca792 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnJob/ProductionreturnJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnJob/ProductionreturnJobDetailMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productionreturnJob; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobDetailExportReqVO; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.productionreturnJob.ProductionreturnJobDetailDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 生产退料任务子 Mapper * @@ -44,6 +46,10 @@ public interface ProductionreturnJobDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductionreturnJobDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductionreturnJobDetailDO::getProductionLineCode, reqVO.getProductionLineCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnJob/ProductionreturnJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnJob/ProductionreturnJobMainMapper.java index 17ed56f7..43376371 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnJob/ProductionreturnJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnJob/ProductionreturnJobMainMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productionreturnJob; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobMainExportReqVO; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobMainPageReqVO; import com.win.module.wms.dal.dataobject.productionreturnJob.ProductionreturnJobMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 生产退料任务主 Mapper * @@ -61,6 +63,10 @@ public interface ProductionreturnJobMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductionreturnJobMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductionreturnJobMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnRecord/ProductionreturnRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnRecord/ProductionreturnRecordDetailMapper.java index 21e3b6e5..d9416779 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnRecord/ProductionreturnRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnRecord/ProductionreturnRecordDetailMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productionreturnRecord; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordDetailExportReqVO; import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.productionreturnRecord.ProductionreturnRecordDetailDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 生产退料记录子 Mapper * @@ -54,6 +56,9 @@ public interface ProductionreturnRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ProductionreturnRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductionreturnRecordDetailDO::getProductionLineCode, reqVO.getProductionLineCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnRecord/ProductionreturnRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnRecord/ProductionreturnRecordMainMapper.java index 7e4deddb..10c6d14b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnRecord/ProductionreturnRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnRecord/ProductionreturnRecordMainMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productionreturnRecord; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordMainExportReqVO; import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.productionreturnRecord.ProductionreturnRecordMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 生产退料记录主 Mapper * @@ -47,6 +49,10 @@ public interface ProductionreturnRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductionreturnRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductionreturnRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnRequest/ProductionreturnRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnRequest/ProductionreturnRequestDetailMapper.java index dcf94fd6..d4fba8f9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnRequest/ProductionreturnRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnRequest/ProductionreturnRequestDetailMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productionreturnRequest; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestDetailExportReqVO; import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.productionreturnRequest.ProductionreturnRequestDetailDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 生产退料申请子 Mapper * @@ -45,6 +47,10 @@ public interface ProductionreturnRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductionreturnRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductionreturnRequestDetailDO::getProductionLineCode, reqVO.getProductionLineCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnRequest/ProductionreturnRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnRequest/ProductionreturnRequestMainMapper.java index 411f4066..3dcdfeb7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnRequest/ProductionreturnRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnRequest/ProductionreturnRequestMainMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productionreturnRequest; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestMainExportReqVO; import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.productionreturnRequest.ProductionreturnRequestMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 生产退料申请主 Mapper * @@ -44,7 +46,9 @@ public interface ProductionreturnRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ProductionreturnRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductionreturnRequestMainDO::getWorkshopCode, reqVO.getWorkshopCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayJob/ProductputawayJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayJob/ProductputawayJobDetailMapper.java index d44094f1..3976cfa1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayJob/ProductputawayJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayJob/ProductputawayJobDetailMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productputawayJob; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobDetailExportReqVO; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.productputawayJob.ProductputawayJobDetailDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品上架任务子 Mapper * @@ -44,6 +46,10 @@ public interface ProductputawayJobDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductputawayJobDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductputawayJobDetailDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayJob/ProductputawayJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayJob/ProductputawayJobMainMapper.java index a58fcfe0..6f26c12c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayJob/ProductputawayJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayJob/ProductputawayJobMainMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productputawayJob; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobMainExportReqVO; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobMainPageReqVO; import com.win.module.wms.dal.dataobject.productputawayJob.ProductputawayJobMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品上架任务主 Mapper * @@ -60,6 +62,10 @@ public interface ProductputawayJobMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductputawayJobMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductputawayJobMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRecord/ProductputawayRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRecord/ProductputawayRecordDetailMapper.java index ebf7f650..e798e045 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRecord/ProductputawayRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRecord/ProductputawayRecordDetailMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productputawayRecord; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordDetailExportReqVO; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.productputawayRecord.ProductputawayRecordDetailDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品上架记录子 Mapper * @@ -54,6 +56,10 @@ public interface ProductputawayRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductputawayRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductputawayRecordDetailDO::getFromPackingNumber, reqVO.getFromPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRecord/ProductputawayRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRecord/ProductputawayRecordMainMapper.java index 42e1232b..8b49cacc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRecord/ProductputawayRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRecord/ProductputawayRecordMainMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productputawayRecord; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordMainExportReqVO; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.productputawayRecord.ProductputawayRecordMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品上架记录主 Mapper * @@ -48,6 +50,10 @@ public interface ProductputawayRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductputawayRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductputawayRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRequest/ProductputawayRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRequest/ProductputawayRequestDetailMapper.java index 7ed2aa8c..754ae1f6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRequest/ProductputawayRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRequest/ProductputawayRequestDetailMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productputawayRequest; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestDetailExportReqVO; import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.productputawayRequest.ProductputawayRequestDetailDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品上架申请子 Mapper * @@ -45,6 +47,10 @@ public interface ProductputawayRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductputawayRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductputawayRequestDetailDO::getPackingNumber, reqVO.getPackingNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRequest/ProductputawayRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRequest/ProductputawayRequestMainMapper.java index a82abcc9..a3f23fd4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRequest/ProductputawayRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayRequest/ProductputawayRequestMainMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productputawayRequest; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestMainExportReqVO; import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.productputawayRequest.ProductputawayRequestMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品上架申请主 Mapper * @@ -45,6 +47,10 @@ public interface ProductputawayRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductputawayRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductputawayRequestMainDO::getSupplierCode, reqVO.getSupplierCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptJob/ProductreceiptJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptJob/ProductreceiptJobDetailMapper.java index 821bfb06..c2e74143 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptJob/ProductreceiptJobDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptJob/ProductreceiptJobDetailMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productreceiptJob; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobDetailExportReqVO; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobDetailPageReqVO; import com.win.module.wms.dal.dataobject.productreceiptJob.ProductreceiptJobDetailDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品收货任务子 Mapper * @@ -49,6 +51,10 @@ public interface ProductreceiptJobDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductreceiptJobDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductreceiptJobDetailDO::getProductionLineCode, reqVO.getProductionLineCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptJob/ProductreceiptJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptJob/ProductreceiptJobMainMapper.java index 12febfd2..254d3229 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptJob/ProductreceiptJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptJob/ProductreceiptJobMainMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productreceiptJob; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobMainExportReqVO; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobMainPageReqVO; import com.win.module.wms.dal.dataobject.productreceiptJob.ProductreceiptJobMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品收货任务主 Mapper * @@ -62,6 +64,10 @@ public interface ProductreceiptJobMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductreceiptJobMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductreceiptJobMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRecord/BackflushRecordDetailbMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRecord/BackflushRecordDetailbMapper.java index 73105a41..8b2b5d34 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRecord/BackflushRecordDetailbMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRecord/BackflushRecordDetailbMapper.java @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.productreceiptRecord; +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.productreceiptRecord.vo.BackflushRecordDetailbExportReqVO; import com.win.module.wms.controller.productreceiptRecord.vo.BackflushRecordDetailbPageReqVO; import com.win.module.wms.dal.dataobject.productreceiptRecord.BackflushRecordDetailbDO; @@ -44,6 +46,10 @@ public interface BackflushRecordDetailbMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(BackflushRecordDetailbExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(BackflushRecordDetailbDO::getProcessCode, reqVO.getProcessCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRecord/ProductreceiptRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRecord/ProductreceiptRecordDetailMapper.java index 5a42487f..1ff8e134 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRecord/ProductreceiptRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRecord/ProductreceiptRecordDetailMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productreceiptRecord; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productreceiptRecord.vo.ProductreceiptRecordDetailExportReqVO; import com.win.module.wms.controller.productreceiptRecord.vo.ProductreceiptRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.productreceiptRecord.ProductreceiptRecordDetailDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品收货记录子 Mapper * @@ -54,6 +56,10 @@ public interface ProductreceiptRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductreceiptRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductreceiptRecordDetailDO::getProductionlineCode, reqVO.getProductionlineCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRecord/ProductreceiptRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRecord/ProductreceiptRecordMainMapper.java index 3e1c138d..a1403226 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRecord/ProductreceiptRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRecord/ProductreceiptRecordMainMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productreceiptRecord; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productreceiptRecord.vo.ProductreceiptRecordMainExportReqVO; import com.win.module.wms.controller.productreceiptRecord.vo.ProductreceiptRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.productreceiptRecord.ProductreceiptRecordMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品收货记录主 Mapper * @@ -47,6 +49,10 @@ public interface ProductreceiptRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductreceiptRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductreceiptRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRequest/ProductreceiptRequestDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRequest/ProductreceiptRequestDetailMapper.java index 64d2c1d0..61348d2f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRequest/ProductreceiptRequestDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRequest/ProductreceiptRequestDetailMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productreceiptRequest; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestDetailExportReqVO; import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestDetailPageReqVO; import com.win.module.wms.dal.dataobject.productreceiptRequest.ProductreceiptRequestDetailDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品收货申请子 Mapper * @@ -50,6 +52,10 @@ public interface ProductreceiptRequestDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductreceiptRequestDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductreceiptRequestDetailDO::getProductionLineCode, reqVO.getProductionLineCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRequest/ProductreceiptRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRequest/ProductreceiptRequestMainMapper.java index d29fcc69..c376cbd6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRequest/ProductreceiptRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productreceiptRequest/ProductreceiptRequestMainMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productreceiptRequest; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestMainExportReqVO; import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.productreceiptRequest.ProductreceiptRequestMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品收货申请主 Mapper * @@ -45,6 +47,10 @@ public interface ProductreceiptRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductreceiptRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductreceiptRequestMainDO::getProductionPlanNumber, reqVO.getProductionPlanNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRecord/ConsumeRecordDetailbMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRecord/ConsumeRecordDetailbMapper.java index fc16adb1..e51c9f31 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRecord/ConsumeRecordDetailbMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRecord/ConsumeRecordDetailbMapper.java @@ -1,8 +1,10 @@ package com.win.module.wms.dal.mysql.productrepairRecord; +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.productrepairRecord.vo.ConsumeRecordDetailbExportReqVO; import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailbPageReqVO; import com.win.module.wms.dal.dataobject.productrepairRecord.ConsumeRecordDetailbDO; @@ -41,6 +43,10 @@ public interface ConsumeRecordDetailbMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ConsumeRecordDetailbExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ConsumeRecordDetailbDO::getBatch, reqVO.getBatch()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRecord/ProductrepairRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRecord/ProductrepairRecordDetailMapper.java index 6381fba1..2060becc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRecord/ProductrepairRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRecord/ProductrepairRecordDetailMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productrepairRecord; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productrepairRecord.vo.ProductrepairRecordDetailExportReqVO; import com.win.module.wms.controller.productrepairRecord.vo.ProductrepairRecordDetailPageReqVO; import com.win.module.wms.dal.dataobject.productrepairRecord.ProductrepairRecordDetailDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品返修记录子 Mapper * @@ -50,6 +52,10 @@ public interface ProductrepairRecordDetailMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductrepairRecordDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductrepairRecordDetailDO::getFromOwnerCode, reqVO.getFromOwnerCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRecord/ProductrepairRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRecord/ProductrepairRecordMainMapper.java index bb72dd60..31d9c8d9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRecord/ProductrepairRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRecord/ProductrepairRecordMainMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productrepairRecord; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productrepairRecord.vo.ProductrepairRecordMainExportReqVO; import com.win.module.wms.controller.productrepairRecord.vo.ProductrepairRecordMainPageReqVO; import com.win.module.wms.dal.dataobject.productrepairRecord.ProductrepairRecordMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品返修记录主 Mapper * @@ -45,6 +47,10 @@ public interface ProductrepairRecordMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductrepairRecordMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductrepairRecordMainDO::getRequestNumber, reqVO.getRequestNumber()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRequest/ProductrepairRequestDetailaMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRequest/ProductrepairRequestDetailaMapper.java index 4f552a04..449bda88 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRequest/ProductrepairRequestDetailaMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRequest/ProductrepairRequestDetailaMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productrepairRequest; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestDetailaExportReqVO; import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestDetailaPageReqVO; import com.win.module.wms.dal.dataobject.productrepairRequest.ProductrepairRequestDetailaDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品返修申请子 Mapper * @@ -44,6 +46,9 @@ public interface ProductrepairRequestDetailaMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ProductrepairRequestDetailaExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRequest/ProductrepairRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRequest/ProductrepairRequestMainMapper.java index 592b4276..e03f5007 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRequest/ProductrepairRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRequest/ProductrepairRequestMainMapper.java @@ -1,15 +1,17 @@ package com.win.module.wms.dal.mysql.productrepairRequest; -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.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestMainExportReqVO; import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestMainPageReqVO; import com.win.module.wms.dal.dataobject.productrepairRequest.ProductrepairRequestMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品返修申请主 Mapper * @@ -44,6 +46,10 @@ public interface ProductrepairRequestMainMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + default List selectList(ProductrepairRequestMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductrepairRequestMainDO::getWorkshopCode, reqVO.getWorkshopCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/accountcalendar/AccountcalendarService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/accountcalendar/AccountcalendarService.java index 7613546a..ef6ef7de 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/accountcalendar/AccountcalendarService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/accountcalendar/AccountcalendarService.java @@ -77,5 +77,6 @@ public interface AccountcalendarService { */ List getAccountcalendarList(AccountcalendarExportReqVO exportReqVO); + List importAccountcalendarList(List accountcalendarImportExcelVos, Integer mode, boolean updatePart); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageService.java index d3099f77..3d63d290 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.packageMassage; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.packageMassage.vo.PackageCreateReqVO; import com.win.module.wms.controller.packageMassage.vo.PackageExportReqVO; import com.win.module.wms.controller.packageMassage.vo.PackagePageReqVO; import com.win.module.wms.controller.packageMassage.vo.PackageUpdateReqVO; import com.win.module.wms.dal.dataobject.packageMassage.PackageDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 包装 Service 接口 @@ -77,4 +79,12 @@ public interface PackageService { * @return 包装列表 */ PackageDO LabelExist(String pnumber); + + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPackageSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageServiceImpl.java index 06408550..dc506a1d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageServiceImpl.java @@ -1,24 +1,25 @@ package com.win.module.wms.service.packageMassage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.packageMassage.vo.PackageCreateReqVO; import com.win.module.wms.controller.packageMassage.vo.PackageExportReqVO; import com.win.module.wms.controller.packageMassage.vo.PackagePageReqVO; import com.win.module.wms.controller.packageMassage.vo.PackageUpdateReqVO; +import com.win.module.wms.convert.packageMassage.PackageConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.packageMassage.PackageDO; +import com.win.module.wms.dal.mysql.packageMassage.PackageMapper; 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.packageMassage.PackageDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.packageMassage.PackageConvert; -import com.win.module.wms.dal.mysql.packageMassage.PackageMapper; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.PACKAGE_NOT_EXISTS; /** * 包装 Service 实现类 @@ -96,4 +97,9 @@ public class PackageServiceImpl implements PackageService { throw exception(PACKAGE_NOT_EXISTS); } } + + @Override + public PageResult getPackageSenior(CustomConditions conditions) { + return packageMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/paramsetting/ParamsettingService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/paramsetting/ParamsettingService.java index 35a73e56..3e3d04b8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/paramsetting/ParamsettingService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/paramsetting/ParamsettingService.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.paramsetting; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.paramsetting.vo.*; import com.win.module.wms.dal.dataobject.paramsetting.ParamsettingDO; @@ -70,4 +71,12 @@ public interface ParamsettingService { List getParamsettingList(ParamsettingExportReqVO exportReqVO); List importParamsettingList(List paramsettings, Integer mode, Boolean updatePart); + + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getParamsettingSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/paramsetting/ParamsettingServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/paramsetting/ParamsettingServiceImpl.java index aade11e5..133060f9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/paramsetting/ParamsettingServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/paramsetting/ParamsettingServiceImpl.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.paramsetting; import cn.hutool.core.collection.CollUtil; 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.paramsetting.vo.*; @@ -172,4 +173,9 @@ public class ParamsettingServiceImpl implements ParamsettingService { throw exception(PARAMSETTING_VALUE_SCOPE_NOT_EXISTS); } } + @Override + public PageResult getParamsettingSenior(CustomConditions conditions) { + return paramsettingMapper.selectSenior(conditions); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobDetailService.java index a716f07a..3d926cf7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobDetailService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.pickJob; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.pickJob.vo.PickJobDetailCreateReqVO; import com.win.module.wms.controller.pickJob.vo.PickJobDetailExportReqVO; import com.win.module.wms.controller.pickJob.vo.PickJobDetailPageReqVO; import com.win.module.wms.controller.pickJob.vo.PickJobDetailUpdateReqVO; import com.win.module.wms.dal.dataobject.pickJob.PickJobDetailDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 拣料任务子 Service 接口 @@ -71,4 +73,11 @@ public interface PickJobDetailService { */ List getPickJobDetailList(PickJobDetailExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPickJobDetailSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobDetailServiceImpl.java index 0e8d9206..0f332381 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobDetailServiceImpl.java @@ -1,23 +1,24 @@ package com.win.module.wms.service.pickJob; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.pickJob.vo.PickJobDetailCreateReqVO; import com.win.module.wms.controller.pickJob.vo.PickJobDetailExportReqVO; import com.win.module.wms.controller.pickJob.vo.PickJobDetailPageReqVO; import com.win.module.wms.controller.pickJob.vo.PickJobDetailUpdateReqVO; +import com.win.module.wms.convert.pickJob.PickJobDetailConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.pickJob.PickJobDetailDO; +import com.win.module.wms.dal.mysql.pickJob.PickJobDetailMapper; 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.pickJob.PickJobDetailDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.pickJob.PickJobDetailConvert; -import com.win.module.wms.dal.mysql.pickJob.PickJobDetailMapper; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.PICK_JOB_DETAIL_NOT_EXISTS; /** * 拣料任务子 Service 实现类 @@ -83,4 +84,8 @@ public class PickJobDetailServiceImpl implements PickJobDetailService { return pickJobDetailMapper.selectList(exportReqVO); } + @Override + public PageResult getPickJobDetailSenior(CustomConditions conditions) { + return pickJobDetailMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainService.java index dbde6ac1..49b7c471 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.pickJob; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.pickJob.vo.PickJobMainCreateReqVO; import com.win.module.wms.controller.pickJob.vo.PickJobMainExportReqVO; import com.win.module.wms.controller.pickJob.vo.PickJobMainPageReqVO; import com.win.module.wms.controller.pickJob.vo.PickJobMainUpdateReqVO; import com.win.module.wms.dal.dataobject.pickJob.PickJobMainDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 拣料任务主 Service 接口 @@ -78,4 +80,12 @@ public interface PickJobMainService { * @return 采购订单主列表 */ public PickJobMainDO ipickJobMainDoStatusRight(String pnumber, String pstatus); + + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPickJobMainSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainServiceImpl.java index 1950a3ab..77d50961 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainServiceImpl.java @@ -1,25 +1,25 @@ package com.win.module.wms.service.pickJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.pickJob.vo.PickJobMainCreateReqVO; import com.win.module.wms.controller.pickJob.vo.PickJobMainExportReqVO; import com.win.module.wms.controller.pickJob.vo.PickJobMainPageReqVO; import com.win.module.wms.controller.pickJob.vo.PickJobMainUpdateReqVO; -import com.win.module.wms.dal.dataobject.issueJob.IssueJobMainDO; +import com.win.module.wms.convert.pickJob.PickJobMainConvert; +import com.win.module.wms.dal.dataobject.pickJob.PickJobMainDO; +import com.win.module.wms.dal.mysql.pickJob.PickJobMainMapper; 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.pickJob.PickJobMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.pickJob.PickJobMainConvert; -import com.win.module.wms.dal.mysql.pickJob.PickJobMainMapper; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.PICK_JOB_MAIN_NOT_EXISTS; +import static com.win.module.wms.enums.ErrorCodeConstants.PICK_JOB_MAIN_STATUS_ERROR; /** * 拣料任务主 Service 实现类 @@ -96,4 +96,9 @@ public class PickJobMainServiceImpl implements PickJobMainService { throw exception(PICK_JOB_MAIN_STATUS_ERROR); } } + + @Override + public PageResult getPickJobMainSenior(CustomConditions conditions) { + return pickJobMainMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRecord/PickRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRecord/PickRecordDetailService.java index f47b7bc2..43561ea9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRecord/PickRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRecord/PickRecordDetailService.java @@ -1,14 +1,17 @@ package com.win.module.wms.service.pickRecord; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.pickRecord.vo.PickRecordDetailCreateReqVO; import com.win.module.wms.controller.pickRecord.vo.PickRecordDetailExportReqVO; import com.win.module.wms.controller.pickRecord.vo.PickRecordDetailPageReqVO; import com.win.module.wms.controller.pickRecord.vo.PickRecordDetailUpdateReqVO; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import com.win.module.wms.dal.dataobject.pickRecord.PickRecordDetailDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 拣料记录子 Service 接口 @@ -71,4 +74,11 @@ public interface PickRecordDetailService { */ List getPickRecordDetailList(PickRecordDetailExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPickRecordDetailSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRecord/PickRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRecord/PickRecordDetailServiceImpl.java index c35e2c16..ddbec7c5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRecord/PickRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRecord/PickRecordDetailServiceImpl.java @@ -1,23 +1,23 @@ package com.win.module.wms.service.pickRecord; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.pickRecord.vo.PickRecordDetailCreateReqVO; import com.win.module.wms.controller.pickRecord.vo.PickRecordDetailExportReqVO; import com.win.module.wms.controller.pickRecord.vo.PickRecordDetailPageReqVO; import com.win.module.wms.controller.pickRecord.vo.PickRecordDetailUpdateReqVO; +import com.win.module.wms.convert.pickRecord.PickRecordDetailConvert; +import com.win.module.wms.dal.dataobject.pickRecord.PickRecordDetailDO; +import com.win.module.wms.dal.mysql.pickRecord.PickRecordDetailMapper; 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.pickRecord.PickRecordDetailDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.pickRecord.PickRecordDetailConvert; -import com.win.module.wms.dal.mysql.pickRecord.PickRecordDetailMapper; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.PICK_RECORD_DETAIL_NOT_EXISTS; /** * 拣料记录子 Service 实现类 @@ -83,4 +83,8 @@ public class PickRecordDetailServiceImpl implements PickRecordDetailService { return pickRecordDetailMapper.selectList(exportReqVO); } + @Override + public PageResult getPickRecordDetailSenior(CustomConditions conditions) { + return pickRecordDetailMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRecord/PickRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRecord/PickRecordMainService.java index ac30ab3a..9757f788 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRecord/PickRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRecord/PickRecordMainService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.pickRecord; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.pickRecord.vo.PickRecordMainCreateReqVO; import com.win.module.wms.controller.pickRecord.vo.PickRecordMainExportReqVO; import com.win.module.wms.controller.pickRecord.vo.PickRecordMainPageReqVO; import com.win.module.wms.controller.pickRecord.vo.PickRecordMainUpdateReqVO; import com.win.module.wms.dal.dataobject.pickRecord.PickRecordMainDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 拣料记录主 Service 接口 @@ -71,4 +73,11 @@ public interface PickRecordMainService { */ List getPickRecordMainList(PickRecordMainExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPickRecordMainSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRecord/PickRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRecord/PickRecordMainServiceImpl.java index 9354407f..3655cb27 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRecord/PickRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRecord/PickRecordMainServiceImpl.java @@ -1,23 +1,24 @@ package com.win.module.wms.service.pickRecord; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.pickRecord.vo.PickRecordMainCreateReqVO; import com.win.module.wms.controller.pickRecord.vo.PickRecordMainExportReqVO; import com.win.module.wms.controller.pickRecord.vo.PickRecordMainPageReqVO; import com.win.module.wms.controller.pickRecord.vo.PickRecordMainUpdateReqVO; +import com.win.module.wms.convert.pickRecord.PickRecordMainConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.pickRecord.PickRecordMainDO; +import com.win.module.wms.dal.mysql.pickRecord.PickRecordMainMapper; 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.pickRecord.PickRecordMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.pickRecord.PickRecordMainConvert; -import com.win.module.wms.dal.mysql.pickRecord.PickRecordMainMapper; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.PICK_RECORD_MAIN_NOT_EXISTS; /** * 拣料记录主 Service 实现类 @@ -83,4 +84,8 @@ public class PickRecordMainServiceImpl implements PickRecordMainService { return pickRecordMainMapper.selectList(exportReqVO); } + @Override + public PageResult getPickRecordMainSenior(CustomConditions conditions) { + return pickRecordMainMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRequest/PickRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRequest/PickRequestDetailService.java index cd6c4698..23e90e1d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRequest/PickRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRequest/PickRequestDetailService.java @@ -3,10 +3,12 @@ package com.win.module.wms.service.pickRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.pickRequest.vo.PickRequestDetailCreateReqVO; import com.win.module.wms.controller.pickRequest.vo.PickRequestDetailExportReqVO; import com.win.module.wms.controller.pickRequest.vo.PickRequestDetailPageReqVO; import com.win.module.wms.controller.pickRequest.vo.PickRequestDetailUpdateReqVO; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import com.win.module.wms.dal.dataobject.pickRequest.PickRequestDetailDO; import com.win.framework.common.pojo.PageResult; @@ -63,6 +65,14 @@ public interface PickRequestDetailService { */ PageResult getPickRequestDetailPage(PickRequestDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPickRequestDetailSenior(CustomConditions conditions); + /** * 获得拣料申请子列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRequest/PickRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRequest/PickRequestDetailServiceImpl.java index 28e2d7fd..725b3b45 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRequest/PickRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRequest/PickRequestDetailServiceImpl.java @@ -1,9 +1,11 @@ package com.win.module.wms.service.pickRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.pickRequest.vo.PickRequestDetailCreateReqVO; import com.win.module.wms.controller.pickRequest.vo.PickRequestDetailExportReqVO; import com.win.module.wms.controller.pickRequest.vo.PickRequestDetailPageReqVO; import com.win.module.wms.controller.pickRequest.vo.PickRequestDetailUpdateReqVO; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -77,6 +79,10 @@ public class PickRequestDetailServiceImpl implements PickRequestDetailService { public PageResult getPickRequestDetailPage(PickRequestDetailPageReqVO pageReqVO) { return pickRequestDetailMapper.selectPage(pageReqVO); } + @Override + public PageResult getPickRequestDetailSenior(CustomConditions conditions) { + return pickRequestDetailMapper.selectSenior(conditions); + } @Override public List getPickRequestDetailList(PickRequestDetailExportReqVO exportReqVO) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRequest/PickRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRequest/PickRequestMainService.java index cb6d102d..7e8dbc35 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRequest/PickRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRequest/PickRequestMainService.java @@ -3,10 +3,12 @@ package com.win.module.wms.service.pickRequest; import java.util.*; import javax.validation.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.pickRequest.vo.PickRequestMainCreateReqVO; import com.win.module.wms.controller.pickRequest.vo.PickRequestMainExportReqVO; import com.win.module.wms.controller.pickRequest.vo.PickRequestMainPageReqVO; import com.win.module.wms.controller.pickRequest.vo.PickRequestMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import com.win.module.wms.dal.dataobject.pickRequest.PickRequestMainDO; import com.win.framework.common.pojo.PageResult; @@ -54,6 +56,13 @@ public interface PickRequestMainService { * @return 拣料申请主列表 */ List getPickRequestMainList(Collection ids); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPickRequestMainSenior(CustomConditions conditions); /** * 获得拣料申请主分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRequest/PickRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRequest/PickRequestMainServiceImpl.java index 65447cc1..2b9b7808 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRequest/PickRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickRequest/PickRequestMainServiceImpl.java @@ -1,9 +1,11 @@ package com.win.module.wms.service.pickRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.pickRequest.vo.PickRequestMainCreateReqVO; import com.win.module.wms.controller.pickRequest.vo.PickRequestMainExportReqVO; import com.win.module.wms.controller.pickRequest.vo.PickRequestMainPageReqVO; import com.win.module.wms.controller.pickRequest.vo.PickRequestMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -73,6 +75,10 @@ public class PickRequestMainServiceImpl implements PickRequestMainService { return pickRequestMainMapper.selectBatchIds(ids); } + @Override + public PageResult getPickRequestMainSenior(CustomConditions conditions) { + return pickRequestMainMapper.selectSenior(conditions); + } @Override public PageResult getPickRequestMainPage(PickRequestMainPageReqVO pageReqVO) { return pickRequestMainMapper.selectPage(pageReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueDetailService.java index 85d37b9c..ee3d3b1f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueDetailService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.preparetoissue; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.preparetoissue.vo.PreparetoissueDetailCreateReqVO; import com.win.module.wms.controller.preparetoissue.vo.PreparetoissueDetailExportReqVO; import com.win.module.wms.controller.preparetoissue.vo.PreparetoissueDetailPageReqVO; import com.win.module.wms.controller.preparetoissue.vo.PreparetoissueDetailUpdateReqVO; import com.win.module.wms.dal.dataobject.preparetoissue.PreparetoissueDetailDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 备料计划子 Service 接口 @@ -71,4 +73,13 @@ public interface PreparetoissueDetailService { */ List getPreparetoissueDetailList(PreparetoissueDetailExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPreparetoissueDetailSenior(CustomConditions conditions); + + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueDetailServiceImpl.java index 2df12140..b50b7d7f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueDetailServiceImpl.java @@ -1,23 +1,23 @@ package com.win.module.wms.service.preparetoissue; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.preparetoissue.vo.PreparetoissueDetailCreateReqVO; import com.win.module.wms.controller.preparetoissue.vo.PreparetoissueDetailExportReqVO; import com.win.module.wms.controller.preparetoissue.vo.PreparetoissueDetailPageReqVO; import com.win.module.wms.controller.preparetoissue.vo.PreparetoissueDetailUpdateReqVO; +import com.win.module.wms.convert.preparetoissue.PreparetoissueDetailConvert; +import com.win.module.wms.dal.dataobject.preparetoissue.PreparetoissueDetailDO; +import com.win.module.wms.dal.mysql.preparetoissue.PreparetoissueDetailMapper; 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.preparetoissue.PreparetoissueDetailDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.preparetoissue.PreparetoissueDetailConvert; -import com.win.module.wms.dal.mysql.preparetoissue.PreparetoissueDetailMapper; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.PREPARETOISSUE_DETAIL_NOT_EXISTS; /** * 备料计划子 Service 实现类 @@ -83,4 +83,9 @@ public class PreparetoissueDetailServiceImpl implements PreparetoissueDetailServ return preparetoissueDetailMapper.selectList(exportReqVO); } + @Override + public PageResult getPreparetoissueDetailSenior(CustomConditions conditions) { + return preparetoissueDetailMapper.selectSenior(conditions); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueMainService.java index 9cfb7cf9..ef743889 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueMainService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.preparetoissue; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.preparetoissue.vo.PreparetoissueMainCreateReqVO; import com.win.module.wms.controller.preparetoissue.vo.PreparetoissueMainExportReqVO; import com.win.module.wms.controller.preparetoissue.vo.PreparetoissueMainPageReqVO; import com.win.module.wms.controller.preparetoissue.vo.PreparetoissueMainUpdateReqVO; import com.win.module.wms.dal.dataobject.preparetoissue.PreparetoissueMainDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 备料计划主 Service 接口 @@ -63,6 +65,15 @@ public interface PreparetoissueMainService { */ PageResult getPreparetoissueMainPage(PreparetoissueMainPageReqVO pageReqVO); + + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getPreparetoissueMainSenior(CustomConditions conditions); + /** * 获得备料计划主列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueMainServiceImpl.java index 753cd863..3d74539e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueMainServiceImpl.java @@ -1,23 +1,23 @@ package com.win.module.wms.service.preparetoissue; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.preparetoissue.vo.PreparetoissueMainCreateReqVO; import com.win.module.wms.controller.preparetoissue.vo.PreparetoissueMainExportReqVO; import com.win.module.wms.controller.preparetoissue.vo.PreparetoissueMainPageReqVO; import com.win.module.wms.controller.preparetoissue.vo.PreparetoissueMainUpdateReqVO; +import com.win.module.wms.convert.preparetoissue.PreparetoissueMainConvert; +import com.win.module.wms.dal.dataobject.preparetoissue.PreparetoissueMainDO; +import com.win.module.wms.dal.mysql.preparetoissue.PreparetoissueMainMapper; 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.preparetoissue.PreparetoissueMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.preparetoissue.PreparetoissueMainConvert; -import com.win.module.wms.dal.mysql.preparetoissue.PreparetoissueMainMapper; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.PREPARETOISSUE_MAIN_NOT_EXISTS; /** * 备料计划主 Service 实现类 @@ -78,6 +78,11 @@ public class PreparetoissueMainServiceImpl implements PreparetoissueMainService return preparetoissueMainMapper.selectPage(pageReqVO); } + @Override + public PageResult getPreparetoissueMainSenior(CustomConditions conditions) { + return preparetoissueMainMapper.selectSenior(conditions); + } + @Override public List getPreparetoissueMainList(PreparetoissueMainExportReqVO exportReqVO) { return preparetoissueMainMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/process/ProcessService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/process/ProcessService.java index 2d0ade63..769c5338 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/process/ProcessService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/process/ProcessService.java @@ -1,7 +1,9 @@ package com.win.module.wms.service.process; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.process.vo.*; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import com.win.module.wms.dal.dataobject.process.ProcessDO; import javax.validation.Valid; @@ -61,6 +63,14 @@ public interface ProcessService { */ PageResult getProcessPage(ProcessPageReqVO pageReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProcessSenior(CustomConditions conditions); + /** * 获得工序列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/process/ProcessServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/process/ProcessServiceImpl.java index 8460a604..8e57b309 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/process/ProcessServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/process/ProcessServiceImpl.java @@ -4,10 +4,12 @@ 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.process.vo.*; import com.win.module.wms.convert.process.ProcessConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import com.win.module.wms.dal.dataobject.owner.OwnerDO; import com.win.module.wms.dal.dataobject.process.ProcessDO; import com.win.module.wms.dal.mysql.process.ProcessMapper; @@ -76,6 +78,10 @@ public class ProcessServiceImpl implements ProcessService { public PageResult getProcessPage(ProcessPageReqVO pageReqVO) { return processMapper.selectPage(pageReqVO); } + @Override + public PageResult getProcessSenior(CustomConditions conditions) { + return processMapper.selectSenior(conditions); + } @Override public List getProcessList(ProcessExportReqVO exportReqVO) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobDetailService.java index fc8a98de..96ca9e61 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobDetailService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productdismantleJob; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobDetailCreateReqVO; import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobDetailExportReqVO; import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobDetailPageReqVO; import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobDetailUpdateReqVO; import com.win.module.wms.dal.dataobject.productdismantleJob.ProductdismantleJobDetailDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品拆解任务子 Service 接口 @@ -63,6 +65,14 @@ public interface ProductdismantleJobDetailService { */ PageResult getProductdismantleJobDetailPage(ProductdismantleJobDetailPageReqVO pageReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductdismantleJobDetailSenior(CustomConditions conditions); + /** * 获得制品拆解任务子列表, 用于 Excel 导出 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobDetailServiceImpl.java index 14e84846..fedacf61 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobDetailServiceImpl.java @@ -1,23 +1,23 @@ package com.win.module.wms.service.productdismantleJob; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobDetailCreateReqVO; import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobDetailExportReqVO; import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobDetailPageReqVO; import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobDetailUpdateReqVO; +import com.win.module.wms.convert.productdismantleJob.ProductdismantleJobDetailConvert; +import com.win.module.wms.dal.dataobject.productdismantleJob.ProductdismantleJobDetailDO; import com.win.module.wms.dal.mysql.productdismantleJob.ProductdismantleJobDetailMapper; 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.productdismantleJob.ProductdismantleJobDetailDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productdismantleJob.ProductdismantleJobDetailConvert; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTDISMANTLE_JOB_DETAIL_NOT_EXISTS; /** * 制品拆解任务子 Service 实现类 @@ -78,6 +78,11 @@ public class ProductdismantleJobDetailServiceImpl implements ProductdismantleJob return productdismantleJobDetailMapper.selectPage(pageReqVO); } + @Override + public PageResult getProductdismantleJobDetailSenior(CustomConditions conditions) { + return productdismantleJobDetailMapper.selectSenior(conditions); + } + @Override public List getProductdismantleJobDetailList(ProductdismantleJobDetailExportReqVO exportReqVO) { return productdismantleJobDetailMapper.selectList(exportReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainService.java index 7a5b5f50..5d24b4ed 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productdismantleJob; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobMainCreateReqVO; import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobMainExportReqVO; import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobMainPageReqVO; import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobMainUpdateReqVO; import com.win.module.wms.dal.dataobject.productdismantleJob.ProductdismantleJobMainDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品拆解任务主 Service 接口 @@ -70,6 +72,13 @@ public interface ProductdismantleJobMainService { * @return 制品拆解任务主列表 */ List getProductdismantleJobMainList(ProductdismantleJobMainExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductdismantleJobMainSenior(CustomConditions conditions); /** * 校验任务状态正确 *@author chenfang diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainServiceImpl.java index 286107d7..7a79060a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainServiceImpl.java @@ -1,25 +1,25 @@ package com.win.module.wms.service.productdismantleJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobMainCreateReqVO; import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobMainExportReqVO; import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobMainPageReqVO; import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobMainUpdateReqVO; -import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; +import com.win.module.wms.convert.productdismantleJob.ProductdismantleJobMainConvert; +import com.win.module.wms.dal.dataobject.productdismantleJob.ProductdismantleJobMainDO; +import com.win.module.wms.dal.mysql.productdismantleJob.ProductdismantleJobMainMapper; 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.productdismantleJob.ProductdismantleJobMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productdismantleJob.ProductdismantleJobMainConvert; -import com.win.module.wms.dal.mysql.productdismantleJob.ProductdismantleJobMainMapper; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTDISMANTLE_JOB_MAIN_NOT_EXISTS; +import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTDISMANTLE_JOB_MAIN_STATUS_ERROR; /** * 制品拆解任务主 Service 实现类 @@ -84,6 +84,12 @@ public class ProductdismantleJobMainServiceImpl implements ProductdismantleJobMa public List getProductdismantleJobMainList(ProductdismantleJobMainExportReqVO exportReqVO) { return productdismantleJobMainMapper.selectList(exportReqVO); } + + + @Override + public PageResult getProductdismantleJobMainSenior(CustomConditions conditions) { + return productdismantleJobMainMapper.selectSenior(conditions); + } @Override public ProductdismantleJobMainDO productdismantleJobMainDoStatusRight(String pnumber, String pstatus) { QueryWrapper queryWrapper = new QueryWrapper(); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordDetailaService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordDetailaService.java index 47bfcf6a..8f2625b1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordDetailaService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordDetailaService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productdismantleRecord; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordDetailaCreateReqVO; import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordDetailaExportReqVO; import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordDetailaPageReqVO; import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordDetailaUpdateReqVO; import com.win.module.wms.dal.dataobject.productdismantleRecord.ProductdismantleRecordDetailaDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品拆解记录子 Service 接口 @@ -71,4 +73,13 @@ public interface ProductdismantleRecordDetailaService { */ List getProductdismantleRecordDetailaList(ProductdismantleRecordDetailaExportReqVO exportReqVO); + + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductdismantleRecordDetailaSenior(CustomConditions conditions); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordDetailaServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordDetailaServiceImpl.java index c5dca52f..8565aa54 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordDetailaServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordDetailaServiceImpl.java @@ -1,23 +1,23 @@ package com.win.module.wms.service.productdismantleRecord; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordDetailaCreateReqVO; import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordDetailaExportReqVO; import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordDetailaPageReqVO; import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordDetailaUpdateReqVO; +import com.win.module.wms.convert.productdismantleRecord.ProductdismantleRecordDetailaConvert; +import com.win.module.wms.dal.dataobject.productdismantleRecord.ProductdismantleRecordDetailaDO; +import com.win.module.wms.dal.mysql.productdismantleRecord.ProductdismantleRecordDetailaMapper; 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.productdismantleRecord.ProductdismantleRecordDetailaDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productdismantleRecord.ProductdismantleRecordDetailaConvert; -import com.win.module.wms.dal.mysql.productdismantleRecord.ProductdismantleRecordDetailaMapper; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTDISMANTLE_RECORD_DETAILA_NOT_EXISTS; /** * 制品拆解记录子 Service 实现类 @@ -82,5 +82,9 @@ public class ProductdismantleRecordDetailaServiceImpl implements Productdismantl public List getProductdismantleRecordDetailaList(ProductdismantleRecordDetailaExportReqVO exportReqVO) { return productdismantleRecordDetailaMapper.selectList(exportReqVO); } + @Override + public PageResult getProductdismantleRecordDetailaSenior(CustomConditions conditions) { + return productdismantleRecordDetailaMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordDetailbService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordDetailbService.java index 11d272e9..7952c296 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordDetailbService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordDetailbService.java @@ -81,5 +81,4 @@ public interface ProductdismantleRecordDetailbService { * @return 制品拆解记录子列表 */ List getDismantleRecordDetailbList(ProductdismantleRecordDetailbExportReqVO exportReqVO); - } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordDetailbServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordDetailbServiceImpl.java index ddd935a7..e794bad4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordDetailbServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordDetailbServiceImpl.java @@ -2,8 +2,12 @@ package com.win.module.wms.service.productdismantleRecord; import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; -import com.win.module.wms.controller.productdismantleRecord.vo.*; +import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordDetailbCreateReqVO; +import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordDetailbExportReqVO; +import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordDetailbPageReqVO; +import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleRecordDetailbUpdateReqVO; import com.win.module.wms.convert.productdismantleRecord.ProductdismantleRecordDetailbConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import com.win.module.wms.dal.dataobject.productdismantleRecord.ProductdismantleRecordDetailbDO; import com.win.module.wms.dal.mysql.productdismantleRecord.ProductdismantleRecordDetailbMapper; import org.springframework.stereotype.Service; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestDetailaService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestDetailaService.java index 1288c3b4..e5f458ba 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestDetailaService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestDetailaService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productdismantleRequest; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailaCreateReqVO; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailaExportReqVO; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailaPageReqVO; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailaUpdateReqVO; import com.win.module.wms.dal.dataobject.productdismantleRequest.ProductdismantleRequestDetailaDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品拆解申请子 Service 接口 @@ -71,4 +73,13 @@ public interface ProductdismantleRequestDetailaService { */ List getProductdismantleRequestDetailaList(ProductdismantleRequestDetailaExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductdismantleRequestDetailaSenior(CustomConditions conditions); + + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestDetailaServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestDetailaServiceImpl.java index 6dc4e0f6..2363304d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestDetailaServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestDetailaServiceImpl.java @@ -1,23 +1,23 @@ package com.win.module.wms.service.productdismantleRequest; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailaCreateReqVO; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailaExportReqVO; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailaPageReqVO; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailaUpdateReqVO; +import com.win.module.wms.convert.productdismantleRequest.ProductdismantleRequestDetailaConvert; +import com.win.module.wms.dal.dataobject.productdismantleRequest.ProductdismantleRequestDetailaDO; +import com.win.module.wms.dal.mysql.productdismantleRequest.ProductdismantleRequestDetailaMapper; 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.productdismantleRequest.ProductdismantleRequestDetailaDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productdismantleRequest.ProductdismantleRequestDetailaConvert; -import com.win.module.wms.dal.mysql.productdismantleRequest.ProductdismantleRequestDetailaMapper; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTDISMANTLE_REQUEST_DETAILA_NOT_EXISTS; /** * 制品拆解申请子 Service 实现类 @@ -83,4 +83,9 @@ public class ProductdismantleRequestDetailaServiceImpl implements Productdismant return productdismantleRequestDetailaMapper.selectList(exportReqVO); } + @Override + public PageResult getProductdismantleRequestDetailaSenior(CustomConditions conditions) { + return productdismantleRequestDetailaMapper.selectSenior(conditions); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestDetailbService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestDetailbService.java index fc8eae55..1610209f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestDetailbService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestDetailbService.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.productdismantleRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailbCreateReqVO; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailbExportReqVO; @@ -72,4 +73,11 @@ public interface ProductdismantleRequestDetailbService { */ List getDismantleRequestDetailbList(ProductdismantleRequestDetailbExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductdismantleRequestDetailbSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestDetailbServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestDetailbServiceImpl.java index d2d130e4..8811b440 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestDetailbServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestDetailbServiceImpl.java @@ -1,11 +1,13 @@ package com.win.module.wms.service.productdismantleRequest; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailbCreateReqVO; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailbExportReqVO; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailbPageReqVO; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestDetailbUpdateReqVO; import com.win.module.wms.convert.productdismantleRequest.ProductdismantleRequestDetailbConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import com.win.module.wms.dal.dataobject.productdismantleRequest.ProductdismantleRequestDetailbDO; import com.win.module.wms.dal.mysql.productdismantleRequest.ProductdismantleRequestDetailbMapper; import org.springframework.stereotype.Service; @@ -82,4 +84,9 @@ public class ProductdismantleRequestDetailbServiceImpl implements Productdismant return productdismantleRequestDetailbMapper.selectList(exportReqVO); } + @Override + public PageResult getProductdismantleRequestDetailbSenior(CustomConditions conditions) { + return productdismantleRequestDetailbMapper.selectSenior(conditions); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestMainService.java index 60ed3057..89158c52 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestMainService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productdismantleRequest; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestMainCreateReqVO; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestMainExportReqVO; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestMainPageReqVO; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestMainUpdateReqVO; import com.win.module.wms.dal.dataobject.productdismantleRequest.ProductdismantleRequestMainDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品拆解申请主 Service 接口 @@ -71,4 +73,12 @@ public interface ProductdismantleRequestMainService { */ List getProductdismantleRequestMainList(ProductdismantleRequestMainExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductdismantleRequestMainSenior(CustomConditions conditions); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestMainServiceImpl.java index 3f2b24c3..8bb61ff4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestMainServiceImpl.java @@ -1,23 +1,24 @@ package com.win.module.wms.service.productdismantleRequest; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestMainCreateReqVO; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestMainExportReqVO; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestMainPageReqVO; import com.win.module.wms.controller.productdismantleRequest.vo.ProductdismantleRequestMainUpdateReqVO; +import com.win.module.wms.convert.productdismantleRequest.ProductdismantleRequestMainConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.productdismantleRequest.ProductdismantleRequestMainDO; +import com.win.module.wms.dal.mysql.productdismantleRequest.ProductdismantleRequestMainMapper; 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.productdismantleRequest.ProductdismantleRequestMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productdismantleRequest.ProductdismantleRequestMainConvert; -import com.win.module.wms.dal.mysql.productdismantleRequest.ProductdismantleRequestMainMapper; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTDISMANTLE_REQUEST_MAIN_NOT_EXISTS; /** * 制品拆解申请主 Service 实现类 @@ -83,4 +84,8 @@ public class ProductdismantleRequestMainServiceImpl implements ProductdismantleR return productdismantleRequestMainMapper.selectList(exportReqVO); } + @Override + public PageResult getProductdismantleRequestMainSenior(CustomConditions conditions) { + return productdismantleRequestMainMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionDetailService.java index e78420a2..f73fb216 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionDetailService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.production; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.production.vo.ProductionDetailCreateReqVO; import com.win.module.wms.controller.production.vo.ProductionDetailExportReqVO; import com.win.module.wms.controller.production.vo.ProductionDetailPageReqVO; import com.win.module.wms.controller.production.vo.ProductionDetailUpdateReqVO; import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 生产计划子 Service 接口 @@ -71,4 +73,12 @@ public interface ProductionDetailService { */ List getProductionDetailList(ProductionDetailExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductionDetailSenior(CustomConditions conditions); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionDetailServiceImpl.java index 8ca92e3b..dd5a1efe 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionDetailServiceImpl.java @@ -1,23 +1,24 @@ package com.win.module.wms.service.production; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.production.vo.ProductionDetailCreateReqVO; import com.win.module.wms.controller.production.vo.ProductionDetailExportReqVO; import com.win.module.wms.controller.production.vo.ProductionDetailPageReqVO; import com.win.module.wms.controller.production.vo.ProductionDetailUpdateReqVO; +import com.win.module.wms.convert.production.ProductionDetailConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; +import com.win.module.wms.dal.mysql.production.ProductionDetailMapper; 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.production.ProductionDetailDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.production.ProductionDetailConvert; -import com.win.module.wms.dal.mysql.production.ProductionDetailMapper; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTION_DETAIL_NOT_EXISTS; /** * 生产计划子 Service 实现类 @@ -83,4 +84,8 @@ public class ProductionDetailServiceImpl implements ProductionDetailService { return productionDetailMapper.selectList(exportReqVO); } + @Override + public PageResult getProductionDetailSenior(CustomConditions conditions) { + return productionDetailMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainService.java index 8dc6ae8c..66466b16 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainService.java @@ -1,15 +1,17 @@ package com.win.module.wms.service.production; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.production.vo.ProductionMainCreateReqVO; import com.win.module.wms.controller.production.vo.ProductionMainExportReqVO; import com.win.module.wms.controller.production.vo.ProductionMainPageReqVO; import com.win.module.wms.controller.production.vo.ProductionMainUpdateReqVO; import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; import com.win.module.wms.dal.dataobject.production.ProductionMainDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 生产计划主 Service 接口 @@ -80,4 +82,11 @@ public interface ProductionMainService { */ ProductionDetailDO planProductionDetailDoExist(String pnumber, String pitemCode); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductionMainSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainServiceImpl.java index 4fec9ce4..c67c9ef4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainServiceImpl.java @@ -1,29 +1,25 @@ package com.win.module.wms.service.production; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.production.vo.ProductionMainCreateReqVO; import com.win.module.wms.controller.production.vo.ProductionMainExportReqVO; import com.win.module.wms.controller.production.vo.ProductionMainPageReqVO; import com.win.module.wms.controller.production.vo.ProductionMainUpdateReqVO; +import com.win.module.wms.convert.production.ProductionMainConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; -import com.win.module.wms.dal.dataobject.productreceiptJob.ProductreceiptJobDetailDO; -import com.win.module.wms.dal.dataobject.productreceiptJob.ProductreceiptJobMainDO; -import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO; -import com.win.module.wms.dal.dataobject.purchase.PurchaseMainDO; +import com.win.module.wms.dal.dataobject.production.ProductionMainDO; import com.win.module.wms.dal.mysql.production.ProductionDetailMapper; +import com.win.module.wms.dal.mysql.production.ProductionMainMapper; import com.win.module.wms.dal.mysql.productreceiptJob.ProductreceiptJobDetailMapper; 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.production.ProductionMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.production.ProductionMainConvert; -import com.win.module.wms.dal.mysql.production.ProductionMainMapper; -import org.springframework.web.bind.annotation.GetMapping; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.module.wms.enums.ErrorCodeConstants.*; @@ -121,4 +117,9 @@ public class ProductionMainServiceImpl implements ProductionMainService { throw exception(PRODUCTION_MAIN_NUMBER_NOT_EXISTS); } } + + @Override + public PageResult getProductionMainSenior(CustomConditions conditions) { + return productionMainMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionline/ProductionlineService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionline/ProductionlineService.java index 9034b9cf..b57566b6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionline/ProductionlineService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionline/ProductionlineService.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.productionline; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionline.vo.*; import com.win.module.wms.dal.dataobject.productionline.ProductionlineDO; @@ -88,4 +89,12 @@ public interface ProductionlineService { * @return */ public boolean ifProductionPlaninWorkshop(String pworkshopCode,String productionLineCode); + + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductionlineSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionline/ProductionlineServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionline/ProductionlineServiceImpl.java index 179cfb56..7d24fcb1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionline/ProductionlineServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionline/ProductionlineServiceImpl.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.productionline.vo.*; import com.win.module.wms.convert.productionline.ProductionlineConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import com.win.module.wms.dal.dataobject.owner.OwnerDO; import com.win.module.wms.dal.dataobject.productionline.ProductionlineDO; import com.win.module.wms.dal.mysql.productionline.ProductionlineMapper; @@ -188,4 +190,10 @@ public class ProductionlineServiceImpl implements ProductionlineService { throw exception(PRODUCTIONLINE_AND_WORKSHOP_RELATION_ERROR); } } + + @Override + public PageResult getProductionlineSenior(CustomConditions conditions) { + return productionlineMapper.selectSenior(conditions); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemService.java index 5bb383d5..a2a3dc3f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemService.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.productionlineitem; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionlineitem.vo.*; import com.win.module.wms.dal.dataobject.productionlineitem.ProductionlineitemDO; @@ -79,4 +80,13 @@ public interface ProductionlineitemService { * @return 生产线物料关系 */ public List productionLineCodeAndpItemCodeExist(String pproductionLineCode,String pitemCode); + + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductionlineitemSenior(CustomConditions conditions); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemServiceImpl.java index 12dfa06e..b81ee9ec 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil; 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.productionlineitem.vo.*; @@ -182,4 +183,10 @@ public class ProductionlineitemServiceImpl implements ProductionlineitemService } return productionlineitemDO; } + + @Override + public PageResult getProductionlineitemSenior(CustomConditions conditions) { + return productionlineitemMapper.selectSenior(conditions); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobDetailService.java index 6b5652a0..45e30ecd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobDetailService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productionreceiptJob; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobDetailCreateReqVO; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobDetailExportReqVO; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobDetailPageReqVO; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobDetailUpdateReqVO; import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobDetailDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 生产收料任务子 Service 接口 @@ -71,4 +73,11 @@ public interface ProductionreceiptJobDetailService { */ List getProductionreceiptJobDetailList(ProductionreceiptJobDetailExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductionreceiptJobDetailSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobDetailServiceImpl.java index 4211a0ce..46209c31 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobDetailServiceImpl.java @@ -1,23 +1,24 @@ package com.win.module.wms.service.productionreceiptJob; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobDetailCreateReqVO; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobDetailExportReqVO; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobDetailPageReqVO; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobDetailUpdateReqVO; +import com.win.module.wms.convert.productionreceiptJob.ProductionreceiptJobDetailConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobDetailDO; +import com.win.module.wms.dal.mysql.productionreceiptJob.ProductionreceiptJobDetailMapper; 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.productionreceiptJob.ProductionreceiptJobDetailDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productionreceiptJob.ProductionreceiptJobDetailConvert; -import com.win.module.wms.dal.mysql.productionreceiptJob.ProductionreceiptJobDetailMapper; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTIONRECEIPT_JOB_DETAIL_NOT_EXISTS; /** * 生产收料任务子 Service 实现类 @@ -83,4 +84,8 @@ public class ProductionreceiptJobDetailServiceImpl implements ProductionreceiptJ return productionreceiptJobDetailMapper.selectList(exportReqVO); } + @Override + public PageResult getProductionreceiptJobDetailSenior(CustomConditions conditions) { + return productionreceiptJobDetailMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainService.java index ddceb991..b5235f52 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productionreceiptJob; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobMainCreateReqVO; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobMainExportReqVO; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobMainPageReqVO; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobMainUpdateReqVO; import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobMainDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 生产收料任务主 Service 接口 @@ -78,4 +80,12 @@ public interface ProductionreceiptJobMainService { * @return 采购订单主列表 */ public ProductionreceiptJobMainDO productionreceiptJobMainDoStatusRight(String pnumber, String pstatus); + + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductionreceiptJobMainSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainServiceImpl.java index cab65d6a..f4c1964d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainServiceImpl.java @@ -1,24 +1,24 @@ package com.win.module.wms.service.productionreceiptJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobMainCreateReqVO; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobMainExportReqVO; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobMainPageReqVO; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobMainUpdateReqVO; -import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; +import com.win.module.wms.convert.productionreceiptJob.ProductionreceiptJobMainConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; +import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobMainDO; +import com.win.module.wms.dal.mysql.productionreceiptJob.ProductionreceiptJobMainMapper; import com.win.module.wms.service.production.ProductionMainService; 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.productionreceiptJob.ProductionreceiptJobMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productionreceiptJob.ProductionreceiptJobMainConvert; -import com.win.module.wms.dal.mysql.productionreceiptJob.ProductionreceiptJobMainMapper; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.module.wms.enums.ErrorCodeConstants.*; @@ -111,4 +111,9 @@ public class ProductionreceiptJobMainServiceImpl implements ProductionreceiptJob throw exception(PRODUCTION_DETAIL_VOID_STATUS_ERROR); } } + + @Override + public PageResult getProductionreceiptJobMainSenior(CustomConditions conditions) { + return productionreceiptJobMainMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptRecord/ProductionreceiptRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptRecord/ProductionreceiptRecordDetailService.java index 657c53ee..0ebbcdd3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptRecord/ProductionreceiptRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptRecord/ProductionreceiptRecordDetailService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productionreceiptRecord; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionreceiptRecord.vo.ProductionreceiptRecordDetailCreateReqVO; import com.win.module.wms.controller.productionreceiptRecord.vo.ProductionreceiptRecordDetailExportReqVO; import com.win.module.wms.controller.productionreceiptRecord.vo.ProductionreceiptRecordDetailPageReqVO; import com.win.module.wms.controller.productionreceiptRecord.vo.ProductionreceiptRecordDetailUpdateReqVO; import com.win.module.wms.dal.dataobject.productionreceiptRecord.ProductionreceiptRecordDetailDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 生产收料记录子 Service 接口 @@ -71,4 +73,11 @@ public interface ProductionreceiptRecordDetailService { */ List getProductionreceiptRecordDetailList(ProductionreceiptRecordDetailExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductionreceiptRecordDetailSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptRecord/ProductionreceiptRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptRecord/ProductionreceiptRecordDetailServiceImpl.java index 8a3942e1..ef5630e1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptRecord/ProductionreceiptRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptRecord/ProductionreceiptRecordDetailServiceImpl.java @@ -1,23 +1,23 @@ package com.win.module.wms.service.productionreceiptRecord; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionreceiptRecord.vo.ProductionreceiptRecordDetailCreateReqVO; import com.win.module.wms.controller.productionreceiptRecord.vo.ProductionreceiptRecordDetailExportReqVO; import com.win.module.wms.controller.productionreceiptRecord.vo.ProductionreceiptRecordDetailPageReqVO; import com.win.module.wms.controller.productionreceiptRecord.vo.ProductionreceiptRecordDetailUpdateReqVO; +import com.win.module.wms.convert.productionreceiptRecord.ProductionreceiptRecordDetailConvert; +import com.win.module.wms.dal.dataobject.productionreceiptRecord.ProductionreceiptRecordDetailDO; +import com.win.module.wms.dal.mysql.productionreceiptRecord.ProductionreceiptRecordDetailMapper; 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.productionreceiptRecord.ProductionreceiptRecordDetailDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productionreceiptRecord.ProductionreceiptRecordDetailConvert; -import com.win.module.wms.dal.mysql.productionreceiptRecord.ProductionreceiptRecordDetailMapper; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTIONRECEIPT_RECORD_DETAIL_NOT_EXISTS; /** * 生产收料记录子 Service 实现类 @@ -83,4 +83,8 @@ public class ProductionreceiptRecordDetailServiceImpl implements Productionrecei return productionreceiptRecordDetailMapper.selectList(exportReqVO); } + @Override + public PageResult getProductionreceiptRecordDetailSenior(CustomConditions conditions) { + return productionreceiptRecordDetailMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptRecord/ProductionreceiptRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptRecord/ProductionreceiptRecordMainService.java index e75859fc..0236c33d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptRecord/ProductionreceiptRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptRecord/ProductionreceiptRecordMainService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productionreceiptRecord; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionreceiptRecord.vo.ProductionreceiptRecordMainCreateReqVO; import com.win.module.wms.controller.productionreceiptRecord.vo.ProductionreceiptRecordMainExportReqVO; import com.win.module.wms.controller.productionreceiptRecord.vo.ProductionreceiptRecordMainPageReqVO; import com.win.module.wms.controller.productionreceiptRecord.vo.ProductionreceiptRecordMainUpdateReqVO; import com.win.module.wms.dal.dataobject.productionreceiptRecord.ProductionreceiptRecordMainDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 生产收料记录主 Service 接口 @@ -71,4 +73,12 @@ public interface ProductionreceiptRecordMainService { */ List getProductionreceiptRecordMainList(ProductionreceiptRecordMainExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductionreceiptRecordMainSenior(CustomConditions conditions); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptRecord/ProductionreceiptRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptRecord/ProductionreceiptRecordMainServiceImpl.java index 8a5bf8dc..89847339 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptRecord/ProductionreceiptRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptRecord/ProductionreceiptRecordMainServiceImpl.java @@ -1,23 +1,23 @@ package com.win.module.wms.service.productionreceiptRecord; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionreceiptRecord.vo.ProductionreceiptRecordMainCreateReqVO; import com.win.module.wms.controller.productionreceiptRecord.vo.ProductionreceiptRecordMainExportReqVO; import com.win.module.wms.controller.productionreceiptRecord.vo.ProductionreceiptRecordMainPageReqVO; import com.win.module.wms.controller.productionreceiptRecord.vo.ProductionreceiptRecordMainUpdateReqVO; +import com.win.module.wms.convert.productionreceiptRecord.ProductionreceiptRecordMainConvert; +import com.win.module.wms.dal.dataobject.productionreceiptRecord.ProductionreceiptRecordMainDO; +import com.win.module.wms.dal.mysql.productionreceiptRecord.ProductionreceiptRecordMainMapper; 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.productionreceiptRecord.ProductionreceiptRecordMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productionreceiptRecord.ProductionreceiptRecordMainConvert; -import com.win.module.wms.dal.mysql.productionreceiptRecord.ProductionreceiptRecordMainMapper; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTIONRECEIPT_RECORD_MAIN_NOT_EXISTS; /** * 生产收料记录主 Service 实现类 @@ -83,4 +83,8 @@ public class ProductionreceiptRecordMainServiceImpl implements Productionreceipt return productionreceiptRecordMainMapper.selectList(exportReqVO); } + @Override + public PageResult getProductionreceiptRecordMainSenior(CustomConditions conditions) { + return productionreceiptRecordMainMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobDetailService.java index fe066ff0..53fee4c0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobDetailService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productionreturnJob; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobDetailCreateReqVO; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobDetailExportReqVO; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobDetailPageReqVO; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobDetailUpdateReqVO; import com.win.module.wms.dal.dataobject.productionreturnJob.ProductionreturnJobDetailDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 生产退料任务子 Service 接口 @@ -71,4 +73,12 @@ public interface ProductionreturnJobDetailService { */ List getProductionreturnJobDetailList(ProductionreturnJobDetailExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductionreturnJobDetailSenior(CustomConditions conditions); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobDetailServiceImpl.java index 55e44df5..9a57161d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobDetailServiceImpl.java @@ -1,23 +1,24 @@ package com.win.module.wms.service.productionreturnJob; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobDetailCreateReqVO; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobDetailExportReqVO; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobDetailPageReqVO; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobDetailUpdateReqVO; +import com.win.module.wms.convert.productionreturnJob.ProductionreturnJobDetailConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.productionreturnJob.ProductionreturnJobDetailDO; +import com.win.module.wms.dal.mysql.productionreturnJob.ProductionreturnJobDetailMapper; 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.productionreturnJob.ProductionreturnJobDetailDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productionreturnJob.ProductionreturnJobDetailConvert; -import com.win.module.wms.dal.mysql.productionreturnJob.ProductionreturnJobDetailMapper; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTIONRETURN_JOB_DETAIL_NOT_EXISTS; /** * 生产退料任务子 Service 实现类 @@ -83,4 +84,8 @@ public class ProductionreturnJobDetailServiceImpl implements ProductionreturnJob return productionreturnJobDetailMapper.selectList(exportReqVO); } + @Override + public PageResult getProductionreturnJobDetailSenior(CustomConditions conditions) { + return productionreturnJobDetailMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainService.java index 05201e8d..b6c6239a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productionreturnJob; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobMainCreateReqVO; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobMainExportReqVO; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobMainPageReqVO; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobMainUpdateReqVO; import com.win.module.wms.dal.dataobject.productionreturnJob.ProductionreturnJobMainDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 生产退料任务主 Service 接口 @@ -78,4 +80,12 @@ public interface ProductionreturnJobMainService { * @return 采购订单主列表 */ public ProductionreturnJobMainDO productionreturnJobMainDoStatusRight(String pnumber, String pstatus); + + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductionreturnJobMainSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainServiceImpl.java index 6e10fbd1..71e462e6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainServiceImpl.java @@ -1,25 +1,26 @@ package com.win.module.wms.service.productionreturnJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobMainCreateReqVO; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobMainExportReqVO; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobMainPageReqVO; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobMainUpdateReqVO; -import com.win.module.wms.dal.dataobject.countJob.CountJobMainDO; +import com.win.module.wms.convert.productionreturnJob.ProductionreturnJobMainConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.productionreturnJob.ProductionreturnJobMainDO; +import com.win.module.wms.dal.mysql.productionreturnJob.ProductionreturnJobMainMapper; 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.productionreturnJob.ProductionreturnJobMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productionreturnJob.ProductionreturnJobMainConvert; -import com.win.module.wms.dal.mysql.productionreturnJob.ProductionreturnJobMainMapper; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTIONRETURN_JOB_MAIN_NOT_EXISTS; +import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTIONRETURN_JOB_MAIN_STATUS_ERROR; /** * 生产退料任务主 Service 实现类 @@ -97,4 +98,8 @@ public class ProductionreturnJobMainServiceImpl implements ProductionreturnJobMa } } + @Override + public PageResult getProductionreturnJobMainSenior(CustomConditions conditions) { + return productionreturnJobMainMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordDetailService.java index 732a6fea..def50b6d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordDetailService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productionreturnRecord; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordDetailCreateReqVO; import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordDetailExportReqVO; import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordDetailPageReqVO; import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordDetailUpdateReqVO; import com.win.module.wms.dal.dataobject.productionreturnRecord.ProductionreturnRecordDetailDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 生产退料记录子 Service 接口 @@ -71,4 +73,11 @@ public interface ProductionreturnRecordDetailService { */ List getProductionreturnRecordDetailList(ProductionreturnRecordDetailExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductionreturnRecordDetailSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordDetailServiceImpl.java index c56c8d30..e21a12a6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordDetailServiceImpl.java @@ -1,23 +1,24 @@ package com.win.module.wms.service.productionreturnRecord; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordDetailCreateReqVO; import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordDetailExportReqVO; import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordDetailPageReqVO; import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordDetailUpdateReqVO; +import com.win.module.wms.convert.productionreturnRecord.ProductionreturnRecordDetailConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.productionreturnRecord.ProductionreturnRecordDetailDO; +import com.win.module.wms.dal.mysql.productionreturnRecord.ProductionreturnRecordDetailMapper; 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.productionreturnRecord.ProductionreturnRecordDetailDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productionreturnRecord.ProductionreturnRecordDetailConvert; -import com.win.module.wms.dal.mysql.productionreturnRecord.ProductionreturnRecordDetailMapper; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTIONRETURN_RECORD_DETAIL_NOT_EXISTS; /** * 生产退料记录子 Service 实现类 @@ -78,9 +79,18 @@ public class ProductionreturnRecordDetailServiceImpl implements Productionreturn return productionreturnRecordDetailMapper.selectPage(pageReqVO); } + + + + + @Override public List getProductionreturnRecordDetailList(ProductionreturnRecordDetailExportReqVO exportReqVO) { return productionreturnRecordDetailMapper.selectList(exportReqVO); } + @Override + public PageResult getProductionreturnRecordDetailSenior(CustomConditions conditions) { + return productionreturnRecordDetailMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordMainService.java index 58f64840..be489f87 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordMainService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productionreturnRecord; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordMainCreateReqVO; import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordMainExportReqVO; import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordMainPageReqVO; import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordMainUpdateReqVO; import com.win.module.wms.dal.dataobject.productionreturnRecord.ProductionreturnRecordMainDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 生产退料记录主 Service 接口 @@ -71,4 +73,11 @@ public interface ProductionreturnRecordMainService { */ List getProductionreturnRecordMainList(ProductionreturnRecordMainExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductionreturnRecordMainSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordMainServiceImpl.java index 7639fdf3..5c404d67 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordMainServiceImpl.java @@ -1,23 +1,24 @@ package com.win.module.wms.service.productionreturnRecord; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordMainCreateReqVO; import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordMainExportReqVO; import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordMainPageReqVO; import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordMainUpdateReqVO; +import com.win.module.wms.convert.productionreturnRecord.ProductionreturnRecordMainConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.productionreturnRecord.ProductionreturnRecordMainDO; +import com.win.module.wms.dal.mysql.productionreturnRecord.ProductionreturnRecordMainMapper; 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.productionreturnRecord.ProductionreturnRecordMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productionreturnRecord.ProductionreturnRecordMainConvert; -import com.win.module.wms.dal.mysql.productionreturnRecord.ProductionreturnRecordMainMapper; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTIONRETURN_RECORD_MAIN_NOT_EXISTS; /** * 生产退料记录主 Service 实现类 @@ -83,4 +84,8 @@ public class ProductionreturnRecordMainServiceImpl implements ProductionreturnRe return productionreturnRecordMainMapper.selectList(exportReqVO); } + @Override + public PageResult getProductionreturnRecordMainSenior(CustomConditions conditions) { + return productionreturnRecordMainMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRequest/ProductionreturnRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRequest/ProductionreturnRequestDetailService.java index 2e8b16b9..2ec6f4e6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRequest/ProductionreturnRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRequest/ProductionreturnRequestDetailService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productionreturnRequest; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestDetailCreateReqVO; import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestDetailExportReqVO; import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestDetailPageReqVO; import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestDetailUpdateReqVO; import com.win.module.wms.dal.dataobject.productionreturnRequest.ProductionreturnRequestDetailDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 生产退料申请子 Service 接口 @@ -71,4 +73,11 @@ public interface ProductionreturnRequestDetailService { */ List getProductionreturnRequestDetailList(ProductionreturnRequestDetailExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductionreturnRequestDetailSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRequest/ProductionreturnRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRequest/ProductionreturnRequestDetailServiceImpl.java index 67e25f82..de560561 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRequest/ProductionreturnRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRequest/ProductionreturnRequestDetailServiceImpl.java @@ -1,23 +1,24 @@ package com.win.module.wms.service.productionreturnRequest; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestDetailCreateReqVO; import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestDetailExportReqVO; import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestDetailPageReqVO; import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestDetailUpdateReqVO; +import com.win.module.wms.convert.productionreturnRequest.ProductionreturnRequestDetailConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.productionreturnRequest.ProductionreturnRequestDetailDO; +import com.win.module.wms.dal.mysql.productionreturnRequest.ProductionreturnRequestDetailMapper; 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.productionreturnRequest.ProductionreturnRequestDetailDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productionreturnRequest.ProductionreturnRequestDetailConvert; -import com.win.module.wms.dal.mysql.productionreturnRequest.ProductionreturnRequestDetailMapper; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTIONRETURN_REQUEST_DETAIL_NOT_EXISTS; /** * 生产退料申请子 Service 实现类 @@ -83,4 +84,8 @@ public class ProductionreturnRequestDetailServiceImpl implements Productionretur return productionreturnRequestDetailMapper.selectList(exportReqVO); } + @Override + public PageResult getProductionreturnRequestDetailSenior(CustomConditions conditions) { + return productionreturnRequestDetailMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRequest/ProductionreturnRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRequest/ProductionreturnRequestMainService.java index 9d2acbf6..835ced58 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRequest/ProductionreturnRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRequest/ProductionreturnRequestMainService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productionreturnRequest; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestMainCreateReqVO; import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestMainExportReqVO; import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestMainPageReqVO; import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestMainUpdateReqVO; import com.win.module.wms.dal.dataobject.productionreturnRequest.ProductionreturnRequestMainDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 生产退料申请主 Service 接口 @@ -71,4 +73,11 @@ public interface ProductionreturnRequestMainService { */ List getProductionreturnRequestMainList(ProductionreturnRequestMainExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductionreturnRequestMainSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRequest/ProductionreturnRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRequest/ProductionreturnRequestMainServiceImpl.java index 179899ad..3cfbb134 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRequest/ProductionreturnRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRequest/ProductionreturnRequestMainServiceImpl.java @@ -1,23 +1,24 @@ package com.win.module.wms.service.productionreturnRequest; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestMainCreateReqVO; import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestMainExportReqVO; import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestMainPageReqVO; import com.win.module.wms.controller.productionreturnRequest.vo.ProductionreturnRequestMainUpdateReqVO; +import com.win.module.wms.convert.productionreturnRequest.ProductionreturnRequestMainConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.productionreturnRequest.ProductionreturnRequestMainDO; +import com.win.module.wms.dal.mysql.productionreturnRequest.ProductionreturnRequestMainMapper; 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.productionreturnRequest.ProductionreturnRequestMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productionreturnRequest.ProductionreturnRequestMainConvert; -import com.win.module.wms.dal.mysql.productionreturnRequest.ProductionreturnRequestMainMapper; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTIONRETURN_REQUEST_MAIN_NOT_EXISTS; /** * 生产退料申请主 Service 实现类 @@ -83,4 +84,8 @@ public class ProductionreturnRequestMainServiceImpl implements ProductionreturnR return productionreturnRequestMainMapper.selectList(exportReqVO); } + @Override + public PageResult getProductionreturnRequestMainSenior(CustomConditions conditions) { + return productionreturnRequestMainMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobDetailService.java index b7d46d01..96ff0acc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobDetailService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productputawayJob; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobDetailCreateReqVO; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobDetailExportReqVO; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobDetailPageReqVO; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobDetailUpdateReqVO; import com.win.module.wms.dal.dataobject.productputawayJob.ProductputawayJobDetailDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品上架任务子 Service 接口 @@ -71,4 +73,12 @@ public interface ProductputawayJobDetailService { */ List getProductputawayJobDetailList(ProductputawayJobDetailExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductputawayJobDetailSeniorList(CustomConditions conditions); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobDetailServiceImpl.java index 9bbb56e6..ab004501 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobDetailServiceImpl.java @@ -1,23 +1,23 @@ package com.win.module.wms.service.productputawayJob; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobDetailCreateReqVO; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobDetailExportReqVO; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobDetailPageReqVO; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobDetailUpdateReqVO; +import com.win.module.wms.convert.productputawayJob.ProductputawayJobDetailConvert; +import com.win.module.wms.dal.dataobject.productputawayJob.ProductputawayJobDetailDO; +import com.win.module.wms.dal.mysql.productputawayJob.ProductputawayJobDetailMapper; 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.productputawayJob.ProductputawayJobDetailDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productputawayJob.ProductputawayJobDetailConvert; -import com.win.module.wms.dal.mysql.productputawayJob.ProductputawayJobDetailMapper; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTPUTAWAY_JOB_DETAIL_NOT_EXISTS; /** * 制品上架任务子 Service 实现类 @@ -83,4 +83,8 @@ public class ProductputawayJobDetailServiceImpl implements ProductputawayJobDeta return productputawayJobDetailMapper.selectList(exportReqVO); } + @Override + public PageResult getProductputawayJobDetailSeniorList(CustomConditions conditions) { + return productputawayJobDetailMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainService.java index cac042f2..414ee511 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productputawayJob; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobMainCreateReqVO; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobMainExportReqVO; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobMainPageReqVO; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobMainUpdateReqVO; import com.win.module.wms.dal.dataobject.productputawayJob.ProductputawayJobMainDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品上架任务主 Service 接口 @@ -78,4 +80,12 @@ public interface ProductputawayJobMainService { * @return 采购订单主列表 */ public ProductputawayJobMainDO customerreturnJobMainDoStatusRight(String pnumber, String pstatus); + + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductputawayJobMainSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainServiceImpl.java index 745e32b1..822e7609 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainServiceImpl.java @@ -1,25 +1,25 @@ package com.win.module.wms.service.productputawayJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobMainCreateReqVO; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobMainExportReqVO; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobMainPageReqVO; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobMainUpdateReqVO; -import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; +import com.win.module.wms.convert.productputawayJob.ProductputawayJobMainConvert; +import com.win.module.wms.dal.dataobject.productputawayJob.ProductputawayJobMainDO; +import com.win.module.wms.dal.mysql.productputawayJob.ProductputawayJobMainMapper; 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.productputawayJob.ProductputawayJobMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productputawayJob.ProductputawayJobMainConvert; -import com.win.module.wms.dal.mysql.productputawayJob.ProductputawayJobMainMapper; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTPUTAWAY_JOB_MAIN_NOT_EXISTS; +import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTPUTAWAY_JOB_MAIN_STATUS_ERROR; /** * 制品上架任务主 Service 实现类 @@ -96,4 +96,9 @@ public class ProductputawayJobMainServiceImpl implements ProductputawayJobMainSe throw exception(PRODUCTPUTAWAY_JOB_MAIN_STATUS_ERROR); } } + + @Override + public PageResult getProductputawayJobMainSenior(CustomConditions conditions) { + return productputawayJobMainMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordDetailService.java index c03cb499..cbd85ce2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordDetailService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productputawayRecord; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordDetailCreateReqVO; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordDetailExportReqVO; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordDetailPageReqVO; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordDetailUpdateReqVO; import com.win.module.wms.dal.dataobject.productputawayRecord.ProductputawayRecordDetailDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品上架记录子 Service 接口 @@ -71,4 +73,11 @@ public interface ProductputawayRecordDetailService { */ List getProductputawayRecordDetailList(ProductputawayRecordDetailExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductputawayRecordDetailSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordDetailServiceImpl.java index 8a569851..c395ca2f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordDetailServiceImpl.java @@ -1,23 +1,24 @@ package com.win.module.wms.service.productputawayRecord; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordDetailCreateReqVO; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordDetailExportReqVO; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordDetailPageReqVO; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordDetailUpdateReqVO; +import com.win.module.wms.convert.productputawayRecord.ProductputawayRecordDetailConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.productputawayRecord.ProductputawayRecordDetailDO; +import com.win.module.wms.dal.mysql.productputawayRecord.ProductputawayRecordDetailMapper; 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.productputawayRecord.ProductputawayRecordDetailDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productputawayRecord.ProductputawayRecordDetailConvert; -import com.win.module.wms.dal.mysql.productputawayRecord.ProductputawayRecordDetailMapper; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTPUTAWAY_RECORD_DETAIL_NOT_EXISTS; /** * 制品上架记录子 Service 实现类 @@ -83,4 +84,8 @@ public class ProductputawayRecordDetailServiceImpl implements ProductputawayReco return productputawayRecordDetailMapper.selectList(exportReqVO); } + @Override + public PageResult getProductputawayRecordDetailSenior(CustomConditions conditions) { + return productputawayRecordDetailMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordMainService.java index fab036bb..b1bc0684 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordMainService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productputawayRecord; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordMainCreateReqVO; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordMainExportReqVO; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordMainPageReqVO; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordMainUpdateReqVO; import com.win.module.wms.dal.dataobject.productputawayRecord.ProductputawayRecordMainDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品上架记录主 Service 接口 @@ -71,4 +73,11 @@ public interface ProductputawayRecordMainService { */ List getProductputawayRecordMainList(ProductputawayRecordMainExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductputawayRecordMainSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordMainServiceImpl.java index 8bc86996..deb7996d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordMainServiceImpl.java @@ -1,23 +1,23 @@ package com.win.module.wms.service.productputawayRecord; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordMainCreateReqVO; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordMainExportReqVO; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordMainPageReqVO; import com.win.module.wms.controller.productputawayRecord.vo.ProductputawayRecordMainUpdateReqVO; +import com.win.module.wms.convert.productputawayRecord.ProductputawayRecordMainConvert; +import com.win.module.wms.dal.dataobject.productputawayRecord.ProductputawayRecordMainDO; +import com.win.module.wms.dal.mysql.productputawayRecord.ProductputawayRecordMainMapper; 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.productputawayRecord.ProductputawayRecordMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productputawayRecord.ProductputawayRecordMainConvert; -import com.win.module.wms.dal.mysql.productputawayRecord.ProductputawayRecordMainMapper; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTPUTAWAY_RECORD_MAIN_NOT_EXISTS; /** * 制品上架记录主 Service 实现类 @@ -83,4 +83,8 @@ public class ProductputawayRecordMainServiceImpl implements ProductputawayRecord return productputawayRecordMainMapper.selectList(exportReqVO); } + @Override + public PageResult getProductputawayRecordMainSenior(CustomConditions conditions) { + return productputawayRecordMainMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestDetailService.java index ff3c4a1c..bfd80d41 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestDetailService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productputawayRequest; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestDetailCreateReqVO; import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestDetailExportReqVO; import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestDetailPageReqVO; import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestDetailUpdateReqVO; import com.win.module.wms.dal.dataobject.productputawayRequest.ProductputawayRequestDetailDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品上架申请子 Service 接口 @@ -71,4 +73,11 @@ public interface ProductputawayRequestDetailService { */ List getProductputawayRequestDetailList(ProductputawayRequestDetailExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductputawayRequestDetailSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestDetailServiceImpl.java index 2329b12b..ae1677d8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestDetailServiceImpl.java @@ -1,23 +1,23 @@ package com.win.module.wms.service.productputawayRequest; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestDetailCreateReqVO; import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestDetailExportReqVO; import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestDetailPageReqVO; import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestDetailUpdateReqVO; +import com.win.module.wms.convert.productputawayRequest.ProductputawayRequestDetailConvert; +import com.win.module.wms.dal.dataobject.productputawayRequest.ProductputawayRequestDetailDO; +import com.win.module.wms.dal.mysql.productputawayRequest.ProductputawayRequestDetailMapper; 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.productputawayRequest.ProductputawayRequestDetailDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productputawayRequest.ProductputawayRequestDetailConvert; -import com.win.module.wms.dal.mysql.productputawayRequest.ProductputawayRequestDetailMapper; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTPUTAWAY_REQUEST_DETAIL_NOT_EXISTS; /** * 制品上架申请子 Service 实现类 @@ -83,4 +83,9 @@ public class ProductputawayRequestDetailServiceImpl implements ProductputawayReq return productputawayRequestDetailMapper.selectList(exportReqVO); } + @Override + public PageResult getProductputawayRequestDetailSenior(CustomConditions conditions) { + return productputawayRequestDetailMapper.selectSenior(conditions); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestMainService.java index 50cfc037..ea546a91 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestMainService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productputawayRequest; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestMainCreateReqVO; import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestMainExportReqVO; import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestMainPageReqVO; import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestMainUpdateReqVO; import com.win.module.wms.dal.dataobject.productputawayRequest.ProductputawayRequestMainDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品上架申请主 Service 接口 @@ -71,4 +73,12 @@ public interface ProductputawayRequestMainService { */ List getProductputawayRequestMainList(ProductputawayRequestMainExportReqVO exportReqVO); + + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductputawayRequestMainSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestMainServiceImpl.java index 738350e0..1d0dbc00 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestMainServiceImpl.java @@ -1,23 +1,24 @@ package com.win.module.wms.service.productputawayRequest; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestMainCreateReqVO; import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestMainExportReqVO; import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestMainPageReqVO; import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestMainUpdateReqVO; +import com.win.module.wms.convert.productputawayRequest.ProductputawayRequestMainConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.productputawayRequest.ProductputawayRequestMainDO; +import com.win.module.wms.dal.mysql.productputawayRequest.ProductputawayRequestMainMapper; 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.productputawayRequest.ProductputawayRequestMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productputawayRequest.ProductputawayRequestMainConvert; -import com.win.module.wms.dal.mysql.productputawayRequest.ProductputawayRequestMainMapper; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTPUTAWAY_REQUEST_MAIN_NOT_EXISTS; /** * 制品上架申请主 Service 实现类 @@ -83,4 +84,8 @@ public class ProductputawayRequestMainServiceImpl implements ProductputawayReque return productputawayRequestMainMapper.selectList(exportReqVO); } + @Override + public PageResult getProductputawayRequestMainSenior(CustomConditions conditions) { + return productputawayRequestMainMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobDetailService.java index 25941c33..8fc831ba 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobDetailService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productreceiptJob; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobDetailCreateReqVO; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobDetailExportReqVO; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobDetailPageReqVO; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobDetailUpdateReqVO; import com.win.module.wms.dal.dataobject.productreceiptJob.ProductreceiptJobDetailDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品收货任务子 Service 接口 @@ -71,4 +73,11 @@ public interface ProductreceiptJobDetailService { */ List getProductreceiptJobDetailList(ProductreceiptJobDetailExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductreceiptJobDetailSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobDetailServiceImpl.java index 57db15ff..97427291 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobDetailServiceImpl.java @@ -1,23 +1,24 @@ package com.win.module.wms.service.productreceiptJob; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobDetailCreateReqVO; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobDetailExportReqVO; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobDetailPageReqVO; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobDetailUpdateReqVO; +import com.win.module.wms.convert.productreceiptJob.ProductreceiptJobDetailConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.productreceiptJob.ProductreceiptJobDetailDO; +import com.win.module.wms.dal.mysql.productreceiptJob.ProductreceiptJobDetailMapper; 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.productreceiptJob.ProductreceiptJobDetailDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productreceiptJob.ProductreceiptJobDetailConvert; -import com.win.module.wms.dal.mysql.productreceiptJob.ProductreceiptJobDetailMapper; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTRECEIPT_JOB_DETAIL_NOT_EXISTS; /** * 制品收货任务子 Service 实现类 @@ -83,4 +84,8 @@ public class ProductreceiptJobDetailServiceImpl implements ProductreceiptJobDeta return productreceiptJobDetailMapper.selectList(exportReqVO); } + @Override + public PageResult getProductreceiptJobDetailSenior(CustomConditions conditions) { + return productreceiptJobDetailMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainService.java index ffef8961..6aae1461 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainService.java @@ -1,15 +1,17 @@ package com.win.module.wms.service.productreceiptJob; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobMainCreateReqVO; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobMainExportReqVO; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobMainPageReqVO; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobMainUpdateReqVO; import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; import com.win.module.wms.dal.dataobject.productreceiptJob.ProductreceiptJobMainDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品收货任务主 Service 接口 @@ -87,4 +89,12 @@ public interface ProductreceiptJobMainService { * @return 采购订单主列表 */ public ProductreceiptJobMainDO productreceiptJobMainDoStatusRight(String pnumber, String pstatus); + + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductreceiptJobMainSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainServiceImpl.java index 480aea44..d9931a06 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainServiceImpl.java @@ -1,27 +1,27 @@ package com.win.module.wms.service.productreceiptJob; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobMainCreateReqVO; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobMainExportReqVO; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobMainPageReqVO; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobMainUpdateReqVO; -import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; +import com.win.module.wms.convert.productreceiptJob.ProductreceiptJobMainConvert; import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; +import com.win.module.wms.dal.dataobject.productreceiptJob.ProductreceiptJobMainDO; +import com.win.module.wms.dal.mysql.productreceiptJob.ProductreceiptJobMainMapper; import com.win.module.wms.service.production.ProductionMainService; 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.productreceiptJob.ProductreceiptJobMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productreceiptJob.ProductreceiptJobMainConvert; -import com.win.module.wms.dal.mysql.productreceiptJob.ProductreceiptJobMainMapper; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTRECEIPT_JOB_MAIN_NOT_EXISTS; +import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTRECEIPT_JOB_MAIN_STATUS_ERROR; /** * 制品收货任务主 Service 实现类 @@ -107,4 +107,9 @@ public class ProductreceiptJobMainServiceImpl implements ProductreceiptJobMainSe throw exception(PRODUCTRECEIPT_JOB_MAIN_STATUS_ERROR); } } + + @Override + public PageResult getProductreceiptJobMainSenior(CustomConditions conditions) { + return productreceiptJobMainMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/BackflushRecordDetailbService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/BackflushRecordDetailbService.java index 43ea6461..c2a63069 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/BackflushRecordDetailbService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/BackflushRecordDetailbService.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.productreceiptRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productreceiptRecord.vo.BackflushRecordDetailbCreateReqVO; import com.win.module.wms.controller.productreceiptRecord.vo.BackflushRecordDetailbExportReqVO; @@ -72,4 +73,11 @@ public interface BackflushRecordDetailbService { */ List getBackflushRecordDetailbList(BackflushRecordDetailbExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getBackflushRecordDetailbSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/BackflushRecordDetailbServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/BackflushRecordDetailbServiceImpl.java index fdb1236e..decff0eb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/BackflushRecordDetailbServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/BackflushRecordDetailbServiceImpl.java @@ -1,11 +1,13 @@ package com.win.module.wms.service.productreceiptRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productreceiptRecord.vo.BackflushRecordDetailbCreateReqVO; import com.win.module.wms.controller.productreceiptRecord.vo.BackflushRecordDetailbExportReqVO; import com.win.module.wms.controller.productreceiptRecord.vo.BackflushRecordDetailbPageReqVO; import com.win.module.wms.controller.productreceiptRecord.vo.BackflushRecordDetailbUpdateReqVO; import com.win.module.wms.convert.productreceiptRecord.BackflushRecordDetailbConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import com.win.module.wms.dal.dataobject.productreceiptRecord.BackflushRecordDetailbDO; import com.win.module.wms.dal.mysql.productreceiptRecord.BackflushRecordDetailbMapper; import org.springframework.stereotype.Service; @@ -82,4 +84,8 @@ public class BackflushRecordDetailbServiceImpl implements BackflushRecordDetailb return productreceiptRecordDetailbMapper.selectList(exportReqVO); } + @Override + public PageResult getBackflushRecordDetailbSenior(CustomConditions conditions) { + return productreceiptRecordDetailbMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/ProductreceiptRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/ProductreceiptRecordDetailService.java index adfd0372..adac95a0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/ProductreceiptRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/ProductreceiptRecordDetailService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productreceiptRecord; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productreceiptRecord.vo.ProductreceiptRecordDetailCreateReqVO; import com.win.module.wms.controller.productreceiptRecord.vo.ProductreceiptRecordDetailExportReqVO; import com.win.module.wms.controller.productreceiptRecord.vo.ProductreceiptRecordDetailPageReqVO; import com.win.module.wms.controller.productreceiptRecord.vo.ProductreceiptRecordDetailUpdateReqVO; import com.win.module.wms.dal.dataobject.productreceiptRecord.ProductreceiptRecordDetailDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品收货记录子 Service 接口 @@ -71,4 +73,11 @@ public interface ProductreceiptRecordDetailService { */ List getProductreceiptRecordDetailList(ProductreceiptRecordDetailExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductreceiptRecordDetailSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/ProductreceiptRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/ProductreceiptRecordDetailServiceImpl.java index 40e8c0bc..b27f2856 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/ProductreceiptRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/ProductreceiptRecordDetailServiceImpl.java @@ -1,23 +1,24 @@ package com.win.module.wms.service.productreceiptRecord; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productreceiptRecord.vo.ProductreceiptRecordDetailCreateReqVO; import com.win.module.wms.controller.productreceiptRecord.vo.ProductreceiptRecordDetailExportReqVO; import com.win.module.wms.controller.productreceiptRecord.vo.ProductreceiptRecordDetailPageReqVO; import com.win.module.wms.controller.productreceiptRecord.vo.ProductreceiptRecordDetailUpdateReqVO; +import com.win.module.wms.convert.productreceiptRecord.ProductreceiptRecordDetailConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.productreceiptRecord.ProductreceiptRecordDetailDO; +import com.win.module.wms.dal.mysql.productreceiptRecord.ProductreceiptRecordDetailMapper; 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.productreceiptRecord.ProductreceiptRecordDetailDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productreceiptRecord.ProductreceiptRecordDetailConvert; -import com.win.module.wms.dal.mysql.productreceiptRecord.ProductreceiptRecordDetailMapper; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTRECEIPT_RECORD_DETAIL_NOT_EXISTS; /** * 制品收货记录子 Service 实现类 @@ -83,4 +84,8 @@ public class ProductreceiptRecordDetailServiceImpl implements ProductreceiptReco return productreceiptRecordDetailMapper.selectList(exportReqVO); } + @Override + public PageResult getProductreceiptRecordDetailSenior(CustomConditions conditions) { + return productreceiptRecordDetailMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/ProductreceiptRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/ProductreceiptRecordMainService.java index 3d2106bf..792f8c40 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/ProductreceiptRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/ProductreceiptRecordMainService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productreceiptRecord; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productreceiptRecord.vo.ProductreceiptRecordMainCreateReqVO; import com.win.module.wms.controller.productreceiptRecord.vo.ProductreceiptRecordMainExportReqVO; import com.win.module.wms.controller.productreceiptRecord.vo.ProductreceiptRecordMainPageReqVO; import com.win.module.wms.controller.productreceiptRecord.vo.ProductreceiptRecordMainUpdateReqVO; import com.win.module.wms.dal.dataobject.productreceiptRecord.ProductreceiptRecordMainDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品收货记录主 Service 接口 @@ -71,4 +73,11 @@ public interface ProductreceiptRecordMainService { */ List getProductreceiptRecordMainList(ProductreceiptRecordMainExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductreceiptRecordMainSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/ProductreceiptRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/ProductreceiptRecordMainServiceImpl.java index 7f92c3fb..ca9bbdd2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/ProductreceiptRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/ProductreceiptRecordMainServiceImpl.java @@ -1,23 +1,24 @@ package com.win.module.wms.service.productreceiptRecord; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productreceiptRecord.vo.ProductreceiptRecordMainCreateReqVO; import com.win.module.wms.controller.productreceiptRecord.vo.ProductreceiptRecordMainExportReqVO; import com.win.module.wms.controller.productreceiptRecord.vo.ProductreceiptRecordMainPageReqVO; import com.win.module.wms.controller.productreceiptRecord.vo.ProductreceiptRecordMainUpdateReqVO; +import com.win.module.wms.convert.productreceiptRecord.ProductreceiptRecordMainConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.productreceiptRecord.ProductreceiptRecordMainDO; +import com.win.module.wms.dal.mysql.productreceiptRecord.ProductreceiptRecordMainMapper; 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.productreceiptRecord.ProductreceiptRecordMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productreceiptRecord.ProductreceiptRecordMainConvert; -import com.win.module.wms.dal.mysql.productreceiptRecord.ProductreceiptRecordMainMapper; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTRECEIPT_RECORD_MAIN_NOT_EXISTS; /** * 制品收货记录主 Service 实现类 @@ -83,4 +84,8 @@ public class ProductreceiptRecordMainServiceImpl implements ProductreceiptRecord return productreceiptRecordMainMapper.selectList(exportReqVO); } + @Override + public PageResult getProductreceiptRecordMainSenior(CustomConditions conditions) { + return productreceiptRecordMainMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestDetailService.java index a5176511..6db50a94 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestDetailService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productreceiptRequest; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestDetailCreateReqVO; import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestDetailExportReqVO; import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestDetailPageReqVO; import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestDetailUpdateReqVO; import com.win.module.wms.dal.dataobject.productreceiptRequest.ProductreceiptRequestDetailDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品收货申请子 Service 接口 @@ -71,4 +73,11 @@ public interface ProductreceiptRequestDetailService { */ List getProductreceiptRequestDetailList(ProductreceiptRequestDetailExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductreceiptRequestDetailSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestDetailServiceImpl.java index 3519ee6e..7f63fa00 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestDetailServiceImpl.java @@ -1,23 +1,23 @@ package com.win.module.wms.service.productreceiptRequest; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestDetailCreateReqVO; import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestDetailExportReqVO; import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestDetailPageReqVO; import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestDetailUpdateReqVO; +import com.win.module.wms.convert.productreceiptRequest.ProductreceiptRequestDetailConvert; +import com.win.module.wms.dal.dataobject.productreceiptRequest.ProductreceiptRequestDetailDO; +import com.win.module.wms.dal.mysql.productreceiptRequest.ProductreceiptRequestDetailMapper; 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.productreceiptRequest.ProductreceiptRequestDetailDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productreceiptRequest.ProductreceiptRequestDetailConvert; -import com.win.module.wms.dal.mysql.productreceiptRequest.ProductreceiptRequestDetailMapper; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTRECEIPT_REQUEST_DETAIL_NOT_EXISTS; /** * 制品收货申请子 Service 实现类 @@ -83,4 +83,8 @@ public class ProductreceiptRequestDetailServiceImpl implements ProductreceiptReq return productreceiptRequestDetailMapper.selectList(exportReqVO); } + @Override + public PageResult getProductreceiptRequestDetailSenior(CustomConditions conditions) { + return productreceiptRequestDetailMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestMainService.java index dcca9294..7de1dab9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestMainService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productreceiptRequest; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestMainCreateReqVO; import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestMainExportReqVO; import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestMainPageReqVO; import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestMainUpdateReqVO; import com.win.module.wms.dal.dataobject.productreceiptRequest.ProductreceiptRequestMainDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品收货申请主 Service 接口 @@ -71,4 +73,12 @@ public interface ProductreceiptRequestMainService { */ List getProductreceiptRequestMainList(ProductreceiptRequestMainExportReqVO exportReqVO); + + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductreceiptRequestMainSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestMainServiceImpl.java index 276bfb44..969faab1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestMainServiceImpl.java @@ -1,23 +1,24 @@ package com.win.module.wms.service.productreceiptRequest; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestMainCreateReqVO; import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestMainExportReqVO; import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestMainPageReqVO; import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestMainUpdateReqVO; +import com.win.module.wms.convert.productreceiptRequest.ProductreceiptRequestMainConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.productreceiptRequest.ProductreceiptRequestMainDO; +import com.win.module.wms.dal.mysql.productreceiptRequest.ProductreceiptRequestMainMapper; 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.productreceiptRequest.ProductreceiptRequestMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productreceiptRequest.ProductreceiptRequestMainConvert; -import com.win.module.wms.dal.mysql.productreceiptRequest.ProductreceiptRequestMainMapper; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTRECEIPT_REQUEST_MAIN_NOT_EXISTS; /** * 制品收货申请主 Service 实现类 @@ -83,4 +84,8 @@ public class ProductreceiptRequestMainServiceImpl implements ProductreceiptReque return productreceiptRequestMainMapper.selectList(exportReqVO); } + @Override + public PageResult getProductreceiptRequestMainSenior(CustomConditions conditions) { + return productreceiptRequestMainMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ConsumeRecordDetailbService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ConsumeRecordDetailbService.java index 3427cd8a..b0c54b7e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ConsumeRecordDetailbService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ConsumeRecordDetailbService.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.productrepairRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailbCreateReqVO; import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailbExportReqVO; @@ -72,4 +73,11 @@ public interface ConsumeRecordDetailbService { */ List getConsumeRecordDetailbList(ConsumeRecordDetailbExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getConsumeRecordDetailbSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ConsumeRecordDetailbServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ConsumeRecordDetailbServiceImpl.java index 92b5977e..d3d8cc2d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ConsumeRecordDetailbServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ConsumeRecordDetailbServiceImpl.java @@ -1,11 +1,13 @@ package com.win.module.wms.service.productrepairRecord; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailbCreateReqVO; import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailbExportReqVO; import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailbPageReqVO; import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailbUpdateReqVO; import com.win.module.wms.convert.productrepairRecord.ConsumeRecordDetailbConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import com.win.module.wms.dal.dataobject.productrepairRecord.ConsumeRecordDetailbDO; import com.win.module.wms.dal.mysql.productrepairRecord.ConsumeRecordDetailbMapper; import org.springframework.stereotype.Service; @@ -82,4 +84,8 @@ public class ConsumeRecordDetailbServiceImpl implements ConsumeRecordDetailbServ return consumeRecordDetailbMapper.selectList(exportReqVO); } + @Override + public PageResult getConsumeRecordDetailbSenior(CustomConditions conditions) { + return consumeRecordDetailbMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ProductrepairRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ProductrepairRecordDetailService.java index 83bfc5bf..7898d421 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ProductrepairRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ProductrepairRecordDetailService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productrepairRecord; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productrepairRecord.vo.ProductrepairRecordDetailCreateReqVO; import com.win.module.wms.controller.productrepairRecord.vo.ProductrepairRecordDetailExportReqVO; import com.win.module.wms.controller.productrepairRecord.vo.ProductrepairRecordDetailPageReqVO; import com.win.module.wms.controller.productrepairRecord.vo.ProductrepairRecordDetailUpdateReqVO; import com.win.module.wms.dal.dataobject.productrepairRecord.ProductrepairRecordDetailDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品返修记录子 Service 接口 @@ -71,4 +73,11 @@ public interface ProductrepairRecordDetailService { */ List getProductrepairRecordDetailList(ProductrepairRecordDetailExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductrepairRecordDetailSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ProductrepairRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ProductrepairRecordDetailServiceImpl.java index 085be130..6304802e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ProductrepairRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ProductrepairRecordDetailServiceImpl.java @@ -1,23 +1,24 @@ package com.win.module.wms.service.productrepairRecord; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productrepairRecord.vo.ProductrepairRecordDetailCreateReqVO; import com.win.module.wms.controller.productrepairRecord.vo.ProductrepairRecordDetailExportReqVO; import com.win.module.wms.controller.productrepairRecord.vo.ProductrepairRecordDetailPageReqVO; import com.win.module.wms.controller.productrepairRecord.vo.ProductrepairRecordDetailUpdateReqVO; +import com.win.module.wms.convert.productrepairRecord.ProductrepairRecordDetailConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.productrepairRecord.ProductrepairRecordDetailDO; +import com.win.module.wms.dal.mysql.productrepairRecord.ProductrepairRecordDetailMapper; 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.productrepairRecord.ProductrepairRecordDetailDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productrepairRecord.ProductrepairRecordDetailConvert; -import com.win.module.wms.dal.mysql.productrepairRecord.ProductrepairRecordDetailMapper; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTREPAIR_RECORD_DETAIL_NOT_EXISTS; /** * 制品返修记录子 Service 实现类 @@ -83,4 +84,8 @@ public class ProductrepairRecordDetailServiceImpl implements ProductrepairRecord return productrepairRecordDetailMapper.selectList(exportReqVO); } + @Override + public PageResult getProductrepairRecordDetailSenior(CustomConditions conditions) { + return productrepairRecordDetailMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ProductrepairRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ProductrepairRecordMainService.java index a2481992..975c8304 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ProductrepairRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ProductrepairRecordMainService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productrepairRecord; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productrepairRecord.vo.ProductrepairRecordMainCreateReqVO; import com.win.module.wms.controller.productrepairRecord.vo.ProductrepairRecordMainExportReqVO; import com.win.module.wms.controller.productrepairRecord.vo.ProductrepairRecordMainPageReqVO; import com.win.module.wms.controller.productrepairRecord.vo.ProductrepairRecordMainUpdateReqVO; import com.win.module.wms.dal.dataobject.productrepairRecord.ProductrepairRecordMainDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品返修记录主 Service 接口 @@ -71,4 +73,11 @@ public interface ProductrepairRecordMainService { */ List getProductrepairRecordMainList(ProductrepairRecordMainExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductrepairRecordMainSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ProductrepairRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ProductrepairRecordMainServiceImpl.java index 172772aa..b658a61b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ProductrepairRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRecord/ProductrepairRecordMainServiceImpl.java @@ -1,23 +1,23 @@ package com.win.module.wms.service.productrepairRecord; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productrepairRecord.vo.ProductrepairRecordMainCreateReqVO; import com.win.module.wms.controller.productrepairRecord.vo.ProductrepairRecordMainExportReqVO; import com.win.module.wms.controller.productrepairRecord.vo.ProductrepairRecordMainPageReqVO; import com.win.module.wms.controller.productrepairRecord.vo.ProductrepairRecordMainUpdateReqVO; +import com.win.module.wms.convert.productrepairRecord.ProductrepairRecordMainConvert; +import com.win.module.wms.dal.dataobject.productrepairRecord.ProductrepairRecordMainDO; +import com.win.module.wms.dal.mysql.productrepairRecord.ProductrepairRecordMainMapper; 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.productrepairRecord.ProductrepairRecordMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productrepairRecord.ProductrepairRecordMainConvert; -import com.win.module.wms.dal.mysql.productrepairRecord.ProductrepairRecordMainMapper; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTREPAIR_RECORD_MAIN_NOT_EXISTS; /** * 制品返修记录主 Service 实现类 @@ -83,4 +83,8 @@ public class ProductrepairRecordMainServiceImpl implements ProductrepairRecordMa return productrepairRecordMainMapper.selectList(exportReqVO); } + @Override + public PageResult getProductrepairRecordMainSenior(CustomConditions conditions) { + return productrepairRecordMainMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailaService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailaService.java index 85ba2a7f..af5e46a2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailaService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailaService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productrepairRequest; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestDetailaCreateReqVO; import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestDetailaExportReqVO; import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestDetailaPageReqVO; import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestDetailaUpdateReqVO; import com.win.module.wms.dal.dataobject.productrepairRequest.ProductrepairRequestDetailaDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品返修申请子 Service 接口 @@ -71,4 +73,11 @@ public interface ProductrepairRequestDetailaService { */ List getProductrepairRequestDetailaList(ProductrepairRequestDetailaExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductrepairRequestDetailaSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailaServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailaServiceImpl.java index b78b5bdf..4ea5c7e0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailaServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailaServiceImpl.java @@ -1,23 +1,24 @@ package com.win.module.wms.service.productrepairRequest; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestDetailaCreateReqVO; import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestDetailaExportReqVO; import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestDetailaPageReqVO; import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestDetailaUpdateReqVO; +import com.win.module.wms.convert.productrepairRequest.ProductrepairRequestDetailaConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.productrepairRequest.ProductrepairRequestDetailaDO; +import com.win.module.wms.dal.mysql.productrepairRequest.ProductrepairRequestDetailaMapper; 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.productrepairRequest.ProductrepairRequestDetailaDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productrepairRequest.ProductrepairRequestDetailaConvert; -import com.win.module.wms.dal.mysql.productrepairRequest.ProductrepairRequestDetailaMapper; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTREPAIR_REQUEST_DETAILA_NOT_EXISTS; /** * 制品返修申请子 Service 实现类 @@ -83,4 +84,8 @@ public class ProductrepairRequestDetailaServiceImpl implements ProductrepairRequ return productrepairRequestDetailaMapper.selectList(exportReqVO); } + @Override + public PageResult getProductrepairRequestDetailaSenior(CustomConditions conditions) { + return productrepairRequestDetailaMapper.selectSenior(conditions); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailbService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailbService.java index 4881aac6..a02029f6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailbService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailbService.java @@ -81,4 +81,11 @@ public interface ProductrepairRequestDetailbService { */ List getConsumereRequestDetailbList(ProductrepairRequestDetailbExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductrepairRequestDetailbSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailbServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailbServiceImpl.java index c5f25b0c..5c4d0443 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailbServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailbServiceImpl.java @@ -86,4 +86,9 @@ public class ProductrepairRequestDetailbServiceImpl implements ProductrepairRequ return productrepairRequestDetailbMapper.selectList(exportReqVO); } + @Override + public PageResult getProductrepairRequestDetailbSenior(CustomConditions conditions) { + return productrepairRequestDetailbMapper.selectSenior(conditions); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestMainService.java index 2ae4565e..0e3e841d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestMainService.java @@ -1,14 +1,16 @@ package com.win.module.wms.service.productrepairRequest; -import java.util.*; -import javax.validation.*; - +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestMainCreateReqVO; import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestMainExportReqVO; import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestMainPageReqVO; import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestMainUpdateReqVO; import com.win.module.wms.dal.dataobject.productrepairRequest.ProductrepairRequestMainDO; -import com.win.framework.common.pojo.PageResult; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品返修申请主 Service 接口 @@ -71,4 +73,11 @@ public interface ProductrepairRequestMainService { */ List getProductrepairRequestMainList(ProductrepairRequestMainExportReqVO exportReqVO); + /** + * 获得用高级搜索户分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getProductrepairRequestMainSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestMainServiceImpl.java index d914eb16..32c20270 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestMainServiceImpl.java @@ -1,23 +1,24 @@ package com.win.module.wms.service.productrepairRequest; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestMainCreateReqVO; import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestMainExportReqVO; import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestMainPageReqVO; import com.win.module.wms.controller.productrepairRequest.vo.ProductrepairRequestMainUpdateReqVO; +import com.win.module.wms.convert.productrepairRequest.ProductrepairRequestMainConvert; +import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; +import com.win.module.wms.dal.dataobject.productrepairRequest.ProductrepairRequestMainDO; +import com.win.module.wms.dal.mysql.productrepairRequest.ProductrepairRequestMainMapper; 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.productrepairRequest.ProductrepairRequestMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.productrepairRequest.ProductrepairRequestMainConvert; -import com.win.module.wms.dal.mysql.productrepairRequest.ProductrepairRequestMainMapper; +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTREPAIR_REQUEST_MAIN_NOT_EXISTS; /** * 制品返修申请主 Service 实现类 @@ -83,4 +84,8 @@ public class ProductrepairRequestMainServiceImpl implements ProductrepairRequest return productrepairRequestMainMapper.selectList(exportReqVO); } + @Override + public PageResult getProductrepairRequestMainSenior(CustomConditions conditions) { + return productrepairRequestMainMapper.selectSenior(conditions); + } }