From fe6940b0dca8c44e36ef624e1e20cd634401b84d Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 19 Feb 2021 19:33:45 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E7=A0=81=E8=A7=84=E5=88=99=E6=89=A9?= =?UTF-8?q?=E5=B1=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java | 17 +++++++++++++++-- .../estsh/i3plus/pojo/mes/model/GenSerialNoModel.java | 3 +++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java index 8c97553..9071712 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java @@ -54,13 +54,26 @@ public class MesNumberRule extends BaseBean implements Serializable { @Column(name = "SERIALNO_INCREMENT") @ApiParam("增量") - private Integer serialnoIncrement; + private Integer serialnoIncrement = 1; + + @Column(name = "BEGIN_VAL") + @ApiParam("起始值") + private Integer beginVal = 1; + + @Column(name = "END_VAL") + @ApiParam("最大值") + private Integer endVal; @Column(name = "IS_CYCLE") @ApiParam("最大值后循环") private Integer isCycle; + @Column(name = "IMPL_CLASS") + @ApiParam("最大值后不循环的实现类") + private String implClass; + @Column(name = "SPILT_RULE") - @ApiParam("拼接规则") + @ApiParam("拼接固定字符,多个逗号分隔") private String spiltRule; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java index 2d3b703..171102c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java @@ -106,6 +106,9 @@ public class GenSerialNoModel { @ApiParam("颜色名称") private String colorName; + @ApiParam("拼接动态字符,多个逗号分隔") + private String dynamicRule; + public GenSerialNoModel(String ruleCode) { this.ruleCode = ruleCode;