Merge branch 'test' of jhforever.wang/wangjie-i3plus-pojo into test

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;
+
 }

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;