Jenkins自动合并

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.base.annotation;
+
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+
+import java.lang.annotation.*;
+
+/**
+ * 字段类型属性注解
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD})
+public @interface FieldAnnotation {
+    // Web前端字段数据类型
+    WmsEnumUtil.FIELD_TYPE webFieldType();
+}

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.base.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import com.alibaba.fastjson.annotation.JSONField;
@@ -67,11 +68,13 @@ public abstract class BaseBean implements Serializable {
 
     @Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false)
     @ApiParam(value = "有效性",example = "1")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
     @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true)
     public Integer isValid;    //CommonEnumUtil.IS_VAILD;
 
     @Column(name="IS_DELETED", columnDefinition = "int default 2", nullable = false)
     @ApiParam(value = "是否已删除",example = "2")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
     @AnnoOutputColumn(hidden = true)
     //逻辑删除，软删除
     public Integer isDeleted;    //CommonEnumUtil.TRUE_OR_FALSEA
@@ -127,6 +130,7 @@ public abstract class BaseBean implements Serializable {
     @Transient
     @ApiParam(value = "排序类型，1 正序，2 倒序",example = "1")
     @AnnoOutputColumn(hidden = true)
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
     //CommonEnumUtil.ASC_OR_DESC  1 asc,2 desc
     public transient Integer ascOrDesc = 1;
 

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java

@@ -187,15 +187,6 @@ public class MesEnumUtil {
             return tmp;
         }
 
-        public static String valueOfDescription2(int val) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
-                    tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description;
-                }
-            }
-            return tmp;
-        }
     }
 
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -2889,8 +2880,7 @@ public class MesEnumUtil {
         STANDARD_ORDER(10, "标准工单"),
         BTS_ORDER(20, "BTS工单"),
         ATTEMPT_ORDER(30, "试制工单"),
-        BH_ORDER(40, "B&H工单"),
+        BH_ORDER(40, "B&H工单");
-        JIT_ORDER(50, "JIT工单");
 
         private int value;
         private String description;

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -4792,5 +4792,41 @@ public class WmsEnumUtil {
         }
     }
 
+    /**
+     *  WEB页面字段类型
+     *  10-文本类型，20-数字类型，30-下拉框类型，40，时间类型，50-开窗查询类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum FIELD_TYPE {
+        TEXT(10, "text"), NUMBER(20, "number"),
+        SELECT(30, "select"), DATETIME(40, "datetime"),
+        LIST(50, "list");
+
+        private int value;
+        private String description;
+
+        FIELD_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 
 }

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java

@@ -69,9 +69,9 @@ public class MesPart extends BaseBean {
     @ApiParam("默认工作中心")
     private String defaultWorkCenter;
 
-    @Column(name = "PRODUCE_CATEGORY")
+    @Column(name = "PRODUCE_CTGY_CODE")
-    @ApiParam("产品类型")
+    @ApiParam("产品类型代码")
-    private String produceCategory;
+    private String produceCategoryCode;
 
     @Column(name = "PROCESS_MATCH_TYPE")
     @ApiParam("过程编码匹配类型")

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.mes.pcn.model;
 
+import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -41,6 +42,20 @@ public class QueueJisModel implements Serializable {
     @ApiParam("产品条码")
     private String serialNumber;
 
+    @ApiParam("状态名称")
+    private String statusName;
+
+    @ApiParam("明细状态名称")
+    private String detailStatusName;
+
+    public String getStatusName() {
+        return MesPcnEnumUtil.MES_QUEUE_JIS_STATUS.valueOfDescription(this.status);
+    }
+
+    public String getDetailStatusName() {
+        return MesPcnEnumUtil.MES_QUEUE_JIS_STATUS.valueOfDescription(this.detailStatus);
+    }
+
     public QueueJisModel() {
     }
 
@@ -57,4 +72,5 @@ public class QueueJisModel implements Serializable {
         this.detailStatus = detailStatus;
         this.serialNumber = serialNumber;
     }
+
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java

@@ -37,7 +37,7 @@ public class MesPackageDetail extends BaseBean {
     private String serialNumber;
 
     @Column(name = "PART_NO")
-    @ApiParam("产品条码")
+    @ApiParam("物料号")
     private String partNo;
 
     @Column(name = "PART_NAME_RDD")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java

@@ -23,8 +23,8 @@ public class MesButtonFlagModel implements Serializable {
     @ApiParam("修改按钮")
     private boolean updateButton;
 
-//    @ApiParam("按配置修改按钮")
+    @ApiParam("按配置修改按钮")
-//    private boolean updateButtonConfig;
+    private boolean updateButtonConfig;
 
     @ApiParam("下达按钮")
     private boolean transmitButton;

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

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
@@ -46,6 +47,7 @@ public class WmsPart extends BaseBean {
 
     @Column(name = "PART_TYPE")
     @ApiParam(value = "物料类型")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
     @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_PART_TYPE_STR.class, refForeignKey = "value", value = "description")
     private String partType;
 
@@ -96,6 +98,7 @@ public class WmsPart extends BaseBean {
     @ColumnDefault("2")
     @Column(name = "IQC")
     @ApiParam(value = "是否免检", example = "1")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
     private Integer iqc;
 
     @Column(name = "MIN", columnDefinition = "decimal(18,8)")
@@ -116,6 +119,7 @@ public class WmsPart extends BaseBean {
 
     @Column(name = "SN_CONTROL")
     @ApiParam(value = "是否条码管理", example = "1")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
     private Integer snControl;
 
     @Column(name = "VENDOR_NO")
@@ -152,6 +156,7 @@ public class WmsPart extends BaseBean {
 
     @Column(name = "IS_REPORT_PARTNO")
     @ApiParam("是否报工零件")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
     private Integer isReportPartNo;
 
     @Column(name = "REPORT_LOCATE_NO")
@@ -172,6 +177,7 @@ public class WmsPart extends BaseBean {
 
     @Column(name = "IS_VALUABLE", columnDefinition = "int default 2")
     @ApiParam(value = "是否贵重")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
     @AnnoOutputColumn(refClass = WmsEnumUtil.IS_VALUABLE.class, refForeignKey = "value", value = "description")
     private Integer isValuable;
 
@@ -189,10 +195,12 @@ public class WmsPart extends BaseBean {
     private Double verbNum;
 
     @Column(name = "IS_PROD_LOT")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
     @ApiParam(value = "是否录入生产批次", example = "1")
     private Integer isProdLot = 2;
 
     @Column(name = "PULL_WAY")
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
     @ApiParam(value = "拉动方式", example = "0")
     private Integer pullWay = 0;
 

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

@@ -49,7 +49,7 @@ public class WmsSearchElementFunction extends BaseBean {
     @ApiParam(value = "用户编号")
     private String userCode;
 
-    @Column(name = "IS_SHAER")
+    @Column(name = "IS_SHARE")
     @ApiParam(value = "是否共享")
-    private Integer isShaer;
+    private Integer isShare;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsListElementModel.java

@@ -0,0 +1,55 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : WMS列表菜单model
+ * @Reference :
+ * @Author : sjc
+ * @CreateDate : 2020-01-07 14:33
+ * @Modify:
+ **/
+@Data
+@Api("WMS列表菜单model")
+public class WmsListElementModel extends BaseBean {
+
+    @ApiParam("字段名称")
+    private String fieldName;
+
+    @ApiParam("标题名称")
+    private String titleName;
+
+    @ApiParam("序列号:字段标题排序使用默认0（不排序）")
+    private Integer seq;
+
+    @ApiParam(value = "是否必选:默认1-必选，2-非必选")
+    private Integer isRequire;
+
+    @ApiParam(value = "宽度")
+    private Double width;
+
+    @ApiParam(value = "排序规则:默认0-不排序，1-升序2-降序")
+    private Integer sort;
+
+    @ApiParam(value = "是否加粗:默认1-加粗，2-非加粗")
+    private Integer isWider;
+
+    @ApiParam(value = "是否勾选:默认1-勾选，2-非勾选")
+    private Integer isSelect;
+
+    @ApiParam(value = "表单字段默认值")
+    private String defaultValue;
+
+    @ApiParam(value = "功能菜单ID")
+    private Long functionId;
+
+    @ApiParam(value = "用户编号")
+    private String userCode;
+
+    @ApiParam(value = "是否默认配置")
+    private Integer isDefault;
+
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsSearchElementModel.java

@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : WMS列表搜索model
+ * @Reference :
+ * @Author : sjc
+ * @CreateDate : 2020-01-07 14:33
+ * @Modify:
+ **/
+@Data
+@Api("WMS列表搜索model")
+public class WmsSearchElementModel extends BaseBean {
+
+    @ApiParam("字段名称")
+    private String fieldName;
+
+    @ApiParam("标题名称")
+    private String titleName;
+
+    @ApiParam(value = "条件表达式:>,<,>=等")
+    private String conditionExpre;
+
+    @ApiParam(value = "检索值")
+    private String value;
+
+    @ApiParam(value = "条件连接符:and/or")
+    private String conditionConnector;
+
+    @ApiParam(value = "功能菜单ID")
+    private Long functionId;
+
+    @ApiParam(value = "组名称")
+    private String groupName;
+
+    @ApiParam(value = "组条件连接符")
+    private String groupConnector;
+
+    @ApiParam(value = "用户编号")
+    private String userCode;
+
+    @ApiParam(value = "是否共享")
+    private Integer isShare;
+}