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

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

@@ -0,0 +1,38 @@
+package cn.estsh.i3plus.pojo.andon.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 : ANDON_动作
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2019-05-13 9:47
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="ANDON_ACTION")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("ANDON_动作")
+public class AndonAction extends BaseBean {
+
+    @Column(name = "ACTION_CODE")
+    @ApiParam(value = "动作代码")
+    private String actionCode;
+
+    @Column(name = "ACTION_NAME")
+    @ApiParam(value = "动作名称")
+    private String actionName;
+}

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

@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.andon.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 : ANDON_呼叫原因
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2019-05-13 9:50
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="ANDON_ALARM_CAUSE")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("ANDON_呼叫原因")
+public class AndonAlarmCause extends BaseBean {
+
+    @Column(name = "AC_CODE")
+    @ApiParam(value = "呼叫原因代码")
+    private String acCode;
+
+    @Column(name = "AC_NAME")
+    @ApiParam(value = "呼叫原因描述")
+    private String acName;
+
+    @Column(name = "PARENT_AC_CODE")
+    @ApiParam(value = "父阶原因代码")
+    private String parentAcCode;
+}

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

@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.andon.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 : ANDON_呼叫通知配置
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2019-05-13 9:53
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="ANDON_ALARM_RESPONSE_CFG")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("ANDON_呼叫通知配置")
+public class AndonAlarmResponseCfg extends BaseBean {
+
+    @Column(name = "ALARM_CODE")
+    @ApiParam(value = "安灯类型代码")
+    private String alarmCode;
+
+    @Column(name = "ANDON_STATUS")
+    @ApiParam(value = "安灯状态")
+    private String andonStatus;
+
+    @Column(name = "RP_WHERE")
+    @ApiParam(value = "通知条件时长")
+    private String rpWhere;
+
+    @Column(name = "RP_CODE")
+    @ApiParam(value = "通知方式代码")
+    private String rpCode;
+
+    @Column(name = "RP_OBJECT_CODE")
+    @ApiParam(value = "通知对象代码")
+    private String rpObjectCode;
+
+    @Column(name = "RP_LEVEL")
+    @ApiParam(value = "通知级别")
+    private String rpLevel;
+}

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

@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.andon.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 : ANDON_事件原因
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2019-05-13 9:40
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="ANDON_EVENT_CAUSE")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("ANDON_事件原因")
+public class AndonEventCause extends BaseBean {
+
+    @Column(name = "EC_CODE")
+    @ApiParam(value = "事件原因代码")
+    private String ecCode;
+
+    @Column(name = "EC_NAME")
+    @ApiParam(value = "事件原因描述")
+    private String ecName;
+
+    @Column(name = "PARENT_EC_CODE")
+    @ApiParam(value = "父阶原因代码")
+    private String parentEcCode;
+}

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

@@ -0,0 +1,38 @@
+package cn.estsh.i3plus.pojo.andon.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 : ANDON_停机类型
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2019-05-13 9:45
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="ANDON_HALT_TYPE")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("ANDON_停机类型")
+public class AndonHaltType extends BaseBean {
+
+    @Column(name = "HALT_CODE")
+    @ApiParam(value = "停机类型代码")
+    private String haltCode;
+
+    @Column(name = "HALT_NAME")
+    @ApiParam(value = "停机类型名称")
+    private String haltName;
+}

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

@@ -45,10 +45,10 @@ public class MesHqlPack {
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean);
 
         if (StringUtils.isNotEmpty(mesPlanOrder.getOrderNo())) {
-            DdlPreparedPack.getStringEqualPack(mesPlanOrder.getOrderNo(), "orderNo", packBean);
+            DdlPreparedPack.getStringLikerPack(mesPlanOrder.getOrderNo(), "orderNo", packBean);
         }
         if (StringUtils.isNotEmpty(mesPlanOrder.getPartNo())) {
-            DdlPreparedPack.getStringEqualPack(mesPlanOrder.getPartNo(), "partNo", packBean);
+            DdlPreparedPack.getStringLikerPack(mesPlanOrder.getPartNo(), "partNo", packBean);
         }
         if (StringUtils.isNotEmpty(mesPlanOrder.getPlanType() + "") && mesPlanOrder.getPlanTypeVal() != 0) {
             DdlPreparedPack.getNumEqualPack(mesPlanOrder.getPlanType(), "planType", packBean);