Merge remote-tracking branch 'origin/dev' into dev

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

@@ -85,27 +85,27 @@ public class AndonRouteStatus extends BaseBean implements Serializable {
     private Long alarmRouteId;
 
     @Transient
-    @ApiParam("默认不缓存")
+    @ApiParam("状态机异常时默认不缓存")
     private boolean cacheFlag = false;
 
     @Transient
-    @ApiParam("触发组件集默认未执行")
+    @ApiParam("当前状态点的触发组件集默认未执行")
     private boolean actionAmgIdFalg = false;
 
     @Transient
-    @ApiParam("触发类型默认不需要外部触发")
+    @ApiParam("进入触发方法时默认不需要校验外部触发")
     private boolean checkTriggerTypeFalg = false;
 
     @Transient
-    @ApiParam("组件执行完成根据业务设置下个触发事件，如果是外部告知下个触发事件则设置null，一个组件集执行完毕后这个值赋给CommonMsgModel的triggerEvent")
+    @ApiParam("每个组件执行完成根据业务设置下个触发事件，如果需要外部告知下个触发事件则设置null，一个组件集执行完毕后将这个值赋给CommonMsgModel的triggerEvent")
     private String nextTriggerEvent;
 
     @Transient
-    @ApiParam("默认继续执行下个组件，当组件集中一个组件根据业务需要跳出去进去下个状态点，则设置未false,同时配置下个状态点的触发事件nextTriggerEvent")
+    @ApiParam("在一个组件集中默认继续执行下一个组件，当组件集中一个组件执行失败或者根据业务需要跳出去进去下个状态点，则设置未false(即这个组件集中剩余的组件停止执行),同时配置下个状态点的触发事件nextTriggerEvent")
     private boolean execNextModuleFlag = true;
 
     @Transient
-    @ApiParam("默认异常未处理")
+    @ApiParam("默认异常未处理，业务异常抛出后，如果需要缓存，则设置cacheFlag为true，因为会被catch捕获，所以这里需要设置为true，避免异常重复被处理")
     private boolean doErrorFlag = false;
 
 }

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

@@ -50,7 +50,7 @@ public class AndonRouteStatusErrorRecord extends BaseBean implements Serializabl
     public String workCenterCode;
 
     @Column(name = "WORK_CELL_CODE")
-    @ApiParam(value = "工作中心")
+    @ApiParam(value = "工作单元")
     public String workCellCode;
 
     @Column(name = "ALARM_CODE")
@@ -65,9 +65,16 @@ public class AndonRouteStatusErrorRecord extends BaseBean implements Serializabl
     @ApiParam(value = "缓存标识")
     private Integer cacheFlag;
 
-    @Lob
-    @Column(name = "CONTENT")
-    @ApiParam(value = "内容")
-    private String content;
+    @Column(name = "CACHE_KEY")
+    @ApiParam(value = "缓存KEY")
+    private String cacheKey;
+
+    @Column(name = "HANDLE_TYPE")
+    @ApiParam(value = "处理方式")
+    private Integer handleType;
+
+    @Column(name = "HANDLE_STATUS")
+    @ApiParam(value = "处理状态")
+    private Integer handleStatus;
 
 }

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/CommonMsgModel.java

@@ -42,4 +42,10 @@ public class CommonMsgModel implements Serializable {
     @ApiModelProperty("触发事件")
     private String triggerEvent;
 
+    @ApiModelProperty("缓存KEY")
+    private String cacheKey;
+
+    @ApiModelProperty("默认非异常内部处理,内部异常处理是设置为true")
+    private boolean errorInnerAction = false;
+
 }

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java

