diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/RuleBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/RuleBaseVO.java index 70bbb819..17abfc68 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/RuleBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/RuleBaseVO.java @@ -1,9 +1,9 @@ package com.win.module.wms.controller.rule.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 使用 @@ -30,7 +30,8 @@ public class RuleBaseVO { @Schema(description = "名称") private String name; - + @Schema(description = "状态") + private Integer status; @Schema(description = "描述") private String description; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/RuleExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/RuleExcelVO.java deleted file mode 100644 index a97b73dc..00000000 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/RuleExcelVO.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.win.module.wms.controller.rule.vo; - -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -import java.time.LocalDateTime; -import java.util.*; - -import com.alibaba.excel.annotation.ExcelProperty; - -/** - * 规则 Excel VO - * - * @author 超级管理员 - */ -@Data -public class RuleExcelVO { - - @ExcelProperty("策略代码") - private String strategyCode; - - @ExcelProperty("优先级") - private Integer priority; - - @ExcelProperty("代码") - private String code; - - @ExcelProperty("名称") - private String name; - - @ExcelProperty("描述") - private String description; - - @ExcelProperty("条件") - private String condition; - - @ExcelProperty("配置") - private String configuration; - - @ExcelProperty("创建时间") - @ColumnWidth(value = 16) - private LocalDateTime createTime; - - @ExcelProperty("创建者ID") - private String creator; - -} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/RuleExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/RuleExportReqVO.java deleted file mode 100644 index ca94c30f..00000000 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/RuleExportReqVO.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.win.module.wms.controller.rule.vo; - -import lombok.*; -import java.util.*; -import io.swagger.v3.oas.annotations.media.Schema; -import com.win.framework.common.pojo.PageParam; - -@Schema(description = "管理后台 - 规则 Excel 导出 Request VO，参数和 RulePageReqVO 是一致的") -@Data -public class RuleExportReqVO { - - @Schema(description = "策略代码") - private String strategyCode; - - @Schema(description = "优先级") - private Integer priority; - - @Schema(description = "代码") - private String code; - - @Schema(description = "名称") - private String name; - - @Schema(description = "描述") - private String description; - - @Schema(description = "条件") - private String condition; - - @Schema(description = "配置") - private String configuration; - -} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/RuleImportExcelVo.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/RuleImportExcelVo.java deleted file mode 100644 index 2106a3ea..00000000 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/RuleImportExcelVo.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.win.module.wms.controller.rule.vo; - -import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.win.framework.excel.core.annotations.DictFormat; -import com.win.framework.excel.core.convert.DictConvert; -import com.win.module.wms.enums.DictTypeConstants; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; -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; - -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -@Accessors(chain = false) // 设置 chain = false，避免用户导入有问题 -public class RuleImportExcelVo { - - - @ExcelProperty("策略代码") - private String strategyCode; - - @ExcelProperty("优先级") - private Integer priority; - - @ExcelProperty("代码") - private String code; - - @ExcelProperty("名称") - private String name; - - @ExcelProperty("描述") - private String description; - - @ExcelProperty("条件") - private String condition; - - @ExcelProperty("配置") - private String configuration; -} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/RulePageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/RulePageReqVO.java index c9ce1c42..53ef57e5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/RulePageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/RulePageReqVO.java @@ -27,6 +27,9 @@ public class RulePageReqVO extends PageParam { @Schema(description = "名称") private String name; + @Schema(description = "状态") + private Integer status; + @Schema(description = "描述") private String description; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/rule/RuleConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/rule/RuleConvert.java index 2f46099c..59a62f96 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/rule/RuleConvert.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/rule/RuleConvert.java @@ -1,15 +1,14 @@ package com.win.module.wms.convert.rule; -import java.util.*; - import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.controller.rule.vo.*; -import com.win.module.wms.controller.saleprice.vo.SalepriceImportExcelVo; -import com.win.module.wms.dal.dataobject.saleprice.SalepriceDO; +import com.win.module.wms.controller.rule.vo.RuleCreateReqVO; +import com.win.module.wms.controller.rule.vo.RuleRespVO; +import com.win.module.wms.controller.rule.vo.RuleUpdateReqVO; +import com.win.module.wms.dal.dataobject.rule.RuleDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.win.module.wms.dal.dataobject.rule.*; + +import java.util.List; /** * 规则 Convert @@ -31,8 +30,4 @@ public interface RuleConvert { PageResult convertPage(PageResult page); - List convertList02(List list); - - RuleDO convert(RuleImportExcelVo bean); - } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/rule/RuleMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/rule/RuleMapper.java index a62b44b0..1af3b3c0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/rule/RuleMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/rule/RuleMapper.java @@ -1,14 +1,10 @@ package com.win.module.wms.dal.mysql.rule; -import java.util.*; - 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.rule.vo.RuleExportReqVO; +import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.module.wms.controller.rule.vo.RulePageReqVO; import com.win.module.wms.dal.dataobject.rule.RuleDO; -import com.win.module.wms.dal.dataobject.shift.ShiftDO; import org.apache.ibatis.annotations.Mapper; /** @@ -35,16 +31,4 @@ public interface RuleMapper extends BaseMapperX { .orderByDesc(RuleDO::getId)); } - default List selectList(RuleExportReqVO reqVO) { - return selectList(new LambdaQueryWrapperX() - .eqIfPresent(RuleDO::getStrategyCode, reqVO.getStrategyCode()) - .eqIfPresent(RuleDO::getPriority, reqVO.getPriority()) - .eqIfPresent(RuleDO::getCode, reqVO.getCode()) - .likeIfPresent(RuleDO::getName, reqVO.getName()) - .eqIfPresent(RuleDO::getDescription, reqVO.getDescription()) - .eqIfPresent(RuleDO::getCondition, reqVO.getCondition()) - .eqIfPresent(RuleDO::getConfiguration, reqVO.getConfiguration()) - .orderByDesc(RuleDO::getId)); - } - }