Merge remote-tracking branch 'origin/master'

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

@@ -20,6 +20,7 @@ public class CommonEnumUtil {
         CORE(2, "i3core", "i3业务平台"),
         WMS(3, "i3wms", "仓库管理软件"),
         MES(4, "i3mes", "生产管理软件"),
+        CONSOLE(95,"impp-console","服务监控台"),
         GATEWAY(96,"impp-gateway","服务网关"),
         CLOUD(97,"i3cloud","微服务"),
         SURFACE(98,"i3surface","对外服务"),

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

@@ -745,6 +745,7 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
     /**
      * 外部单据：移库单单据类型
      */
@@ -912,6 +913,7 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
     /**
      * 业务表：库存条码质检状态
      */
@@ -1401,7 +1403,7 @@ public class WmsEnumUtil {
     }
 
     /**
-     *作业流程动作类型
+     * 作业流程动作类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ACTION_GROUP_DETAILS_VALUE_TYPE {
@@ -1514,17 +1516,23 @@ public class WmsEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum RC_RESPONSE_TIPS {
 
-        OK(true, "正确"),
+        OK(1, true, "正确"),
-        NG(false, "失败");
+        NG(2, false, "失败");
 
+        private int value;
         private boolean codeStatus;
         private String description;
 
-        RC_RESPONSE_TIPS(boolean codeStatus, String description) {
+        RC_RESPONSE_TIPS(int value, boolean codeStatus, String description) {
+            this.value = value;
             this.codeStatus = codeStatus;
             this.description = description;
         }
 
+        public int getValue() {
+            return value;
+        }
+
         public boolean getCodeStatus() {
             return codeStatus;
         }
@@ -1580,7 +1588,7 @@ public class WmsEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PO_SN_STATUS {
 
-        fOUND(10, "创建"),
+        FOUND(10, "创建"),
         PRINTED(20, "已打印"),
         RECEIPTED(30, "已收货");
 
@@ -1610,4 +1618,117 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 组件类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum COMPONENT_TYPE {
+
+        PROCESS_HANDLING(10, "流程处理组件,"),
+        PROCESS_INITIALIZATION(20, "流程初始化组件"),
+        PROCESS_END(30, "流程结束组件"),
+        DETAIL_PROCESS(40, "明细处理组件"),
+        BACK_DISPLAY(50, "回显示组件");
+
+        private int value;
+        private String description;
+
+        COMPONENT_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        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;
+        }
+    }
+
+    /**
+     * 作业步骤处理组件类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ACTION_MODULE_TYPE {
+        HANDLE(10, "流程处理组件"),
+        INIT(20, "流程初始化组件"),
+        END(30, "流程结束组件"),
+        DETAILS(40, "明细处理组件"),
+        SHOW(50, "回显示组件");
+
+        private int value;
+        private String description;
+
+        ACTION_MODULE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        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;
+        }
+    }
+
+    /**
+     * 条码类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SN_TYPE {
+        ONE_DIMENSIONAL_CODE(10, "一维码"),
+        QR_CODE(20, "二维码"),
+        ALL(30, "ALL");
+
+        private int value;
+        private String description;
+
+        SN_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        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;
+        }
+    }
 }

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

@@ -105,4 +105,8 @@ public class WmsASNMasterDetails extends BaseBean {
     @Column(name="VENDOR_LOT_NO")
     @ApiParam("供应商批次")
     public String vendorLotNo;
+
+    @Column(name="REC_QTY")
+    @ApiParam(value = "已收数量", example = "0")
+    public double recQty;
 }

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

@@ -8,6 +8,7 @@ import lombok.NoArgsConstructor;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * @Description : PDA传输到后台的实体bean对象
@@ -35,10 +36,10 @@ public class WmsActionResponseBean {
     public String message;
 
     @ApiParam("列表信息")
-    public List<String> informations;
+    public Set<String> informations;
 
     @ApiParam("可选项")
-    public List<String> options;
+    public Map<String, Boolean> options;
 
     @ApiParam("选中的明细数据")
     public List<Map<String, Object>> details;
@@ -51,7 +52,7 @@ public class WmsActionResponseBean {
         this.message = message;
     }
 
-    public WmsActionResponseBean(Double percent, String message, List<String> informations,  List<Map<String, Object>> details, Boolean codeStatus) {
+    public WmsActionResponseBean(Double percent, String message, Set<String> informations,  List<Map<String, Object>> details, Boolean codeStatus) {
         this.percent = percent;
         this.message = message;
         this.informations = informations;

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

@@ -50,4 +50,8 @@ public class WmsActionStepCall extends BaseBean {
 
     @ApiParam(value = "组件描述")
     public transient String amDesc;
+
+    @Column(name="AM_TYPE")
+    @ApiParam(value = "组件类型")
+    public transient Integer amType;
 }

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

@@ -70,4 +70,8 @@ public class WmsMoveSn extends BaseBean {
     @Column(name="PACKAGE_NO")
     @ApiParam("容器编号")
     public String packAgeNo;
+
+    @Column(name="QTY")
+    @ApiParam(value = "已收数量", example = "0")
+    public double qty;
 }

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

@@ -25,6 +25,12 @@ public class WmsOperationBean extends BaseBean {
     @ApiParam("可选项的值")
     public List<String> options;
 
+    @ApiParam("设备编号")
+    public String fixNo;
+
+    @ApiParam("作业记录编号")
+    public String alId;
+
     /**
      * 触发源:10=扫描枪,
      * 20=提交按钮,30=重置按钮,40=查看明细， 50=明细(删除)

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

@@ -75,4 +75,8 @@ public class WmsPoSn extends BaseBean {
     @Column(name="GROUP_NO")
     @ApiParam("组条码")
     public String groupNo;
+
+    @Column(name="REC_QTY")
+    @ApiParam(value = "已收数量", example = "0")
+    public double recQty;
 }

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -21,27 +23,28 @@ import javax.persistence.Table;
  **/
 @Data
 @Entity
-@Table(name="WMS_TRANS_TYPE")
+@Table(name = "WMS_TRANS_TYPE")
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Api(value="交易类型表",description = "交易类型表")
+@Api(value = "交易类型表", description = "交易类型表")
-public class WmsTransType extends BaseBean{
+public class WmsTransType extends BaseBean {
 
-    @Column(name="TRANS_TYPE_CODE")
+    @Column(name = "TRANS_TYPE_CODE")
-    @ApiParam(value ="类型编号")
+    @ApiParam(value = "类型编号")
     private String transTypeCode;
 
-    @Column(name="TRANS_TYPE_NAME")
+    @Column(name = "TRANS_TYPE_NAME")
-    @ApiParam(value ="类型名称")
+    @ApiParam(value = "类型名称")
     private String transTypeName;
 
-    @Column(name="SEQ")
+    @Column(name = "SEQ")
-    @ApiParam(value ="序号", example = "-1")
+    @ApiParam(value = "序号", example = "-1")
     private Integer seq;
 
-    @Column(name="PROG_CODE")
+    @Column(name = "PROG_CODE")
-    @ApiParam(value ="处理程序")
+    @ApiParam(value = "处理程序", example = "-1")
-    private String progCode;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long agId;
 
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -240,9 +240,9 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         //查询参数封装
-        HqlPack.getStringLikerPack(wmsTransType.getTransTypeCode(), "transTypeCode", result);
+        HqlPack.getStringEqualPack(wmsTransType.getTransTypeCode(), "transTypeCode", result);
         HqlPack.getStringLikerPack(wmsTransType.getTransTypeName(), "transTypeName", result);
-        HqlPack.getStringLikerPack(wmsTransType.getProgCode(), "progCode", result);
+        HqlPack.getNumEqualPack(wmsTransType.getAgId(), "agId", result);
 
         getStringBuilderPack(wmsTransType, result);
 
@@ -1000,8 +1000,10 @@ public class WmsHqlPack {
         //查询参数封装
         HqlPack.getNumEqualPack(wmsActionStepCall.getAsId(), "asId", result);
         HqlPack.getNumEqualPack(wmsActionStepCall.getAmId(), "amId", result);
+        HqlPack.getNumEqualPack(wmsActionStepCall.getAmType(), "amType", result);
 
         getStringBuilderPack(wmsActionStepCall, result);
+
         HqlPack.getOrderByPack(new Object[]{1}, new String[]{"seq"}, result);
 
         return result.toString();
@@ -1116,6 +1118,7 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         HqlPack.getNumEqualPack(wmsActionStepCallParam.getAgdId(), "agdId", result);
+        HqlPack.getNumEqualPack(wmsActionStepCallParam.getAmId(), "amId", result);
         HqlPack.getNumEqualPack(wmsActionStepCallParam.getSeq(), "seq", result);
         getStringBuilderPack(wmsActionStepCallParam, result);
 
@@ -1155,6 +1158,8 @@ public class WmsHqlPack {
 
         //作业流程id（对应作业记录明细里自增的id）
         HqlPack.getNumEqualPack(wmsActionLogDetails.getAlId(),"alId",result);
+        HqlPack.getNumEqualPack(wmsActionLogDetails.getSeq(),"seq",result);
+
         getStringBuilderPack(wmsActionLogDetails, result);
 
         return  result.toString();