@@ -97,6 +97,7 @@ public class AndonHqlPack {
         DdlPreparedPack.getStringEqualPack(andonMessageRecord.getRpLevel(), "rpLevel", packBean);
         DdlPreparedPack.getStringEqualPack(andonMessageRecord.getRpObjectCode(), "rpObjectCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonMessageRecord.getStatusCode(), "statusCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonMessageRecord.getIsSucceed(), "isSucceed", packBean);
         if(!StringUtils.isEmpty(andonMessageRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(andonMessageRecord.getCreateDateTimeEnd())){
             DdlPreparedPack.timeBuilder(andonMessageRecord.getCreateDateTimeStart(), andonMessageRecord.getCreateDateTimeEnd(), "createDatetime", packBean, true);
         }

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

@@ -13,6 +13,83 @@ import org.apache.commons.lang3.StringUtils;
 public class AndonEnumUtil {
 
     /**
+     * 状态机异常处理方式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ROUTE_STATUS_ERROR_RECORD_HANDLE_TYPE {
+        INNER(10, "内部处理"),
+        OUTER(20, "外部处理"),
+        REVIEW(30, "人工审核");
+
+        private int value;
+        private String description;
+
+        ROUTE_STATUS_ERROR_RECORD_HANDLE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 状态机异常处理状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ROUTE_STATUS_ERROR_RECORD_HANDLE_STATUS {
+        TRUE(10, "已处理"),
+        FALSE(20, "未处理");
+
+        private int value;
+        private String description;
+
+        ROUTE_STATUS_ERROR_RECORD_HANDLE_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 状态机异常缓存标识
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ROUTE_STATUS_ERROR_RECORD_CACHE_FLAG {
+        FALSE(10, "否"),
+        TRUE(20, "是"),
+        ORIGINAL(30, "原先");
+
+        private int value;
+        private String description;
+
+        ROUTE_STATUS_ERROR_RECORD_CACHE_FLAG(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
      * 状态机执行方法
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

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

@@ -2555,7 +2555,7 @@ public class MesPcnEnumUtil {
         CUSTOM_DIALOG("custom_dialog", "定制弹窗"),
         FORM("form", "文本按钮"),
         SPEC_TEXT("spec_text", "工步弹框文本"),
-        SHOW_ASSEMB_TABLE("SHOW_ASSEMB_TABLE", "展示组件表格");
+        SHOW_ASSEMBLE_TABLE("SHOW_ASSEMBLE_TABLE", "展示组件表格");
 
         private String value;
         private String description;
@@ -3939,4 +3939,72 @@ public class MesPcnEnumUtil {
             return valueOf(val);
         }
     }
+
+    /**
+     * 排序校验模式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CHECK_PROD_SEQ_FLAG {
+        PRODUCTION_MATERIAS(10, "NO_SORT_CHECK", "无排序校验"),
+        CUSTOMER_SHPING(20, "QUEUE_BAR_CODE", "按产品队列条码校验排序"),
+        OUTWARD_SHIPMENT(30, "PRODUCT_MATERIAL_NUMBER", "按产品物料号校验排序"),
+        ALLOCATION(40, "SAME_MATERIAL_RACK", "按队列同料架单产品校验排序");
+
+        private int value;
+        private String code;
+        private String description;
+
+        CHECK_PROD_SEQ_FLAG(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(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 String codeOf(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 descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
 }

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

@@ -14,14 +14,14 @@ public class PtlEnumUtil {
      * 流程状态-触发类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum TRIGGER_TYPE {
+    public enum ROUTE_STATUS_TRIGGER_TYPE {
         INNER_TRIGGER(10, "内部触发"),
         OUTER_TRIGGER(20, "外部触发");
 
         private int value;
         private String description;
 
-        TRIGGER_TYPE(int value, String description) {
+        ROUTE_STATUS_TRIGGER_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -73,17 +73,16 @@ public class PtlEnumUtil {
      * 组件状态类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum STATUS_TYPE {
+    public enum ROUTE_STATUS_TYPE {
         START(10, "START", "开始状态"),
         EXECUTING(20, "EXECUTING", "执行中状态"),
-        TERMINATE(30, "TERMINATE", "中断状态"),
-        FINISH(40, "FINISH", "完成状态");
+        FINISH(30, "FINISH", "完成状态");
 
         private int value;
         private String code;
         private String description;
 
-        STATUS_TYPE(int value, String code, String description) {
+        ROUTE_STATUS_TYPE(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;

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

@@ -654,14 +654,14 @@ public class PtlPcnEnumUtil {
      * 流程状态-触发类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum TRIGGER_TYPE {
+    public enum ROUTE_STATUS_TRIGGER_TYPE {
         INNER_TRIGGER(10, "内部触发"),
         OUTER_TRIGGER(20, "外部触发");
 
         private int value;
         private String description;
 
-        TRIGGER_TYPE(int value, String description) {
+        ROUTE_STATUS_TRIGGER_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -931,17 +931,16 @@ public class PtlPcnEnumUtil {
      * 组件状态类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum STATUS_TYPE {
+    public enum ROUTE_STATUS_TYPE {
         START(10, "START", "开始状态"),
         EXECUTING(20, "EXECUTING", "执行中状态"),
-        TERMINATE(30, "TERMINATE", "中断状态"),
-        FINISH(40, "FINISH", "完成状态");
+        FINISH(30, "FINISH", "完成状态");
 
         private int value;
         private String code;
         private String description;
 
-        STATUS_TYPE(int value, String code, String description) {
+        ROUTE_STATUS_TYPE(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;

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

@@ -0,0 +1,63 @@
+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.*;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: jessica.chen
+ * @CreateDate:
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BLIND_HISTORY")
+@Api("MES_盲检记录")
+public class MesBlindHistory extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -7459452475180601499L;
+
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @Column(name = "BLIND_OBJECT")
+    @ApiParam("盲检对象")
+    private String blindObject;
+
+    @Column(name = "BLIND_ITEM")
+    @ApiParam("盲检问题")
+    private String blindItem;
+
+    @Column(name = "SYSTEM_ANSWER")
+    @ApiParam("系统答案")
+    private String systemAnswer;
+
+    @Column(name = "CHOOSED_ANSWER")
+    @ApiParam("选中答案")
+    private String choosedAnswer;
+
+    @Column(name = "CHECKED")
+    @ApiParam("是否一致")
+    private Integer checked;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+}

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

@@ -0,0 +1,65 @@
+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.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: jessica.chen
+ * @CreateDate:
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BLIND_RULE")
+@Api("MES_盲检规则")
+public class MesBlindRule extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -7459452475180601498L;
+
+    @Column(name = "RULE_ID")
+    @ApiParam("匹配规则ID")
+    private String ruleId;
+
+    @Column(name = "CAR_TYPE")
+    @ApiParam("车辆类型")
+    private String carType;
+
+    @Column(name = "CAR_COLOR")
+    @ApiParam("车辆颜色")
+    private String carColor;
+
+    @Column(name = "PART_CODE")
+    @ApiParam("零件号")
+    private String partCode;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("零件名称")
+    private String partName;
+
+    @Column(name = "CAR_CONFIG")
+    @ApiParam("配置")
+    private String carConfig;
+
+    @Column(name = "CAR_LEVEL")
+    @ApiParam("等级")
+    private String carLevel;
+
+    @Column(name = "PART_COLOR")
+    @ApiParam("零件颜色")
+    private String partColor;
+
+}

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

@@ -0,0 +1,65 @@
+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.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: jessica.chen
+ * @CreateDate:
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BLIND_TOPIC_SETTING")
+@Api("MES_盲检问题设置")
+public class MesBlindTopicSetting extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -7459452475180601497L;
+
+    @Column(name = "TOPIC_ID")
+    @ApiParam("序号")
+    private String topicId;
+
+    @Column(name = "TOPIC_CODE")
+    @ApiParam("题目编号")
+    private String topicCode;
+
+    @Column(name = "TOPIC_DESC")
+    @ApiParam("题目描述")
+    private String topicDesc;
+
+    @Column(name = "TOPIC_OBJECT")
+    @ApiParam("零件名称")
+    private String topicObject;
+
+    @Column(name = "TOPIC_TYPE")
+    @ApiParam("盲检类型")
+    private Integer topicType;
+
+    @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;
+
+}

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

@@ -62,6 +62,10 @@ public class MesEsop extends BaseBean implements Serializable {
     @ApiParam("文件id")
     private Long fileId;
 
+    @Column(name = "ESOP_URL")
+    @ApiParam("文件路径")
+    private String esopUrl;
+
     @Transient
     @ApiParam("文件名称")
     private String fileName;
@@ -90,4 +94,8 @@ public class MesEsop extends BaseBean implements Serializable {
     @ApiParam("同步标记")
     private Integer syncTag = 0;
 
+    @Transient
+    @ApiParam("过程条码")
+    private String serialNumber;
+
 }

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

@@ -25,7 +25,7 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "IF_PACKAGE_DETAIL")
+@Table(name = "MES_GUN_CALIBRATION_RECORD")
 @Api("校枪记录表")
 public class MesGunCalibrationRecord extends BaseBean implements Serializable {
 

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

@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+* @Description : 盲检问题清单
+* @Reference :
+* @author: jessica.chen
+* @date: 2020/4/16 17:10
+* @Modify:
+*/
+
+@Data
+@Api(value="盲检问题清单",description = "盲检问题清单")
+public class MesBlindProbleModel extends BaseBean {
+
+    private static final long serialVersionUID = 5790342327875844345L;
+    @ApiParam(value = "零件名称")
+    private String partName;
+
+    @ApiParam(value = "提问内容")
+    private String questionContents;
+
+    @ApiParam(value = "答案集合")
+    private List<String> answerList;
+
+    @ApiParam(value = "正确答案")
+    private String rightKey;
+}

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

@@ -0,0 +1,53 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+* @Description : 盲检规则模板
+* @Reference :
+* @author: jessica.chen
+* @date: 2020/4/16 17:10
+* @Modify:
+*/
+
+@Data
+@Api(value="盲检规则模板",description = "盲检规则模板")
+public class MesBlindRuleModel extends BaseBean {
+
+    private static final long serialVersionUID = 5790342327875844321L;
+    @ApiParam(value = "车辆类型")
+    @AnnoOutputColumn
+    private String carType;
+
+    @ApiParam(value = "车辆颜色")
+    @AnnoOutputColumn
+    private String carColor;
+
+    @ApiParam(value = "零件号")
+    private String partCode;
+
+    @ApiParam(value = "零件名称")
+    @AnnoOutputColumn
+    private String partName;
+
+    @ApiParam(value = "配置")
+    @AnnoOutputColumn
+    private String carConfig;
+
+    @ApiParam(value = "等级")
+    @AnnoOutputColumn
+    private String carLevel;
+
+    @ApiParam(value = "零件颜色")
+    @AnnoOutputColumn
+    private String partColor;
+
+    @ApiParam(value = "下标")
+    @AnnoOutputColumn
+    private Integer index;
+
+}

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

@@ -135,6 +135,9 @@ public class StationRequestBean implements Serializable {
     @ApiParam("工步弹框参数")
     private String stepDialogParam;
 
+    @ApiParam("工步弹框状态")
+    private Boolean stepDialogStatus = false;
+
     @Override
     public String toString() {
         return "StationRequestBean{" +

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesBlindHistory;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: jessica.chen
+ * @CreateDate: 2019\11\18 10:34
+ * @Modify:
+ **/
+public interface MesBlindHistoryRepository extends BaseRepository<MesBlindHistory, Long> {
+}

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesBlindRule;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: jessica.chen
+ * @CreateDate: 2019\11\18 10:34
+ * @Modify:
+ **/
+public interface MesBlindRuleRepository extends BaseRepository<MesBlindRule, Long> {
+}

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesBlindHistory;
+import cn.estsh.i3plus.pojo.mes.bean.MesBlindTopicSetting;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: jessica.chen
+ * @CreateDate: 2019\11\18 10:34
+ * @Modify:
+ **/
+public interface MesBlindTopicSettingRepository extends BaseRepository<MesBlindTopicSetting, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -2888,6 +2888,29 @@ public class MesHqlPack {
         return result;
     }
 
+//    public static DdlPackBean getMesBlindRule(MesBlindRule mesBlindRule) {
+//        DdlPackBean packBean = getAllBaseData(mesBlindRule.getOrganizeCode());
+//        DdlPreparedPack.getStringLikerPack(mesBlindRule.getCarType(), "carType", packBean);
+//        DdlPreparedPack.getStringLikerPack(mesBlindRule.getCarColor(), "carColor", packBean);
+//        DdlPreparedPack.getStringLikerPack(mesBlindRule.getPartCode(), "partCode", packBean);
+//        DdlPreparedPack.getStringEqualPack(mesBlindRule.getPartName(), "partName", packBean);
+//        DdlPreparedPack.getStringEqualPack(mesBlindRule.getCarConfig(), "carConfig", packBean);
+//        DdlPreparedPack.getStringEqualPack(mesBlindRule.getCarLevel(), "carLevel", packBean);
+//        DdlPreparedPack.getStringEqualPack(mesBlindRule.getPartColor(), "partColor", packBean);
+//        DdlPreparedPack.getNumEqualPack(mesBlindRule.getIsValid(), "isValid", packBean);
+//        return packBean;
+//    }
+
+//    public static DdlPackBean getMesBlindTopicSetting(MesBlindTopicSetting mesBlindTopicSetting) {
+//        DdlPackBean packBean = getAllBaseData(mesBlindTopicSetting.getOrganizeCode());
+//        DdlPreparedPack.getStringLikerPack(mesBlindTopicSetting.getTopicCode(), "topicCode()", packBean);
+//        DdlPreparedPack.getStringLikerPack(mesBlindTopicSetting.getTopicDesc(), "topicDesc", packBean);
+//        DdlPreparedPack.getStringLikerPack(mesBlindTopicSetting.getWorkCellCode(), "workCellCode", packBean);
+//        DdlPreparedPack.getStringEqualPack(mesBlindTopicSetting.getWorkCenterCode(), "workCenterCode", packBean);
+//        DdlPreparedPack.getNumEqualPack(mesBlindTopicSetting.getIsValid(), "isValid", packBean);
+//        return packBean;
+//    }
+
     /**
      * MES 校枪记录
      *

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

@@ -100,6 +100,9 @@ public class TorqueCollectionModel implements Serializable {
     @ApiParam("组合码")
     private String groupCode;
 
+    @ApiParam("是否黄枪")
+    private Integer isYellowGun;
+
     /**
      * 大枪查询结果构造方法
      * @param vinCode

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatus.java

@@ -85,8 +85,20 @@ public class PtlRouteStatus extends BaseBean implements Serializable {
     private boolean actionAmgIdFalg = false;
 
     @Transient
-    @ApiParam("触发组件集默认未执行")
+    @ApiParam("触发类型默认不需要外部触发")
     private boolean checkTriggerTypeFalg = false;
 
+    @Transient
+    @ApiParam("组件执行完成根据业务设置下个触发事件，如果是外部告知下个触发事件则设置null，一个组件集执行完毕后这个值赋给CommonMsgModel的triggerEvent")
+    private String nextTriggerEvent;
+
+    @Transient
+    @ApiParam("默认继续执行下个组件，当组件集中一个组件根据业务需要跳出去进去下个状态点，则设置未false,同时配置下个状态点的触发事件nextTriggerEvent")
+    private boolean execNextModuleFlag = true;
+
+    @Transient
+    @ApiParam("默认异常未处理")
+    private boolean doErrorFlag = false;
+
 
 }

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatusErrorRecord.java

@@ -0,0 +1,64 @@
+package cn.estsh.i3plus.pojo.ptl.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.Column;
+import javax.persistence.Entity;
+import javax.persistence.Lob;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author wangjie
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "PTL_ROUTE_STATUS_ERROR_RECORD")
+@EqualsAndHashCode(callSuper = true)
+@Api("流程状态异常记录")
+public class PtlRouteStatusErrorRecord extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 4507582337334278877L;
+
+    @Column(name = "ROUTE_CODE")
+    @ApiParam("流程代码")
+    private String routeCode;
+
+    @Column(name = "STATUS_CODE")
+    @ApiParam("状态代码")
+    private String statusCode;
+
+    @Column(name = "TASK_NO")
+    @ApiParam("主任务编号")
+    private String taskNo;
+
+    @Column(name = "ERROR_DESC")
+    @ApiParam(value = "失败描述")
+    public String errorDesc;
+
+    @Column(name = "AREA_NO")
+    @ApiParam("区域代码")
+    private String areaNo;
+
+    @Column(name = "CACHE_FLAG")
+    @ApiParam(value = "缓存标识")
+    private Integer cacheFlag;
+
+    @Lob
+    @Column(name = "CONTENT")
+    @ApiParam(value = "内容")
+    private String content;
+
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java

@@ -1,6 +1,5 @@
 package cn.estsh.i3plus.pojo.ptl.model;
 
-import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.ptl.bean.PtlRouteStatus;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -31,9 +30,6 @@ public class CommonMsgModel implements Serializable {
     @ApiModelProperty("消息类型")
     private String msgType;
 
-    @ApiModelProperty("是否重试")
-    private Integer isRestart= CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
-
     @ApiModelProperty("消息数据")
     private Map<String, Object> msgData;
 
@@ -52,4 +48,7 @@ public class CommonMsgModel implements Serializable {
     @ApiModelProperty("外部触发事件")
     private String triggerEvent;
 
+    @ApiModelProperty("流程类型")
+    private Integer routeType;
+
 }

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlRouteStatusErrorRecordRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.ptl.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.ptl.bean.PtlRouteStatusErrorRecord;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface PtlRouteStatusErrorRecordRepository extends BaseRepository<PtlRouteStatusErrorRecord, Long> {
+}

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java

@@ -31,6 +31,14 @@ import javax.persistence.Version;
 public class SwebDocMovementDetails extends BaseBean {
     private static final long serialVersionUID = -1232334350341792942L;
 
+    @ApiParam("供应商编号")
+    @Column(name = "VENDOR_CODE")
+    private String vendorCode;
+
+    @ApiParam("供应商名称")
+    @Column(name = "VENDOR_NAME")
+    private String vendorName;
+
     @Column(name = "DEST_AREA_NO")
     @ApiParam("目的库存地代码")
     public String destAreaNo;

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementMaster.java

@@ -91,9 +91,13 @@ public class SwebDocMovementMaster extends BaseBean {
     @ApiParam(value = "关联单据")
     private String refNo;
 
-    @Column(name = "VENDOR_NO")
-    @ApiParam(value = "供应商编号")
-    private String vendorNo;
+    @ApiParam("供应商编号")
+    @Column(name = "VENDOR_CODE")
+    private String vendorCode;
+
+    @ApiParam("供应商名称")
+    @Column(name = "VENDOR_NAME")
+    private String vendorName;
 
     @Column(name = "VERSION")
     @ApiParam(value = "版本", example = "1")
@@ -111,7 +115,7 @@ public class SwebDocMovementMaster extends BaseBean {
     @ApiParam("打印状态")
     private Integer printStatus;
 
-    @Column(name = "PRINT_STATUS")
+    @Column(name = "IS_SN")
     @ApiParam("打印状态")
     private Integer isSn;
 

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementSn.java

@@ -74,4 +74,12 @@ public class SwebDocMovementSn extends BaseBean {
     @Column(name = "SN_TYPE")
     @ApiParam(value = "条码类型")
     private Integer snType;
+
+    @ApiParam("供应商编号")
+    @Column(name = "VENDOR_CODE")
+    private String vendorCode;
+
+    @ApiParam("供应商名称")
+    @Column(name = "VENDOR_NAME")
+    private String vendorName;
 }

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java

@@ -175,6 +175,7 @@ public class SwebHqlPack {
     public static DdlPackBean getDocMovementMaster(SwebDocMovementMaster master) {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringLikerPack(master.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getStringLikerPack(master.getVendorCode(), "vendorCode", result);
         DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
         return buildHql(master, result);
     }
@@ -182,6 +183,7 @@ public class SwebHqlPack {
     public static DdlPackBean getDocMovementDetails(SwebDocMovementDetails details) {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringLikerPack(details.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getStringLikerPack(details.getVendorCode(), "vendorCode", result);
         DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result);
         return buildHql(details, result);
     }

sonar-project.properties

@@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo
 # defaults to project key
 sonar.projectName=i3plus-pojo
 # defaults to 'not provided'
-sonar.projectVersion=1.0-DEV-SNAPSHOT
+sonar.projectVersion=1.0-TEST-SNAPSHOT
  
 # Path is relative to the sonar-project.properties file. Defaults to .
 #sonar.sources=./