Merge branch 'dev' into test

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

@@ -602,7 +602,10 @@ public class WmsEnumUtil {
         IN_STOCK("IN_STOCK", "入库单"),
         SHIPPING("SHIPPING", "发运单"),
         QC("QC", "质检"),
-        CS("CS", "盘点");
+        CS("CS", "盘点"),
+        DR("DR", "直送收货"),
+        AMPR("AMPR", "AMP拉动收货");
+
         private String value;
         private String description;
 

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

@@ -136,6 +136,22 @@ public class WmsMoveToERP extends BaseBean {
     @ApiParam("关联单号")
     public String refSrc;
 
+    @Column(name = "SRC_AREA_NO")
+    @ApiParam("来源库存地")
+    public String srcAreaNo;
+
+    @Column(name = "DEST_AREA_NO")
+    @ApiParam("目标库存地")
+    public String destAreaNo;
+
+    @Column(name = "BUSI_TYPE_CODE")
+    @ApiParam("交易类型")
+    public Integer busiTypeCode;
+
+    @Column(name = "IS_SYNC")
+    @ApiParam("是否同步")
+    public Integer isSync;
+
     @ApiParam(value = "待出库数量", example = "0")
     @Transient
     private Long waitingCounts;