From 1f1f6ec8258ce7e7db243f99d2e927e6eafa7e2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 2 Jan 2020 17:37:49 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E3=80=90KT-1346=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=8B=89=E5=8A=A8=E4=BB=BB=E5=8A=A1=E7=9A=84=E6=9A=82=E5=81=9C?= =?UTF-8?q?=E5=92=8C=E5=BC=80=E5=90=AF=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java index 03a57f9..f7d6c15 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskMaster.java @@ -58,9 +58,15 @@ public class WmsPullTaskMaster extends BaseBean{ @ApiParam(value = "单据状态", example = "0") private Integer orderStatus = 0; + @Column(name="IS_SUSPEND") + @ApiParam(value = "是否暂停", example = "0") + private Integer isSuspend = 2; + public Integer getOrderStatus() { return orderStatus == null ? 0 : this.orderStatus.intValue(); } - + public Integer getIsSuspend() { + return isSuspend == null ? 0 : this.isSuspend.intValue(); + } } \ No newline at end of file From 81bab751325bec27e31636322a2f0ceb13d2da8b Mon Sep 17 00:00:00 2001 From: qianhs Date: Thu, 2 Jan 2020 17:41:22 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E3=80=90=E5=BA=93=E5=AD=98=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E7=9B=98=E7=82=B9=E9=9C=80=E8=A6=81=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=EF=BC=8C=E6=89=AB=E6=8F=8F=E6=96=B0=E7=9A=84=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=E6=97=B6=E5=B0=B1=E5=AF=B9=E4=B8=8A=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E5=BA=93=E4=BD=8D=E4=B8=AD=E7=9A=84=E6=95=B0=E6=8D=AE=E5=81=9A?= =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=88=E6=9B=B4=E6=96=B0=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E7=8A=B6=E6=80=81=EF=BC=89=EF=BC=8C=E6=AF=8F=E4=B8=AA=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=E7=9A=84=E6=89=AB=E6=8F=8F=E6=95=B0=E6=8D=AE=E8=BF=98?= =?UTF-8?q?=E6=98=AF=E5=AD=98=E5=9C=A8=E5=90=8C=E4=B8=80=E5=BC=A0=E7=9B=98?= =?UTF-8?q?=E7=82=B9=E5=8D=95=E5=86=85=EF=BC=8C=E7=82=B9=E5=87=BB=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E6=97=B6=E8=AF=A5=E5=BC=A0=E7=9B=98=E7=82=B9=E5=8D=95?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E3=80=82=E5=8E=BB=E9=99=A4=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=B8=8A=E7=9A=84=E6=9C=AA=E7=9B=98=E7=A7=BB=E5=BA=93=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E6=9C=AA=E7=9B=98=E6=9D=A1=E7=A0=81=E7=9B=B4?= =?UTF-8?q?=E6=8E=A5=E5=81=9A=E7=A7=BB=E5=BA=93=E3=80=82=E3=80=91=E3=80=90?= =?UTF-8?q?bug7148=09=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index c9618cd..3bd0c51 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -293,6 +293,15 @@ public class DdlPreparedPack { * @param columnName 列名 * @param packBean */ + public static void getStringNotBlanklPack(String columnName, DdlPackBean packBean) { + packBean.addColumnQuery(null, " and (model." + columnName + " is not null and model." + columnName + " !='')", null); + } + /** + * 封装String对象成equal语句 + * + * @param columnName 列名 + * @param packBean + */ public static void getStringEqualPackOr(String val, String columnName, DdlPackBean packBean) { if (val != null && val.trim().length() > 0) { packBean.addColumnQuery(columnName, " or model." + columnName + " = :m_" + columnName, val); From 5a4510cedbe8c1b7e62d31be66ca16ee172a9d2d Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 2 Jan 2020 18:03:56 +0800 Subject: [PATCH 3/6] =?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 --- .../java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 +- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 1e07422..9937763 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -3485,7 +3485,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WMS_STOCK_TYPE { - SOURCE(10, "实物条码"), TARGET(20, "虚拟条码"); + SOURCE(10, "实物条码"), TARGET(20, "虚拟条码"),CUST_SN(30, "客户条码"); private int value; private String description; 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 22fe9f5..3065d38 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 @@ -78,6 +78,11 @@ public class WmsDocMovementSn extends BaseBean { @ApiParam(value = "供应商编码") public String vendorNo; + @Column(name = "SN_TYPE") + @ApiParam(value = "条码类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class, refForeignKey = "value", value = "description") + private Integer snType; + @Transient @ApiParam("前端表格编辑使用") private Boolean isSet = false; @@ -113,4 +118,8 @@ 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; } From 4013ed776b53bcbb154e64bfea23bc75689382fb Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 2 Jan 2020 22:08:07 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=82=89=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E6=8E=92=E7=A8=8B=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/bean/BaseOrder.java | 1 - .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java index 156db58..7c2d0ac 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java @@ -62,7 +62,6 @@ public class BaseOrder extends BaseAPS { @Column(name="LET") @ApiParam(value ="最晚结束时刻") - @FieldAnnotation(notEmpty = true) private Date let; @Column(name="CALC_EST") diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java index fb63168..f7f6ab7 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java @@ -863,8 +863,8 @@ public class ApsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CALENDAR_TYPE { - ENABLE("ENABLE", "启用"), - DISABLE("DISABLE", "停用"); + ENABLE("ENABLE", "加班"), + DISABLE("DISABLE", "下班"); private String value; private String description; From b0bbd132c6d0050df105a3dd3b78f724dab1c995 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 3 Jan 2020 09:59:12 +0800 Subject: [PATCH 5/6] =?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 6/6] =?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; }