Jenkins自动合并

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java

@@ -9,7 +9,7 @@ import java.lang.annotation.*;
  */
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.FIELD})
+@Target({ElementType.FIELD, ElementType.TYPE})
 public @interface FieldAnnotation {
     // Web前端字段数据类型
     WmsEnumUtil.FIELD_TYPE webFieldType();
@@ -33,4 +33,6 @@ public @interface FieldAnnotation {
     int isShow() default 1;
     // 是否跳过本字段扫描 0-不跳过，1-跳过
     int isSkip() default 0;
+    // 下拉枚举名称
+    String enumName() default "";
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchGroupModel.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.model.wms;
 
+import cn.estsh.i3plus.pojo.base.common.Pager;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -17,4 +18,7 @@ public class WmsSearchGroupModel {
 
     @ApiParam(value = "组列表")
     private List<WmsSearchElementModel> searchElementModelList;
+
+    @ApiParam(value = "分页组件")
+    private Pager pager;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java

@@ -50,7 +50,7 @@ public class WmsPart extends BaseBean {
 
     @Column(name = "PART_TYPE")
     @ApiParam(value = "物料类型")
-    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "WMS_PART_TYPE")
     @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_PART_TYPE_STR.class, refForeignKey = "value", value = "description")
     private String partType;
 
@@ -112,7 +112,7 @@ public class WmsPart extends BaseBean {
     @ColumnDefault("2")
     @Column(name = "IQC")
     @ApiParam(value = "是否免检", example = "1")
-    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2)
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE")
     private Integer iqc;
 
     @Column(name = "MIN", columnDefinition = "decimal(18,8)")
@@ -137,7 +137,7 @@ public class WmsPart extends BaseBean {
 
     @Column(name = "SN_CONTROL")
     @ApiParam(value = "是否条码管理", example = "1")
-    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2)
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE")
     private Integer snControl;
 
     @Column(name = "VENDOR_NO")
@@ -182,7 +182,7 @@ public class WmsPart extends BaseBean {
 
     @Column(name = "IS_REPORT_PARTNO")
     @ApiParam("是否报工零件")
-    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2)
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE")
     private Integer isReportPartNo;
 
     @Column(name = "REPORT_LOCATE_NO")
@@ -207,7 +207,7 @@ public class WmsPart extends BaseBean {
 
     @Column(name = "IS_VALUABLE", columnDefinition = "int default 2")
     @ApiParam(value = "是否贵重")
-    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2)
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "IS_VALUABLE")
     @AnnoOutputColumn(refClass = WmsEnumUtil.IS_VALUABLE.class, refForeignKey = "value", value = "description")
     private Integer isValuable;
 
@@ -228,12 +228,12 @@ public class WmsPart extends BaseBean {
     private Double verbNum;
 
     @Column(name = "IS_PROD_LOT")
-    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2)
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE")
     @ApiParam(value = "是否录入生产批次", example = "1")
     private Integer isProdLot = 2;
 
     @Column(name = "PULL_WAY")
-    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2)
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "PULL_WAY_STATUS")
     @ApiParam(value = "拉动方式", example = "0")
     private Integer pullWay = 0;
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java

@@ -45,6 +45,10 @@ public class WmsFieldInfo extends BaseBean {
     @ApiParam(value = "字段类型")
     private String fieldType;
 
+    @Column(name = "ENUM_NAME")
+    @ApiParam(value = "字段枚举名称")
+    private String enumName;
+
     @Column(name = "ENTITY_NAME")
     @ApiParam(value = "实体名称")
     private String entityName;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java

@@ -21,6 +21,7 @@ import javax.persistence.*;
 @Entity
 @Table(name="WMS_SEARCHELEMENT", indexes = {
         @Index(columnList = "FIELD_NAME"),
+        @Index(columnList = "FIELD_TYPE"),
         @Index(columnList = "SEARCH_NAME"),
         @Index(columnList = "USER_CODE")
 })
@@ -40,6 +41,10 @@ public class WmsSearchElement extends BaseBean {
     @ApiParam(value = "标题名称")
     private String titleName;
 
+    @Column(name = "FIELD_TYPE")
+    @ApiParam(value = "字段类型")
+    private String fieldType;
+
     @Column(name = "CONDITION_EXPRE")
     @ApiParam(value = "条件表达式:>,<,>=等")
     private String conditionExpre;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -2767,8 +2767,8 @@ public class WmsHqlPack {
     public static DdlPackBean packHqlWmsSearchElementRecord(WmsSearchElementFunction searchElementFunction) {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getNumEqualPack(searchElementFunction.getFunctionId(), "functionId", result);
-        DdlPreparedPack.getNumEqualPackOr(searchElementFunction.getIsShare(), "isShare", result);
         DdlPreparedPack.getStringEqualPack(searchElementFunction.getUserCode(), "userCode", result);
+        DdlPreparedPack.getNumEqualPackOr(searchElementFunction.getIsShare(), "isShare", result);
         getStringBuilderPack(searchElementFunction, result);
         return result;
     }