From 387c0c2101b5536eb9451565ce9a680e649d78fb Mon Sep 17 00:00:00 2001 From: chenfang Date: Thu, 26 Oct 2023 09:32:28 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E9=87=87=E8=B4=AD=E7=B4=A2?= =?UTF-8?q?=E8=B5=94=E7=94=B3=E8=AF=B7=E4=BB=A3=E7=A0=81=E6=91=86=E6=94=BE?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseclaimRequestMainController.java | 43 +++++++++---------- .../vo/PurchaseclaimRequestMainBaseVO.java | 13 +++--- .../PurchaseclaimRequestMainCreateReqVO.java | 6 ++- .../vo/PurchaseclaimRequestMainExcelVO.java | 13 ++---- .../PurchaseclaimRequestMainExportReqVO.java | 9 ++-- .../vo/PurchaseclaimRequestMainPageReqVO.java | 10 +++-- .../vo/PurchaseclaimRequestMainRespVO.java | 6 ++- .../PurchaseclaimRequestMainUpdateReqVO.java | 7 ++- .../PurchaseclaimRequestMainConvert.java | 15 +++---- .../PurchaseclaimRequestMainDO.java | 13 +++--- .../PurchaseclaimRequestMainMapper.java | 13 +++--- .../PurchaseclaimRequestMainService.java | 17 ++++---- .../PurchaseclaimRequestMainServiceImpl.java | 25 +++++------ 13 files changed, 89 insertions(+), 101 deletions(-) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/{suppliermanage => purchaseclaimRequest}/PurchaseclaimRequestMainController.java (90%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/{suppliermanage => purchaseclaimRequest}/vo/PurchaseclaimRequestMainBaseVO.java (91%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/{suppliermanage => purchaseclaimRequest}/vo/PurchaseclaimRequestMainCreateReqVO.java (67%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/{suppliermanage => purchaseclaimRequest}/vo/PurchaseclaimRequestMainExcelVO.java (87%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/{suppliermanage => purchaseclaimRequest}/vo/PurchaseclaimRequestMainExportReqVO.java (93%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/{suppliermanage => purchaseclaimRequest}/vo/PurchaseclaimRequestMainPageReqVO.java (93%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/{suppliermanage => purchaseclaimRequest}/vo/PurchaseclaimRequestMainRespVO.java (67%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/{suppliermanage => purchaseclaimRequest}/vo/PurchaseclaimRequestMainUpdateReqVO.java (55%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/{suppliermanage => purchaseclaimRequest}/PurchaseclaimRequestMainConvert.java (63%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/{suppliermanage => purchaseclaimRequest}/PurchaseclaimRequestMainDO.java (89%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/{suppliermanage => purchaseclaimRequest}/PurchaseclaimRequestMainMapper.java (92%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/{suppliermanage => purchaseclaimRequest}/PurchaseclaimRequestMainService.java (75%) rename win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/{suppliermanage => purchaseclaimRequest}/PurchaseclaimRequestMainServiceImpl.java (77%) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/suppliermanage/PurchaseclaimRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/PurchaseclaimRequestMainController.java similarity index 90% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/suppliermanage/PurchaseclaimRequestMainController.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/PurchaseclaimRequestMainController.java index d17f04f9..42f3caea 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/suppliermanage/PurchaseclaimRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/PurchaseclaimRequestMainController.java @@ -1,34 +1,31 @@ -package com.win.module.wms.controller.suppliermanage; +package com.win.module.wms.controller.purchaseclaimRequest; +import com.win.framework.common.pojo.CommonResult; +import com.win.framework.common.pojo.PageResult; +import com.win.framework.excel.core.util.ExcelUtils; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.suppliermanage.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.purchaseclaimRequest.vo.*; +import com.win.module.wms.convert.purchaseclaimRequest.PurchaseclaimRequestMainConvert; +import com.win.module.wms.dal.dataobject.purchaseclaimRequest.PurchaseclaimRequestMainDO; +import com.win.module.wms.service.purchaseclaimRequest.PurchaseclaimRequestMainService; 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.suppliermanage.PurchaseclaimRequestMainDO; -import com.win.module.wms.convert.suppliermanage.PurchaseclaimRequestMainConvert; -import com.win.module.wms.service.suppliermanage.PurchaseclaimRequestMainService; +import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 采购索赔申请主") @RestController diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/suppliermanage/vo/PurchaseclaimRequestMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestMainBaseVO.java similarity index 91% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/suppliermanage/vo/PurchaseclaimRequestMainBaseVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestMainBaseVO.java index 681c160c..e9484d22 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/suppliermanage/vo/PurchaseclaimRequestMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestMainBaseVO.java @@ -1,15 +1,12 @@ -package com.win.module.wms.controller.suppliermanage.vo; +package com.win.module.wms.controller.purchaseclaimRequest.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import 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/suppliermanage/vo/PurchaseclaimRequestMainCreateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestMainCreateReqVO.java similarity index 67% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/suppliermanage/vo/PurchaseclaimRequestMainCreateReqVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestMainCreateReqVO.java index eb555fca..d6553dc8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/suppliermanage/vo/PurchaseclaimRequestMainCreateReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestMainCreateReqVO.java @@ -1,7 +1,9 @@ -package com.win.module.wms.controller.suppliermanage.vo; +package com.win.module.wms.controller.purchaseclaimRequest.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/suppliermanage/vo/PurchaseclaimRequestMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestMainExcelVO.java similarity index 87% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/suppliermanage/vo/PurchaseclaimRequestMainExcelVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestMainExcelVO.java index b89bcfd4..4e340dde 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/suppliermanage/vo/PurchaseclaimRequestMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestMainExcelVO.java @@ -1,16 +1,11 @@ -package com.win.module.wms.controller.suppliermanage.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; +package com.win.module.wms.controller.purchaseclaimRequest.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/suppliermanage/vo/PurchaseclaimRequestMainExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestMainExportReqVO.java similarity index 93% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/suppliermanage/vo/PurchaseclaimRequestMainExportReqVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestMainExportReqVO.java index 9b7ed6c0..e30c2326 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/suppliermanage/vo/PurchaseclaimRequestMainExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestMainExportReqVO.java @@ -1,12 +1,11 @@ -package com.win.module.wms.controller.suppliermanage.vo; +package com.win.module.wms.controller.purchaseclaimRequest.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，参数和 PurchaseclaimRequestMainPageReqVO 是一致的") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/suppliermanage/vo/PurchaseclaimRequestMainPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestMainPageReqVO.java similarity index 93% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/suppliermanage/vo/PurchaseclaimRequestMainPageReqVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestMainPageReqVO.java index 650dbc80..3d581a53 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/suppliermanage/vo/PurchaseclaimRequestMainPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestMainPageReqVO.java @@ -1,10 +1,12 @@ -package com.win.module.wms.controller.suppliermanage.vo; +package com.win.module.wms.controller.purchaseclaimRequest.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/suppliermanage/vo/PurchaseclaimRequestMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestMainRespVO.java similarity index 67% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/suppliermanage/vo/PurchaseclaimRequestMainRespVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestMainRespVO.java index 77a2abd2..aef5b2a7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/suppliermanage/vo/PurchaseclaimRequestMainRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestMainRespVO.java @@ -1,7 +1,9 @@ -package com.win.module.wms.controller.suppliermanage.vo; +package com.win.module.wms.controller.purchaseclaimRequest.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/suppliermanage/vo/PurchaseclaimRequestMainUpdateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestMainUpdateReqVO.java similarity index 55% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/suppliermanage/vo/PurchaseclaimRequestMainUpdateReqVO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestMainUpdateReqVO.java index 4e9da5e4..9599125e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/suppliermanage/vo/PurchaseclaimRequestMainUpdateReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestMainUpdateReqVO.java @@ -1,7 +1,10 @@ -package com.win.module.wms.controller.suppliermanage.vo; +package com.win.module.wms.controller.purchaseclaimRequest.vo; +import com.win.module.wms.controller.purchaseclaimRequest.vo.PurchaseclaimRequestMainBaseVO; 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/suppliermanage/PurchaseclaimRequestMainConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/purchaseclaimRequest/PurchaseclaimRequestMainConvert.java similarity index 63% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/suppliermanage/PurchaseclaimRequestMainConvert.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/purchaseclaimRequest/PurchaseclaimRequestMainConvert.java index 3e0c75e2..f006aede 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/suppliermanage/PurchaseclaimRequestMainConvert.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/purchaseclaimRequest/PurchaseclaimRequestMainConvert.java @@ -1,16 +1,13 @@ -package com.win.module.wms.convert.suppliermanage; - -import java.util.*; +package com.win.module.wms.convert.purchaseclaimRequest; import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.controller.suppliermanage.vo.PurchaseclaimRequestMainCreateReqVO; -import com.win.module.wms.controller.suppliermanage.vo.PurchaseclaimRequestMainExcelVO; -import com.win.module.wms.controller.suppliermanage.vo.PurchaseclaimRequestMainRespVO; -import com.win.module.wms.controller.suppliermanage.vo.PurchaseclaimRequestMainUpdateReqVO; +import com.win.module.wms.controller.purchaseclaimRequest.vo.PurchaseclaimRequestMainUpdateReqVO; +import com.win.module.wms.controller.purchaseclaimRequest.vo.*; +import com.win.module.wms.dal.dataobject.purchaseclaimRequest.PurchaseclaimRequestMainDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.win.module.wms.dal.dataobject.suppliermanage.PurchaseclaimRequestMainDO; + +import java.util.List; /** * 采购索赔申请主 Convert diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/suppliermanage/PurchaseclaimRequestMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchaseclaimRequest/PurchaseclaimRequestMainDO.java similarity index 89% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/suppliermanage/PurchaseclaimRequestMainDO.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchaseclaimRequest/PurchaseclaimRequestMainDO.java index e55ed956..5a1c8678 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/suppliermanage/PurchaseclaimRequestMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchaseclaimRequest/PurchaseclaimRequestMainDO.java @@ -1,13 +1,12 @@ -package com.win.module.wms.dal.dataobject.suppliermanage; +package com.win.module.wms.dal.dataobject.purchaseclaimRequest; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.sun.xml.bind.v2.TODO; +import com.win.framework.mybatis.core.dataobject.BaseDO; import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; + import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; -import com.win.framework.mybatis.core.dataobject.BaseDO; /** * 采购索赔申请主 DO diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/suppliermanage/PurchaseclaimRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchaseclaimRequest/PurchaseclaimRequestMainMapper.java similarity index 92% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/suppliermanage/PurchaseclaimRequestMainMapper.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchaseclaimRequest/PurchaseclaimRequestMainMapper.java index 77510b58..70bea185 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/suppliermanage/PurchaseclaimRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchaseclaimRequest/PurchaseclaimRequestMainMapper.java @@ -1,15 +1,14 @@ -package com.win.module.wms.dal.mysql.suppliermanage; - -import java.util.*; +package com.win.module.wms.dal.mysql.purchaseclaimRequest; 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.suppliermanage.vo.PurchaseclaimRequestMainExportReqVO; -import com.win.module.wms.controller.suppliermanage.vo.PurchaseclaimRequestMainPageReqVO; -import com.win.module.wms.dal.dataobject.suppliermanage.PurchaseclaimRequestMainDO; +import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.win.module.wms.controller.purchaseclaimRequest.vo.*; +import com.win.module.wms.dal.dataobject.purchaseclaimRequest.PurchaseclaimRequestMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 采购索赔申请主 Mapper * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/suppliermanage/PurchaseclaimRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRequest/PurchaseclaimRequestMainService.java similarity index 75% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/suppliermanage/PurchaseclaimRequestMainService.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRequest/PurchaseclaimRequestMainService.java index 2775f669..645d19b7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/suppliermanage/PurchaseclaimRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRequest/PurchaseclaimRequestMainService.java @@ -1,14 +1,13 @@ -package com.win.module.wms.service.suppliermanage; +package com.win.module.wms.service.purchaseclaimRequest; -import java.util.*; -import javax.validation.*; - -import com.win.module.wms.controller.suppliermanage.vo.PurchaseclaimRequestMainCreateReqVO; -import com.win.module.wms.controller.suppliermanage.vo.PurchaseclaimRequestMainExportReqVO; -import com.win.module.wms.controller.suppliermanage.vo.PurchaseclaimRequestMainPageReqVO; -import com.win.module.wms.controller.suppliermanage.vo.PurchaseclaimRequestMainUpdateReqVO; -import com.win.module.wms.dal.dataobject.suppliermanage.PurchaseclaimRequestMainDO; import com.win.framework.common.pojo.PageResult; +import com.win.module.wms.controller.purchaseclaimRequest.vo.PurchaseclaimRequestMainUpdateReqVO; +import com.win.module.wms.controller.purchaseclaimRequest.vo.*; +import com.win.module.wms.dal.dataobject.purchaseclaimRequest.PurchaseclaimRequestMainDO; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 采购索赔申请主 Service 接口 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/suppliermanage/PurchaseclaimRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRequest/PurchaseclaimRequestMainServiceImpl.java similarity index 77% rename from win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/suppliermanage/PurchaseclaimRequestMainServiceImpl.java rename to win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRequest/PurchaseclaimRequestMainServiceImpl.java index 842bad3b..387d1574 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/suppliermanage/PurchaseclaimRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRequest/PurchaseclaimRequestMainServiceImpl.java @@ -1,23 +1,20 @@ -package com.win.module.wms.service.suppliermanage; +package com.win.module.wms.service.purchaseclaimRequest; -import com.win.module.wms.controller.suppliermanage.vo.PurchaseclaimRequestMainCreateReqVO; -import com.win.module.wms.controller.suppliermanage.vo.PurchaseclaimRequestMainExportReqVO; -import com.win.module.wms.controller.suppliermanage.vo.PurchaseclaimRequestMainPageReqVO; -import com.win.module.wms.controller.suppliermanage.vo.PurchaseclaimRequestMainUpdateReqVO; +import com.win.framework.common.pojo.PageResult; +import com.win.module.wms.controller.purchaseclaimRequest.vo.PurchaseclaimRequestMainUpdateReqVO; +import com.win.module.wms.controller.purchaseclaimRequest.vo.*; +import com.win.module.wms.convert.purchaseclaimRequest.PurchaseclaimRequestMainConvert; +import com.win.module.wms.dal.dataobject.purchaseclaimRequest.PurchaseclaimRequestMainDO; +import com.win.module.wms.dal.mysql.purchaseclaimRequest.PurchaseclaimRequestMainMapper; 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.suppliermanage.PurchaseclaimRequestMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.suppliermanage.PurchaseclaimRequestMainConvert; -import com.win.module.wms.dal.mysql.suppliermanage.PurchaseclaimRequestMainMapper; +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.PURCHASECLAIM_REQUEST_MAIN_NOT_EXISTS; /** * 采购索赔申请主 Service 实现类