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

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttDragModel.java

@@ -6,5 +6,6 @@ import lombok.Data;
 public class GanttDragModel {
     private Long workId;
     private Long resId;
+    private Long targetResId;
     private Long targetWorkId;
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java

@@ -19,9 +19,9 @@ public class GanttPlanModel {
     @JsonDeserialize(using = CustomDateDeserializer.class)
     private Date endDate;
     private String cls;
-    //private String timeRangeColor;
     private String eventColor;
     private String name;
     private Long workId;
     private List<Long> resIds;
+    private Boolean draggable;
 }

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

@@ -118,8 +118,4 @@ public class WmsDocMovementSn extends BaseBean {
     @Transient
     @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
     public Integer itemStatus;
-
-    @Transient
-    @ApiParam("打印模板名称")
-    private String templateName;
 }

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

@@ -282,6 +282,10 @@ public class WmsStockSn extends BaseBean {
     @ApiParam(value = "是否最早批次")
     public String isFifo;
 
+    @Transient
+    @ApiParam("打印模板名称")
+    private String templateName;
+
     public WmsStockSn() {
     }