Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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

@@ -1332,7 +1332,8 @@ public class MesEnumUtil {
         MES_STATION_BOM(210, "工位BOM表"),
         MES_DATA_OBJECT(220, "数据对象"),
         MES_OBJECT_CFG(230, "对象结构"),
-        MES_WC_CHECK(240, "开线检查");
+        MES_WC_CHECK(240, "开线检查"),
+        MES_QC_CHECK_STANDARD(250, "质量检测标准");
 
         private int value;
         private String description;
@@ -1490,8 +1491,8 @@ public class MesEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MES_STATION_BOM_IS_REPEAT {
 
-        REPEATABLE(1, "可重复"),
+        REPEATABLE(1, "是"),
-        NOT_REPEAT(2, "不可重复");
+        NOT_REPEAT(2, "否");
 
         private int value;
         private String description;

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

@@ -12,6 +12,43 @@ import org.apache.commons.lang3.StringUtils;
  **/
 public class MesPcnEnumUtil {
 
+    /**
+     * MesMethod实体对应的methodType值
+     * 10.
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum METHOD_TYPE {
+
+        EXEC(10, "执行方法"),
+        COMPLETE(20, "完成方法");
+
+        private int value;
+        private String description;
+
+        METHOD_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;
+        }
+    }
+
 
     /**
      * mes 工位Bom  是否可重复
@@ -19,8 +56,8 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MES_STATION_BOM_IS_REPEAT {
 
-        REPEATABLE(1, "可重复"),
+        REPEATABLE(1, "是"),
-        NOT_REPEAT(2, "不可重复");
+        NOT_REPEAT(2, "否");
 
         private int value;
         private String description;

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

@@ -0,0 +1,50 @@
+package cn.estsh.i3plus.pojo.mes.pcn.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;
+
+/**
+ * @Description :mes系统业务事件
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-12
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_EVENT")
+@Api("系统业务事件")
+public class MesEvent extends BaseBean {
+    @Column(name = "EVENT_CODE")
+    @ApiParam("事件代码")
+    private String eventCode;
+
+    @Column(name = "EVENT_NAME")
+    @ApiParam("事件名称")
+    private String eventName;
+
+    @Column(name = "EVENT_TYPE")
+    @ApiParam("事件类型")
+    private Integer eventType;
+
+    @Column(name = "BUTTON_CODE")
+    @ApiParam("按钮代码")
+    private String buttonCode;
+
+    public int getEventTypeVal() {
+        return this.eventType == null ? 0 : this.eventType;
+    }
+}

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

@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.mes.pcn.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :mes系统业务事件动作
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-12
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_EVENT_ACTION")
+@Api("系统业务事件动作")
+public class MesEventAction extends BaseBean {
+    @Column(name = "EVENT_CODE")
+    @ApiParam("事件代码")
+    private String eventCode;
+
+    @Column(name = "ACTION_CODE")
+    @ApiParam("动作代码")
+    private String actionCode;
+
+    @Column(name = "SEQ")
+    @ApiParam("序号")
+    private Integer seq;
+
+    public int getSeqVal() {
+        return this.seq == null ? 0 : this.seq;
+    }
+
+
+}

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

@@ -0,0 +1,53 @@
+package cn.estsh.i3plus.pojo.mes.pcn.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;
+
+/**
+ * @Description :mes系统业务方法
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-12
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_METHOD")
+@Api("系统业务方法")
+public class MesMethod extends BaseBean {
+    @Column(name = "METHOD_CODE")
+    @ApiParam("方法代码")
+    private String methodCode;
+
+    @Column(name = "METHOD_NAME")
+    @ApiParam("方法名称")
+    private String methodName;
+
+    @Column(name = "CALL_CLASS")
+    @ApiParam("具体实现类")
+    private String callClass;
+
+    /**
+     * 10-执行方法（不需要返回值），20-完成方法（返回ResultBean）
+     */
+    @Column(name = "METHOD_TYPE")
+    @ApiParam("方法类型")
+    private Integer methodType;
+
+    public int getMethodTypeVal() {
+        return this.methodType == null ? 0 : this.methodType;
+    }
+}

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

@@ -0,0 +1,38 @@
+package cn.estsh.i3plus.pojo.mes.pcn.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description : 动作请求参数
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-12
+ * @Modify:
+ **/
+@Data
+public class ActionRequestBean<Obj> implements Serializable {
+
+    @ApiParam("事件代码")
+    @Deprecated
+    public String eventCode;
+
+    @ApiParam("按钮代码")
+    public String buttonCode;
+
+    @ApiParam("单个结果")
+    public Obj resultObject;
+
+    @ApiParam("List请求集")
+    public List<Obj> resultList;
+
+    @ApiParam("Map请求集")
+    public Map<String, Object> resultMap;
+
+    @ApiParam("目的状态")
+    private Integer destStatus;
+}

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

@@ -35,6 +35,8 @@ public class RequestModel {
 
     private List<String> orderNoList;//工单编号
 
+    private ActionRequestBean actionRequestBean;//工单状态
+
     public RequestModel(List<MesQueueOrder> queueOrderList, Double currentSeq, Double nextSeq) {
         this.queueOrderList = queueOrderList;
         this.currentSeq = currentSeq;
@@ -111,6 +113,10 @@ public class RequestModel {
         return orderNoList;
     }
 
+    public void setActionRequestBean(ActionRequestBean actionRequestBean) { this.actionRequestBean = actionRequestBean; }
+
+    public ActionRequestBean getActionRequestBean() { return actionRequestBean; }
+
     public Double getCurrentSeq() {
         return currentSeq == null ? 0.0d : currentSeq;
     }

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesEvent;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesEventRepository extends BaseRepository<MesEvent, Long> {
+
+}

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

@@ -371,4 +371,11 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    public static DdlPackBean getMesEventByButtonCode(String buttonCode, String org) {
+        DdlPackBean packBean = getAllBaseData(org);
+        DdlPreparedPack.getStringEqualPack(buttonCode, "buttonCode", packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
+        return packBean;
+    }
 }

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

@@ -76,4 +76,26 @@ public class StationRequestBean implements Serializable {
     @ApiParam("工步列表")
     private List<StepModel> stepList;
 
+    @Override
+    public String toString() {
+        return "StationRequestBean{" +
+                "scanInfo='" + scanInfo + '\'' +
+                ", serialNumber='" + serialNumber + '\'' +
+                ", partNo='" + partNo + '\'' +
+                ", organizeCode='" + organizeCode + '\'' +
+                ", organizeName='" + organizeName + '\'' +
+                ", workCenterCode='" + workCenterCode + '\'' +
+                ", workCellCode='" + workCellCode + '\'' +
+                ", routeCode='" + routeCode + '\'' +
+                ", processCode='" + processCode + '\'' +
+                ", clientInfo='" + clientInfo + '\'' +
+                ", userInfo='" + userInfo + '\'' +
+                ", buttonCode='" + buttonCode + '\'' +
+                ", stepCode='" + stepCode + '\'' +
+                ", busiType='" + busiType + '\'' +
+                ", workOrderNo='" + workOrderNo + '\'' +
+                ", tray='" + tray + '\'' +
+                ", finishCount=" + finishCount +
+                '}';
+    }
 }