From 8c4449cb4eedd37e36b287783262693c4309b9df Mon Sep 17 00:00:00 2001 From: chenfang Date: Fri, 27 Oct 2023 15:51:08 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=BC=96=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../container/ContainerMainController.java | 1 - .../ConsumeRecordDetailbController.java | 2 +- .../ConsumereRequestDetailbController.java | 59 ++++++---- .../vo/ConsumereRequestDetailbBaseVO.java | 11 +- .../ConsumereRequestDetailbCreateReqVO.java | 6 +- .../vo/ConsumereRequestDetailbExcelVO.java | 11 +- .../ConsumereRequestDetailbExportReqVO.java | 9 +- .../vo/ConsumereRequestDetailbPageReqVO.java | 10 +- .../vo/ConsumereRequestDetailbRespVO.java | 6 +- .../ConsumereRequestDetailbUpdateReqVO.java | 6 +- .../ConsumeRecordDetailbConvert.java | 2 +- .../ConsumereRequestDetailbConvert.java | 17 ++- .../consumeRecord/ConsumeRecordDetailbDO.java | 107 ------------------ .../ConsumereRequestDetailbDO.java | 12 +- .../ConsumeRecordDetailbMapper.java | 2 +- .../ConsumereRequestDetailbMapper.java | 20 ++-- .../ConsumeRecordDetailbService.java | 2 +- .../ConsumeRecordDetailbServiceImpl.java | 2 +- .../ConsumereRequestDetailbService.java | 28 +++-- .../ConsumereRequestDetailbServiceImpl.java | 33 +++--- 20 files changed, 133 insertions(+), 213 deletions(-) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/{consumereRequest => productrepairRequest}/ConsumereRequestDetailbController.java (78%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/{consumereRequest => productrepairRequest}/vo/ConsumereRequestDetailbBaseVO.java (93%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/{consumereRequest => productrepairRequest}/vo/ConsumereRequestDetailbCreateReqVO.java (67%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/{consumereRequest => productrepairRequest}/vo/ConsumereRequestDetailbExcelVO.java (89%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/{consumereRequest => productrepairRequest}/vo/ConsumereRequestDetailbExportReqVO.java (92%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/{consumereRequest => productrepairRequest}/vo/ConsumereRequestDetailbPageReqVO.java (92%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/{consumereRequest => productrepairRequest}/vo/ConsumereRequestDetailbRespVO.java (66%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/{consumereRequest => productrepairRequest}/vo/ConsumereRequestDetailbUpdateReqVO.java (67%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/{consumereRequest => productrepairRequest}/ConsumereRequestDetailbConvert.java (61%) delete mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/consumeRecord/ConsumeRecordDetailbDO.java rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/{consumereRequest => productrepairRequest}/ConsumereRequestDetailbDO.java (85%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/{consumereRequest => productrepairRequest}/ConsumereRequestDetailbMapper.java (85%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/{consumereRequest => productrepairRequest}/ConsumereRequestDetailbService.java (64%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/{consumereRequest => productrepairRequest}/ConsumereRequestDetailbServiceImpl.java (69%) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/ContainerMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/ContainerMainController.java index b65089f6..720dae07 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/ContainerMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/ContainerMainController.java @@ -2,7 +2,6 @@ package com.win.module.wms.controller.container; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.consumereRequest.vo.ConsumereRequestDetailbExcelVO; import com.win.module.wms.controller.container.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; 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 5db2c78e..fe5a78a0 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 @@ -8,7 +8,7 @@ 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 com.win.module.wms.convert.productrepairRecord.ConsumeRecordDetailbConvert; -import com.win.module.wms.dal.dataobject.consumeRecord.ConsumeRecordDetailbDO; +import com.win.module.wms.dal.dataobject.productrepairRecord.ConsumeRecordDetailbDO; import com.win.module.wms.service.productrepairRecord.ConsumeRecordDetailbService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumereRequest/ConsumereRequestDetailbController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ConsumereRequestDetailbController.java similarity index 78% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumereRequest/ConsumereRequestDetailbController.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ConsumereRequestDetailbController.java index a576cc59..150a776c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumereRequest/ConsumereRequestDetailbController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ConsumereRequestDetailbController.java @@ -1,35 +1,32 @@ -package com.win.module.wms.controller.consumereRequest; +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.consumeRecord.vo.ConsumeRecordDetailbExcelVO; -import com.win.module.wms.controller.consumereRequest.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.controller.productrepairRequest.vo.*; +import com.win.module.wms.convert.productrepairRequest.ConsumereRequestDetailbConvert; +import com.win.module.wms.dal.dataobject.productrepairRequest.ConsumereRequestDetailbDO; +import com.win.module.wms.service.productrepairRequest.ConsumereRequestDetailbService; 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.consumereRequest.vo.*; -import com.win.module.wms.dal.dataobject.consumereRequest.ConsumereRequestDetailbDO; -import com.win.module.wms.convert.consumereRequest.ConsumereRequestDetailbConvert; -import com.win.module.wms.service.consumereRequest.ConsumereRequestDetailbService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 制品返修申请子") @RestController @@ -92,7 +89,19 @@ public class ConsumereRequestDetailbController { PageResult pageResult = consumereRequestDetailbService.getConsumereRequestDetailbPage(pageVO); return success(ConsumereRequestDetailbConvert.INSTANCE.convertPage(pageResult)); } - + @PostMapping("/senior") + @Operation(summary = "高级搜索获得制品返修申请子分页") + @PreAuthorize("@ss.hasPermission('wms:consumere:query')") + public CommonResult> getConsumereSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = consumereRequestDetailbService.getConsumereRequestDetailbSenior(conditions); + PageResult result = ConsumereRequestDetailbConvert.INSTANCE.convertPage(pageResult); + for(ConsumereRequestDetailbRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } @GetMapping("/export-excel") @Operation(summary = "导出制品返修申请子 Excel") @PreAuthorize("@ss.hasPermission('wms:consumere-request-detailb:export')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumereRequest/vo/ConsumereRequestDetailbBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbBaseVO.java similarity index 93% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumereRequest/vo/ConsumereRequestDetailbBaseVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbBaseVO.java index ea299fa5..cdb37c83 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumereRequest/vo/ConsumereRequestDetailbBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbBaseVO.java @@ -1,13 +1,12 @@ -package com.win.module.wms.controller.consumereRequest.vo; +package com.win.module.wms.controller.productrepairRequest.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import javax.validation.constraints.*; +import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; +import javax.validation.constraints.NotNull; +import java.time.LocalDateTime; + import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumereRequest/vo/ConsumereRequestDetailbCreateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbCreateReqVO.java similarity index 67% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumereRequest/vo/ConsumereRequestDetailbCreateReqVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbCreateReqVO.java index a435017a..4c80a673 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumereRequest/vo/ConsumereRequestDetailbCreateReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbCreateReqVO.java @@ -1,7 +1,9 @@ -package com.win.module.wms.controller.consumereRequest.vo; +package com.win.module.wms.controller.productrepairRequest.vo; -import lombok.*; import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; @Schema(description = "管理后台 - 制品返修申请子创建 Request VO") @Data diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumereRequest/vo/ConsumereRequestDetailbExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbExcelVO.java similarity index 89% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumereRequest/vo/ConsumereRequestDetailbExcelVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbExcelVO.java index 9e3adb4e..5d24f832 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumereRequest/vo/ConsumereRequestDetailbExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbExcelVO.java @@ -1,14 +1,11 @@ -package com.win.module.wms.controller.consumereRequest.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; +package com.win.module.wms.controller.productrepairRequest.vo; import com.alibaba.excel.annotation.ExcelProperty; import com.win.framework.excel.core.annotations.DictFormat; import com.win.framework.excel.core.convert.DictConvert; +import lombok.Data; + +import java.time.LocalDateTime; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumereRequest/vo/ConsumereRequestDetailbExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbExportReqVO.java similarity index 92% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumereRequest/vo/ConsumereRequestDetailbExportReqVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbExportReqVO.java index 1ced3751..36157124 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumereRequest/vo/ConsumereRequestDetailbExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbExportReqVO.java @@ -1,12 +1,11 @@ -package com.win.module.wms.controller.consumereRequest.vo; +package com.win.module.wms.controller.productrepairRequest.vo; -import lombok.*; -import java.util.*; import io.swagger.v3.oas.annotations.media.Schema; -import com.win.framework.common.pojo.PageParam; -import java.time.LocalDateTime; +import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 制品返修申请子 Excel 导出 Request VO，参数和 ConsumereRequestDetailbPageReqVO 是一致的") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumereRequest/vo/ConsumereRequestDetailbPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbPageReqVO.java similarity index 92% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumereRequest/vo/ConsumereRequestDetailbPageReqVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbPageReqVO.java index 361ceea2..8be0799a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumereRequest/vo/ConsumereRequestDetailbPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbPageReqVO.java @@ -1,10 +1,12 @@ -package com.win.module.wms.controller.consumereRequest.vo; +package com.win.module.wms.controller.productrepairRequest.vo; -import lombok.*; -import java.util.*; -import io.swagger.v3.oas.annotations.media.Schema; import com.win.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.springframework.format.annotation.DateTimeFormat; + import java.time.LocalDateTime; import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumereRequest/vo/ConsumereRequestDetailbRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbRespVO.java similarity index 66% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumereRequest/vo/ConsumereRequestDetailbRespVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbRespVO.java index 1cbba7af..db0c4176 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumereRequest/vo/ConsumereRequestDetailbRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbRespVO.java @@ -1,7 +1,9 @@ -package com.win.module.wms.controller.consumereRequest.vo; +package com.win.module.wms.controller.productrepairRequest.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; @Schema(description = "管理后台 - 制品返修申请子 Response VO") @Data diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumereRequest/vo/ConsumereRequestDetailbUpdateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbUpdateReqVO.java similarity index 67% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumereRequest/vo/ConsumereRequestDetailbUpdateReqVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbUpdateReqVO.java index 34a6aa83..8cae999c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumereRequest/vo/ConsumereRequestDetailbUpdateReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ConsumereRequestDetailbUpdateReqVO.java @@ -1,7 +1,9 @@ -package com.win.module.wms.controller.consumereRequest.vo; +package com.win.module.wms.controller.productrepairRequest.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; @Schema(description = "管理后台 - 制品返修申请子更新 Request VO") @Data diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productrepairRecord/ConsumeRecordDetailbConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productrepairRecord/ConsumeRecordDetailbConvert.java index a145d232..a4578d35 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productrepairRecord/ConsumeRecordDetailbConvert.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productrepairRecord/ConsumeRecordDetailbConvert.java @@ -5,7 +5,7 @@ import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailb import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailbExcelVO; import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailbRespVO; import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailbUpdateReqVO; -import com.win.module.wms.dal.dataobject.consumeRecord.ConsumeRecordDetailbDO; +import com.win.module.wms.dal.dataobject.productrepairRecord.ConsumeRecordDetailbDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/consumereRequest/ConsumereRequestDetailbConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productrepairRequest/ConsumereRequestDetailbConvert.java similarity index 61% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/consumereRequest/ConsumereRequestDetailbConvert.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productrepairRequest/ConsumereRequestDetailbConvert.java index e8a1c847..eaae5284 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/consumereRequest/ConsumereRequestDetailbConvert.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/productrepairRequest/ConsumereRequestDetailbConvert.java @@ -1,16 +1,15 @@ -package com.win.module.wms.convert.consumereRequest; - -import java.util.*; +package com.win.module.wms.convert.productrepairRequest; import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.controller.consumereRequest.vo.ConsumereRequestDetailbCreateReqVO; -import com.win.module.wms.controller.consumereRequest.vo.ConsumereRequestDetailbExcelVO; -import com.win.module.wms.controller.consumereRequest.vo.ConsumereRequestDetailbRespVO; -import com.win.module.wms.controller.consumereRequest.vo.ConsumereRequestDetailbUpdateReqVO; +import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbCreateReqVO; +import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbExcelVO; +import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbRespVO; +import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbUpdateReqVO; +import com.win.module.wms.dal.dataobject.productrepairRequest.ConsumereRequestDetailbDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.win.module.wms.dal.dataobject.consumereRequest.ConsumereRequestDetailbDO; + +import java.util.List; /** * 制品返修申请子 Convert diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/consumeRecord/ConsumeRecordDetailbDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/consumeRecord/ConsumeRecordDetailbDO.java deleted file mode 100644 index 4cf14043..00000000 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/consumeRecord/ConsumeRecordDetailbDO.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.win.module.wms.dal.dataobject.consumeRecord; - -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; -import com.win.framework.mybatis.core.dataobject.BaseDO; - -/** - * 制品返修记录子 DO - * - * @author 超级管理员 - */ -@TableName("record_consume_detailb") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class ConsumeRecordDetailbDO extends BaseDO { - - /** - * id - */ - @TableId - private Long id; - /** - * 批次 - */ - private String batch; - /** - * 从库位代码 - */ - private String fromLocationCode; - /** - * 从库位组代码 - */ - private String fromLocationGroupCode; - /** - * 从库区代码 - */ - private String fromAreaCode; - /** - * 库存状态 - * - * 枚举 {@link TODO inventory_status 对应的类} - */ - private String inventoryStatus; - /** - * 包装号 - */ - private String packingNumber; - /** - * 主表ID - */ - private String masterId; - /** - * 单据号 - */ - private String number; - /** - * 物品代码 - */ - private String itemCode; - /** - * 备注 - */ - private String remark; - /** - * 地点ID - */ - private String siteId; - /** - * 物品名称 - */ - private String itemName; - /** - * 物品描述1 - */ - private String itemDesc1; - /** - * 物品描述2 - */ - private String itemDesc2; - /** - * 项目代码 - */ - private String projectCode; - /** - * 计量单位 - * - * 枚举 {@link TODO uom 对应的类} - */ - private String uom; - /** - * 代码 - */ - private String code; - /** - * 接口类型 - * - * 枚举 {@link TODO interface_type 对应的类} - */ - private String interfaceType; - -} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/consumereRequest/ConsumereRequestDetailbDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productrepairRequest/ConsumereRequestDetailbDO.java similarity index 85% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/consumereRequest/ConsumereRequestDetailbDO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productrepairRequest/ConsumereRequestDetailbDO.java index 978f57b7..00877807 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/consumereRequest/ConsumereRequestDetailbDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productrepairRequest/ConsumereRequestDetailbDO.java @@ -1,11 +1,11 @@ -package com.win.module.wms.dal.dataobject.consumereRequest; +package com.win.module.wms.dal.dataobject.productrepairRequest; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.sun.xml.bind.v2.TODO; import com.win.framework.mybatis.core.dataobject.BaseDO; +import lombok.*; /** * 制品返修申请子 DO 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 6f474620..fc16adb1 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 @@ -5,7 +5,7 @@ import com.win.framework.mybatis.core.mapper.BaseMapperX; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; 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.consumeRecord.ConsumeRecordDetailbDO; +import com.win.module.wms.dal.dataobject.productrepairRecord.ConsumeRecordDetailbDO; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/consumereRequest/ConsumereRequestDetailbMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRequest/ConsumereRequestDetailbMapper.java similarity index 85% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/consumereRequest/ConsumereRequestDetailbMapper.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRequest/ConsumereRequestDetailbMapper.java index 7f9d501d..ef7aa5ff 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/consumereRequest/ConsumereRequestDetailbMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productrepairRequest/ConsumereRequestDetailbMapper.java @@ -1,15 +1,17 @@ -package com.win.module.wms.dal.mysql.consumereRequest; - -import java.util.*; +package com.win.module.wms.dal.mysql.productrepairRequest; +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.module.wms.controller.consumereRequest.vo.ConsumereRequestDetailbExportReqVO; -import com.win.module.wms.controller.consumereRequest.vo.ConsumereRequestDetailbPageReqVO; -import com.win.module.wms.dal.dataobject.consumereRequest.ConsumereRequestDetailbDO; +import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; +import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbExportReqVO; +import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbPageReqVO; +import com.win.module.wms.dal.dataobject.productrepairRequest.ConsumereRequestDetailbDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 制品返修申请子 Mapper * @@ -38,7 +40,9 @@ public interface ConsumereRequestDetailbMapper extends BaseMapperX selectSenior(CustomConditions conditions) { + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } default List selectList(ConsumereRequestDetailbExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ConsumereRequestDetailbDO::getInventoryStatus, reqVO.getInventoryStatus()) 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 d37a79d5..3427cd8a 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 @@ -5,7 +5,7 @@ import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailb 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.dal.dataobject.consumeRecord.ConsumeRecordDetailbDO; +import com.win.module.wms.dal.dataobject.productrepairRecord.ConsumeRecordDetailbDO; import javax.validation.Valid; import java.util.Collection; 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 ed20b791..92b5977e 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 @@ -6,7 +6,7 @@ import com.win.module.wms.controller.productrepairRecord.vo.ConsumeRecordDetailb 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.consumeRecord.ConsumeRecordDetailbDO; +import com.win.module.wms.dal.dataobject.productrepairRecord.ConsumeRecordDetailbDO; import com.win.module.wms.dal.mysql.productrepairRecord.ConsumeRecordDetailbMapper; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/consumereRequest/ConsumereRequestDetailbService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ConsumereRequestDetailbService.java similarity index 64% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/consumereRequest/ConsumereRequestDetailbService.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ConsumereRequestDetailbService.java index 9793d28a..7e4e120d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/consumereRequest/ConsumereRequestDetailbService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ConsumereRequestDetailbService.java @@ -1,14 +1,16 @@ -package com.win.module.wms.service.consumereRequest; +package com.win.module.wms.service.productrepairRequest; -import java.util.*; -import javax.validation.*; - -import com.win.module.wms.controller.consumereRequest.vo.ConsumereRequestDetailbCreateReqVO; -import com.win.module.wms.controller.consumereRequest.vo.ConsumereRequestDetailbExportReqVO; -import com.win.module.wms.controller.consumereRequest.vo.ConsumereRequestDetailbPageReqVO; -import com.win.module.wms.controller.consumereRequest.vo.ConsumereRequestDetailbUpdateReqVO; -import com.win.module.wms.dal.dataobject.consumereRequest.ConsumereRequestDetailbDO; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; +import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbCreateReqVO; +import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbExportReqVO; +import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbPageReqVO; +import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbUpdateReqVO; +import com.win.module.wms.dal.dataobject.productrepairRequest.ConsumereRequestDetailbDO; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 制品返修申请子 Service 接口 @@ -55,6 +57,14 @@ public interface ConsumereRequestDetailbService { */ List getConsumereRequestDetailbList(Collection ids); + /** + * 获得用高级搜索制品返修申请子分页列表 + * + * @param conditions 分页、排序和自定义条件 + * @return 分页列表 + */ + PageResult getConsumereRequestDetailbSenior(CustomConditions conditions); + /** * 获得制品返修申请子分页 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/consumereRequest/ConsumereRequestDetailbServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ConsumereRequestDetailbServiceImpl.java similarity index 69% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/consumereRequest/ConsumereRequestDetailbServiceImpl.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ConsumereRequestDetailbServiceImpl.java index 12d568e1..2c21b0f3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/consumereRequest/ConsumereRequestDetailbServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ConsumereRequestDetailbServiceImpl.java @@ -1,23 +1,23 @@ -package com.win.module.wms.service.consumereRequest; +package com.win.module.wms.service.productrepairRequest; -import com.win.module.wms.controller.consumereRequest.vo.ConsumereRequestDetailbCreateReqVO; -import com.win.module.wms.controller.consumereRequest.vo.ConsumereRequestDetailbExportReqVO; -import com.win.module.wms.controller.consumereRequest.vo.ConsumereRequestDetailbPageReqVO; -import com.win.module.wms.controller.consumereRequest.vo.ConsumereRequestDetailbUpdateReqVO; +import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; +import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbCreateReqVO; +import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbExportReqVO; +import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbPageReqVO; +import com.win.module.wms.controller.productrepairRequest.vo.ConsumereRequestDetailbUpdateReqVO; +import com.win.module.wms.convert.productrepairRequest.ConsumereRequestDetailbConvert; +import com.win.module.wms.dal.dataobject.productrepairRequest.ConsumereRequestDetailbDO; +import com.win.module.wms.dal.mysql.productrepairRequest.ConsumereRequestDetailbMapper; 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.consumereRequest.ConsumereRequestDetailbDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.consumereRequest.ConsumereRequestDetailbConvert; -import com.win.module.wms.dal.mysql.consumereRequest.ConsumereRequestDetailbMapper; +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.CONSUMERE_REQUEST_DETAILB_NOT_EXISTS; /** * 制品返修申请子 Service 实现类 @@ -67,7 +67,10 @@ public class ConsumereRequestDetailbServiceImpl implements ConsumereRequestDetai public ConsumereRequestDetailbDO getConsumereRequestDetailb(String id) { return consumereRequestDetailbMapper.selectById(id); } - + @Override + public PageResult getConsumereRequestDetailbSenior(CustomConditions conditions) { + return consumereRequestDetailbMapper.selectSenior(conditions); + } @Override public List getConsumereRequestDetailbList(Collection ids) { return consumereRequestDetailbMapper.selectBatchIds(ids);