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

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

@@ -181,7 +181,7 @@ public class AndonManageQueue extends BaseBean {
 
     @Column(name = "EC_DESC")
     @ApiParam(value = "事件具体原因")
-    private String ec_desc;
+    private String ecDesc;
 
     @Column(name = "EM_CODE")
     @ApiParam(value = "事件方法代码")

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

@@ -181,7 +181,7 @@ public class AndonManageRecord extends BaseBean {
 
     @Column(name = "EC_DESC")
     @ApiParam(value = "事件具体原因")
-    private String ec_desc;
+    private String ecDesc;
 
     @Column(name = "EM_CODE")
     @ApiParam(value = "事件方法代码")

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

@@ -138,6 +138,20 @@ public class AndonHqlPack {
     }
 
     /**
+     * 按条件查询ANDON事件处理方法
+     * @param andonEventMethod
+     * @return
+     */
+    public static DdlPackBean packHqlAndonAlarmEventMethod(AndonEventMethod andonEventMethod){
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(andonEventMethod.getAlarmCode(), "alarmCode", result);
+        getStringBuilderPack(andonEventMethod, result);
+
+        return result;
+    }
+
+    /**
      * 按条件查询ANDON事件原因
      * @param andonEventCause
      * @return

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

@@ -150,15 +150,14 @@ public class AndonEnumUtil {
 
     /**
      * 优先级别
-     * 1 - 一级，2 - 二级，3 - 三级，4 - 四级
+     * 10 - 一级，20 - 二级，30 - 三级
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ALARM_PRIORITY{
 
-        FIRST(1,"一级"),
-        SECOND(2,"二级"),
-        THIRD(3,"三级"),
-        FOURTH(4,"四级");
+        FIRST(10,"一级"),
+        SECOND(20,"二级"),
+        THIRD(30,"三级");
 
         private int value;
         private String description;

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

@@ -578,9 +578,9 @@ public class MesEnumUtil {
     public enum PROD_ORG_LEVEL{
 
         LEVEL_ONE(1,"一级目录"),
-        LEVEL_TWO(1,"二级目录"),
-        LEVEL_THREE(1,"三级目录"),
-        LEVEL_FOUR(1,"四级目录");
+        LEVEL_TWO(2,"二级目录"),
+        LEVEL_THREE(3,"三级目录"),
+        LEVEL_FOUR(4,"四级目录");
 
         private int value;
         private String description;

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

@@ -28,12 +28,16 @@ import javax.persistence.Table;
 @Api("生产队列明细")
 public class MesQueueOrderDetail extends BaseBean {
     @Column(name="ORDER_NO")
-    @ApiParam("工单号")
+    @ApiParam("主队列编号")
     private String orderNo;
 
     @Column(name="PART_NO")
     @ApiParam("物料号")
-    private Integer partNo;
+    private String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
 
     @Column(name="SERIAL_NUMBER")
     @ApiParam("产品条码")
@@ -53,7 +57,7 @@ public class MesQueueOrderDetail extends BaseBean {
 
     @Column(name="WORK_TYPE")
     @ApiParam("生产类型")
-    private String workType;
+    private String workOrderType;
 
     @Column(name="PRODUCE_CATEGORY")
     @ApiParam("产品类型")

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

@@ -52,42 +52,25 @@ public class WmsActionGroup extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long initAmId;
 
-//    @Transient
-//    @ApiParam(value = "初始化组件名称")
-//    private String initAmName;
-
     @Column(name = "DETAILS_AM_ID")
     @ApiParam(value = "明细处理组件编号", example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long detailsAmId;
 
-//    @Transient
-//    @ApiParam(value = "明细处理组件名称")
-//    private String detailsAmName;
-
-    @Column(name = "SUBMIT_AM_ID")
-    @ApiParam(value = "提交组件编号", example = "0")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long submitAmId;
-
-//    @Transient
-//    @ApiParam(value = "提交组件名称")
-//    private String submitAmName;
-
     @Column(name = "END_AM_ID")
     @ApiParam(value = "结束组件编号", example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long endAmId;
-//
-//    @Transient
-//    @ApiParam(value = "结束组件名称")
-//    private String endAmName;
 
     // 1=true, 2 = false
     @Column(name = "AUTO_INIT")
     @ApiParam(value = "任务自动初始化", example = "0")
     private Integer autoInit;
 
+    @Column(name = "POSITION")
+    @ApiParam(value = "GOJS位置")
+    private String position;
+
     public Long getInitAmId() {
         if (initAmId != null) {
             return initAmId.longValue();

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

@@ -27,7 +27,7 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="WMS_ACTION_GROUP_DETAILS")
+@Table(name = "WMS_ACTION_GROUP_DETAILS")
 @Api("作业流程明细")
 public class WmsActionGroupDetails extends BaseBean {