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

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

@@ -1440,8 +1440,8 @@ public class WmsEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PRINT_ORDER_TYPE {
         PO(10, "PO"),
-        MOVEMENT(20, "MOVEMENT"),
+        ASN(20, "ASN"),
-        ASN(30, "ASN");
+        MOVEMENT(30, "MOVEMENT");
 
         private int value;
         private String description;

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

@@ -92,9 +92,9 @@ public class WmsPOMasterDetails extends BaseBean {
     @ApiParam("计划交货时间")
     public String planTime;
 
-    @Column(name = "ERP_WH_NO")
+    @Column(name = "ERP_AREA_NO")
     @ApiParam("默认收货库存地")
-    public String erpWhNo;
+    public String erpAreaNo;
 
     /**
      * 状态:10 N=正常,20 C=行取消