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

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

@@ -31,6 +31,7 @@ public class AndonHqlPack {
         DdlPreparedPack.getStringEqualPack(andonCellAlarmCause.getOrganizeCode(), "organizeCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonCellAlarmCause.getWorkCenterCode(), "workCenterCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonCellAlarmCause.getWorkCellCode(), "workCellCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonCellAlarmCause.getAcCode(), "acCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonCellAlarmCause.getAlarmCode(), "alarmCode", packBean);
         return packBean;
     }
@@ -45,6 +46,7 @@ public class AndonHqlPack {
         DdlPreparedPack.getStringEqualPack(andonEventMethod.getOrganizeCode(), "organizeCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonEventMethod.getWorkCenterCode(), "workCenterCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonEventMethod.getWorkCellCode(), "workCellCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonEventMethod.getAlarmCode(), "alarmCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonEventMethod.getEmCode(), "emCode", packBean);
         return packBean;
     }
@@ -59,6 +61,7 @@ public class AndonHqlPack {
         DdlPreparedPack.getStringEqualPack(andonEventCause.getOrganizeCode(), "organizeCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonEventCause.getWorkCenterCode(), "workCenterCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonEventCause.getWorkCellCode(), "workCellCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonEventCause.getAlarmCode(), "alarmCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonEventCause.getEcCode(), "ecCode", packBean);
         return packBean;
     }
@@ -73,6 +76,7 @@ public class AndonHqlPack {
         DdlPreparedPack.getStringEqualPack(andonEventPhenoMenon.getOrganizeCode(), "organizeCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonEventPhenoMenon.getWorkCenterCode(), "workCenterCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonEventPhenoMenon.getWorkCellCode(), "workCellCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonEventPhenoMenon.getAlarmCode(), "alarmCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonEventPhenoMenon.getEpmCode(), "epmCode", packBean);
         return packBean;
     }

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

@@ -713,4 +713,50 @@ public class AndonEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 接口调用标识
+
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ANDON_CALL_TYPE{
+        MANAGE("10","管理界面"),
+        QUEUE ("20","队列");
+
+        private String value;
+        private String description;
+
+        ANDON_CALL_TYPE(String value,String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (StringUtils.equalsIgnoreCase(values()[i].value, val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String descriptionOfValue(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (StringUtils.equalsIgnoreCase(values()[i].description, val)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -102,6 +102,10 @@ public class WmsLocate extends BaseBean {
     @Transient
     private String factory;
 
+    @Column(name = "ENCRYPTION_NO")
+    @ApiParam(value = "加密编码")
+    private String encryptionNo;
+
     public Integer getMaxPackageQty() {
         return this.maxPackageQty == null ? 0 : this.maxPackageQty.intValue();
     }

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

@@ -151,7 +151,9 @@ public class WmsMoveSn extends BaseBean {
     @ApiParam("特殊批次")
     public String fixLotNo;
 
-
+    @Column(name="VENDOR_NO")
+    @ApiParam("供应商编号")
+    private String vendorNo;
 
     @Transient
     @ApiParam("业务类型编码")
@@ -171,10 +173,6 @@ public class WmsMoveSn extends BaseBean {
     private String ZoneNo;
 
     @Transient
-    @ApiParam("供应商编码")
-    private String vendorNo;
-
-    @Transient
     @ApiParam("交易类型名称")
     private String transTypeName;
 

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

@@ -109,6 +109,10 @@ public class WmsPOMaster extends BaseBean {
     @ApiParam(value = "是否生成条码", example = "1")
     public Integer isSn;
 
+    @Column(name = "CONTAINER_NO")
+    @ApiParam("集装箱号")
+    public String containerNo;
+
     @Transient
     @ApiParam(value = "工厂名称")
     public String organizeName;