From b0bbd132c6d0050df105a3dd3b78f724dab1c995 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 3 Jan 2020 09:59:12 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E7=94=98=E7=89=B9=E5=9B=BE=E6=8B=96=E6=8B=BD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttDragModel.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttDragModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttDragModel.java index 385ee44..b0d518e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttDragModel.java +++ b/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; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java index dcbc039..4ebf16b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java +++ b/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 resIds; + private Boolean canDrag; } From 74be235a26650ffcd8ed8271e4a80be4e82cb46b Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 3 Jan 2020 10:05:10 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E7=94=98=E7=89=B9=E5=9B=BE=E6=8B=96=E6=8B=BD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java index 4ebf16b..4254fba 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java @@ -23,5 +23,5 @@ public class GanttPlanModel { private String name; private Long workId; private List resIds; - private Boolean canDrag; + private Boolean draggable; } From 989e05c64c8e89b53aeefa70c3a0a3098e389cce Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 3 Jan 2020 15:02:54 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=907168=20=E5=AF=B9=E4=BA=8E=E5=8F=91?= =?UTF-8?q?=E8=BF=90=E5=8D=95=E6=A0=87=E7=AD=BE=E8=A1=A5=E6=89=93=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=EF=BC=8C=E6=A0=B9=E6=8D=AE=E5=8F=91=E8=BF=90=E5=8D=95?= =?UTF-8?q?=E4=B8=AD=E7=9A=84ship-to=E8=8E=B7=E5=8F=96=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E8=BF=9B=E8=A1=8C=E6=89=93=E5=8D=B0=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java | 4 ---- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index f3c25d0..d812406 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/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; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 422cf79..0e5b1f3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/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() { }