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

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefTaskCyclePlan.java

@@ -35,6 +35,11 @@ public class SysRefTaskCyclePlan extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long taskCycleId;
 
+    @Column(name="TASK_PLAN_ID")
+    @ApiParam(value ="任务计划id" ,example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long taskPlanId;
+
     @Column(name="TASK_PLAN_NAME")
     @ApiParam(value ="任务计划名称")
     private String taskPlanName;

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

@@ -120,6 +120,10 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam(value = "已收货数量", example = "1")
     private Double recQty;
 
+    @Column(name = "MOVE_QTY")
+    @ApiParam(value = "已移库数量", example = "1")
+    private Double moveQty;
+
     @Column(name = "SRC_AREA_NO")
     @ApiParam("源库存地代码")
     public String srcAreaNo;