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

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

@@ -751,4 +751,92 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+    /**
+     * 外部单据：移库单单据类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum OUT_MOVEMENT_MASTER_ORDER_TYPE {
+        ORDER_PULL_PART(1, "工单配料");
+
+        private int value;
+        private String description;
+
+        OUT_MOVEMENT_MASTER_ORDER_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;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+    /**
+     * 外部单据：移库单关联单据类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum OUT_MOVEMENT_MASTER_LINK_ORDER_TYPE {
+        ASN(1, "ASN"),
+        PO(10, "PO"),
+        SO(20, "SO");
+
+        private int value;
+        private String description;
+
+        OUT_MOVEMENT_MASTER_LINK_ORDER_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;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -35,7 +35,7 @@ public class WmsDocMovementMaster extends BaseBean {
      */
     @Column(name = "MOVE_TYPE")
     @ApiParam("移动类型")
-    public String moveType;
+    public Integer moveType;
     /**
      * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发,
      * VJ=供应商退货,CJ=客户退货,WP=工单领料,WJ=工单退料,
@@ -66,11 +66,11 @@ public class WmsDocMovementMaster extends BaseBean {
     private Integer version;
 
     /**
-     * 单据类型::1=工单配料
+     * 关联单据类型:1=ASN,10=PO,20=SO
      */
     @Column(name = "REF_TYPE")
     @ApiParam(value = "关联单据类型")
-    private String refType;
+    private Integer refType;
 
     @Column(name = "REF_NO")
     @ApiParam(value = "关联单据")
@@ -85,7 +85,7 @@ public class WmsDocMovementMaster extends BaseBean {
      */
     @Column(name = "ORDER_TYPE")
     @ApiParam(value = "单据类型")
-    private String orderType;
+    private Integer orderType;
 
     @Column(name = "PART_NO")
     @ApiParam(value = "物料编码")

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

@@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.wms.sqlpack;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
-import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
 import cn.estsh.i3plus.pojo.base.tool.SqlPack;
 import cn.estsh.i3plus.pojo.wms.bean.*;
@@ -71,7 +70,6 @@ public class WmsHqlPack {
         //查询参数封装
         HqlPack.getStringLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result);
 
-        HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result);
         HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),
                 "isDeleted", result);
         return result.toString();
@@ -130,7 +128,6 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
         HqlPack.getStringLikerPack(routingCode, "routingCode", result);
 
-        HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result);
         HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),
                 "isDeleted", result);
         return result.toString();
@@ -548,6 +545,8 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsShopping.getOrderNo(), "orderNo", result);
         //客户编码
         HqlPack.getStringEqualPack(wmsShopping.getCustNo(), "custNo", result);
+        //物料编码
+        HqlPack.getStringEqualPack(wmsShopping.getPartNo(), "partNo", result);
         //条码
         HqlPack.getStringLikerPack(wmsShopping.getSn(), "sn", result);
         //发运状态