Merge branch 'dev' of i3-IMPP/i3plus-pojo into test

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

@@ -643,8 +643,8 @@ public class WmsEnumUtil {
         KT_DEFINITE(430,"KT_DEFINITE", "KT合格"),
 		VDA_PACKAGE_MANAGE(440,"VDA_PACKAGE_MANAGE", "VDA编组管理"),
         KT_PURCHASE_RC(450,"KT_PURCHASE_RC", "采购收货"),
-        KT_PACK_RC(460,"KT_PACK_RC", "坤泰包装收货");
+        KT_PACK_RC(460,"KT_PACK_RC", "坤泰包装收货"),
-
+        FINISH_PRODUCT_SHPING(470, "FINISH_PRODUCT_SHPING", "成品发运");
 
         private int value;
         private String code;

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

@@ -60,8 +60,4 @@ public class BasCustomer extends BaseBean {
     @Column(name = "CUST_FAX")
     @ApiParam(value = "传真")
     private String custFax;
-
-    @Column(name = "SHIPP_QTY")
-    @ApiParam(value = "发运数量控制")
-    private Integer shippQty;
 }

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

@@ -151,6 +151,10 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam(value = "计划日期")
     private String assignPlanDate;
 
+    @Column(name = "FLAG_NO")
+    @ApiParam(value = "客户发往地编号")
+    private String flagNo;
+
     @Column(name = "PLAN_TIME")
     @ApiParam(value = "计划时间")
     private String assignPlanTime;

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

@@ -29,20 +29,29 @@ import javax.persistence.Table;
 public class WmsShippingFlag extends BaseBean {
 
     private static final long serialVersionUID = 8034283413609254479L;
+
+    @Column(name = "CUST_NO")
+    @ApiParam(value = "客户编号")
+    private String custNo;
+
     @Column(name = "FLAG_NO")
-    @ApiParam(value = "编号")
+    @ApiParam(value = "客户发往地编号")
     private String flagNo;
 
     @Column(name = "FLAG_NAME")
-    @ApiParam(value = "简称")
+    @ApiParam(value = "客户发往地名称")
     private String flagName;
 
+    @Column(name = "SHIPP_QTY")
+    @ApiParam(value = "发运数量控制")
+    private Integer shippQty;
+
     @Column(name = "FLAG_DESC")
     @ApiParam(value = "全称")
     private String flagDesc;
 
     @Column(name = "FLAG_ADDR")
-    @ApiParam(value = "地址")
+    @ApiParam(value = "客户发往地址")
     private String flagAddr;
 
     @Column(name = "FLAG_OWNER")