Merge branch 'ext-dev' of andly.pan/i3plus-pojo into ext-dev

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java

@@ -39,7 +39,7 @@ import java.io.Serializable;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Inheritance(strategy = InheritanceType.JOINED)
-@Api("去去去去去去去去去安灯记录")
+@Api("安灯记录")
 public class AndonManageRecord extends BaseManageQueue implements Serializable {
 
     private static final long serialVersionUID = 4667499369694353351L;

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

@@ -337,6 +337,7 @@ public class BlockFormEnumUtil {
             return tmp;
         }
     }
+
     /**
      * 元素属性显示状态信息
      */
@@ -988,7 +989,6 @@ public class BlockFormEnumUtil {
     }
 
 
-
     /**
      * 元素组织隔离
      */
@@ -1394,7 +1394,6 @@ public class BlockFormEnumUtil {
     }
 
 
-
     /**
      * 执行类型信息
      */
@@ -1751,8 +1750,8 @@ public class BlockFormEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum TRIGGER_EVENT {
-        CLICK(10, "CLICK", "单击");
+        CLICK(10, "CLICK", "单击"),
-//        DB_LCLICK(20, "DB_LCLICK", "双击"),
+        DOUBLE_CLICK(20, "DOUBLE_CLICK", "双击");
 //        MOUSE_OUT(30, "MOUSE_OUT", "鼠标指针移出"),
 //        MOUSE_OVER(40, "MOUSE_OVER", "鼠标指针移入");
 
@@ -1830,6 +1829,88 @@ public class BlockFormEnumUtil {
     }
 
     /**
+     * 触发反应枚举
+     * 功能明细管理中，关联属性的操作， 可以通过事件刷新其他元素，或者通过事件打开另一个功能明细
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TRIGGER_ACTION {
+        REFRESH(10, "REFRESH", "刷新元素"),
+        SHOW_METHOD(20, "SHOW_METHOD", "展示其他功能明细");
+
+        private int value;
+        private String code;
+        private String description;
+
+        private TRIGGER_ACTION(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfCode(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].code;
+                }
+            }
+            return tmp;
+        }
+
+        public static int codeOfValue(String code) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        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;
+        }
+
+        public static TRIGGER_ACTION valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
      * 表单功能明细 触发效果信息
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -2204,7 +2285,6 @@ public class BlockFormEnumUtil {
         }
 
 
-
         public static String valueOfCode(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -2405,7 +2485,6 @@ public class BlockFormEnumUtil {
      * PROCEDURE_INOUT_PARAM（30）：入参-存储过程的出入参（sqlserver没有出参，都算出入参）
      * PROCEDURE_OUT_PARAM（40）：入参-存储过程，函数的出参
      * PROCEDURE_RETURN（50）：入参-存储过程，函数的返回值（mysql存储过程没有返回值，sqlserver有）
-     *
      */
     public enum ORIGIN_PROPERTY_TYPE {
         NORMAL_PROPERTY(10, "正常属性"),

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

@@ -1082,7 +1082,8 @@ public class ImppEnumUtil {
         CONFIG(6, "系统配置"),
         LOG(7, "日志配置"),
         WORK_WECHAT(8, "企业微信配置"),
-        SMS(9, "短信配置");
+        SMS(9, "短信配置"),
+        SSO(10, "单点登录配置");
 
         private final int value;
         private final String description;

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java

@@ -160,14 +160,14 @@ public class BfElement extends BaseBean {
     @ApiParam(value ="默认排序规则")
     private Integer elementSortAttrType;
 
-    @Lob
+//    @Lob
     @Column(name="ELEMENT_CSS_STYLE")
     @ApiParam(value ="元素样式")
     private String elementCssStyle;
 
-    @Lob
+//    @Lob
     @Column(name="ELEMENT_FORMATTER")
-    @ApiParam(value ="元素样式")
+    @ApiParam(value ="元素格式化")
     private String elementFormatter;
 
     @Column(name="ELEMENT_DESCRIPTION")

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java

@@ -62,6 +62,11 @@ public class BfMethodDetailProperty extends BaseBean {
     @ApiParam(value = "主对象元素事件")
     private Integer priElementEvent;
 
+    // 枚举:BlockFormEnumUtil.TRIGGER_ACTION
+    @Column(name = "PRI_ELEMENT_ACTION")
+    @ApiParam(value = "主对象元素动作")
+    private Integer priElementAction;
+
     @Column(name = "SEC_METHOD_DETAIL_ID")
     @ApiParam(value = "关联功能明细id")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailPropertyRef.java

@@ -26,7 +26,7 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="BF_METHOD_DETAIL_PROPERTY")
+@Table(name="BF_METHOD_DETAIL_PROPERTY_REF")
 @Api(value="表单功能明细关联属性",description = "表单功能明细关联属性")
 public class BfMethodDetailPropertyRef extends BaseBean {
 

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

@@ -180,5 +180,5 @@ public class MesPart extends BaseBean implements Serializable {
 
     @Transient
     @ApiParam("是否绑定关键件")
-    private Integer isBingKey;
+    private Integer isBindKey;
 }

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

@@ -190,6 +190,10 @@ public class MesProduceSnTravel extends BaseBean implements Serializable {
     @ApiParam("条码类型名称")
     private String snTypeName;
 
+    @Transient
+    @ApiParam("节拍时间")
+    private Integer cycleTime;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }

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

@@ -0,0 +1,76 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2021/3/4 7:16 PM
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "MES_QUARANTINE_RECORD", indexes = {
+        @Index(columnList = "SERIAL_NUMBER"),
+        @Index(columnList = "PART_NO")
+})
+@Api("隔离记录表")
+public class MesQuarantineRecord extends BaseBean {
+    private static final long serialVersionUID = -4667731056014803186L;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @Column(name = "PART_NO")
+    @ApiParam("零件号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("零件名称")
+    private String partName;
+
+    @Column(name = "QTY")
+    @ApiParam("用量")
+    private Integer qty;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @Column(name = "DEFECT_CODE")
+    @ApiParam("缺陷代码")
+    private String defectCode;
+
+    @Column(name = "DC_CODE")
+    @ApiParam("缺陷原因代码")
+    private String dcCode;
+
+    @Column(name = "REPAIR_CODE")
+    @ApiParam("维修代码")
+    private String repairCode;
+
+    @Column(name = "QUARANTINE_NO")
+    @ApiParam("隔离单号")
+    private String quarantineNo;
+
+    @Column(name = "SCRAP_No")
+    @ApiParam("报废单号")
+    private String scrapNo;
+}

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

@@ -35,6 +35,9 @@ public class BypassModel {
     @ApiParam("状态")
     private String status;
 
+    @ApiParam("检测结果")
+    private Integer result;
+
     @ApiParam("颜色")
     private String color;
 

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import javax.persistence.Column;
 import javax.persistence.Transient;
 
 /**
@@ -147,4 +148,15 @@ public class StepPrintSnModel extends MesProduceSn {
     private String tgPartDesc;
     @ApiParam("泰国过程条码截取前11位")
     private String snTop11;
+
+    @ApiParam("缺陷代码")
+    private String defectCode;
+    @ApiParam("缺陷原因代码")
+    private String dcCode;
+    @ApiParam("维修代码")
+    private String repairCode;
+    @ApiParam("质量代码")
+    private String qcCode;
+    @ApiParam("打印机名称")
+    private String printerName;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQuarantineRecordRepository.java

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesQuarantineRecord;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2021/3/4 7:38 PM
+ * @Modify:
+ */
+public interface MesQuarantineRecordRepository extends BaseRepository<MesQuarantineRecord, Long> {
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LogFieldModel.java

@@ -0,0 +1,39 @@
+package cn.estsh.i3plus.pojo.model.platform;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/2/20 下午4:39
+ * @desc
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("日志字段模型")
+public class LogFieldModel implements Serializable {
+    private static final long serialVersionUID = 6303989757683476327L;
+
+    @ApiParam("日志时间")
+    private String time;
+
+    @ApiParam("线程")
+    private String thread;
+
+    @ApiParam("日志等级")
+    private String level;
+
+    @ApiParam("执行堆栈")
+    private String stack;
+
+    @ApiParam("日志信息")
+    private String message;
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysLogModel.java

@@ -0,0 +1,57 @@
+package cn.estsh.i3plus.pojo.model.platform;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/2/20 下午12:55
+ * @desc
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("系统日志模型")
+public class SysLogModel implements Serializable {
+    private static final long serialVersionUID = -2982120258911167575L;
+
+    @ApiParam("查询日期")
+    private String queryDate;
+
+    @ApiParam("查询开始时间")
+    private String queryBeginTime;
+
+    @ApiParam("查询结束时间")
+    private String queryEndTime;
+
+    @ApiParam("索引名称")
+    private String indexName;
+
+    @ApiParam("索引类型")
+    private Integer indexType;
+
+    @ApiParam("聚合时间")
+    private Integer aggsDuration;
+
+    @ApiParam("日志等级")
+    private Integer level;
+
+    @ApiParam("执行线程")
+    private String thread;
+
+    @ApiParam("服务器环境变量HostId")
+    private String hostId;
+
+    @ApiParam("日志信息")
+    private List<LogFieldModel> logs;
+
+
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SysLoginModel.java

@@ -17,7 +17,7 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @AllArgsConstructor
 @Api("系统登录模型")
-public class SystemLoginModel {
+public class SysLoginModel {
 
     @ApiParam(value = "登录名")
     private String loginName;

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java

@@ -34,6 +34,7 @@ public class SysLogOperate extends BaseBean {
     @ApiParam(value = "系统模块（枚举）", example = "1")
     @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class, refForeignKey = "value", value = "description")
     private Integer softType;
+
     public String getSoftTypeTxt() {
         return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType);
     }
@@ -55,6 +56,9 @@ public class SysLogOperate extends BaseBean {
     @ApiParam(value = "请求IP", access = "请求IP")
     private String remoteIp;
 
+    @ApiParam(value = "本机名/Ip", access = "本机名/Ip")
+    private String serverHost;
+
     @ApiParam(value = "请求路径", access = "请求路径")
     private String requestUrl;
 

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

@@ -77,4 +77,15 @@ public class SwebProcurementPlanOrder extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "TRUE_OR_FALSE")
     private Integer consignment=2;
 
+    @Column(name = "EXP_DATE")
+    @ApiParam(value = "过期日期")
+    private String expDate;
+
+    @Column(name = "ITEM")
+    @ApiParam("行号")
+    private Integer item;
+
+    @Column(name = "START_DATE")
+    @ApiParam(value = "起始日期")
+    private String startDate;
 }

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

@@ -1,8 +1,10 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -53,5 +55,6 @@ public class WmsBhChildDetectionItem extends BaseBean {
     @Column(name = "VALUE_TYPE")
     @ApiParam("值类型")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_VALUE_TYPE")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.BH_VALUE_TYPE.class)
     private Integer valueType;
 }

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

@@ -1,8 +1,10 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -62,11 +64,13 @@ public class WmsPartItemCheck extends BaseBean {
     @Column(name = "VALUE_TYPE")
     @ApiParam("子检测箱值类型")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_VALUE_TYPE")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.BH_VALUE_TYPE.class)
     private Integer valueType;
 
     @Column(name = "STANDARD")
     @ApiParam("标准值")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "BH_PART_CHECK_STD")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.BH_PART_CHECK_STD.class)
     private Integer standard;
 
     @Column(name = "MAX")