解决冲突

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

@@ -64,17 +64,29 @@ public class WmsMoveDetails extends BaseBean {
     @ApiParam("单位")
     public String unit;
 
-    @Column(name="WH_NO")
+    @Column(name="SRC_WH_NO")
     @ApiParam("仓库代码")
-    public String whNo;
+    public String srcWhNo;
 
-    @Column(name="ZONE_NO")
+    @Column(name="SRC_ZONE_NO")
     @ApiParam("存储区代码")
-    public String zoneNo;
+    public String srcZoneNo;
 
-    @Column(name="LOCATE_NO")
-    @ApiParam("库位代码")
-    public String locateNo;
+    @Column(name="SRC_LOCATE_NO")
+    @ApiParam("源库位代码")
+    public String srcLocateNo;
+
+    @Column(name="DEST_WH_NO")
+    @ApiParam("目标库位代码")
+    public String destWhNo;
+
+    @Column(name="DEST_ZONE_NO")
+    @ApiParam("目标存储区代码")
+    public String destZoneNo;
+
+    @Column(name="DEST_LOCATE_NO")
+    @ApiParam("目标库位代码")
+    public String destLocateNo;
 
     /**
      * 状态:0=创建,5=待处理,10=已处理

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

@@ -74,4 +74,12 @@ public class WmsMoveSn extends BaseBean {
     @Column(name="QTY")
     @ApiParam(value = "已收数量", example = "0")
     public Double qty;
+
+    @Column(name="SRC_LOCATE_NO")
+    @ApiParam("源库位代码")
+    public String srcLocateNo;
+
+    @Column(name="DEST_LOCATE_NO")
+    @ApiParam("目标库位代码")
+    public String destLocateNo;
 }