From 6e4d59cf7f07551162678054148323ef0df8cceb Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Tue, 16 Apr 2019 19:05:04 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=A0=B9=E6=8D=AEPO=E5=8D=95=E5=8F=B7?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E7=94=9F=E6=88=90=E6=9D=A1=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java index 20b4193..0bf3187 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java @@ -77,4 +77,7 @@ public class WmsTaskInfo extends BaseBean { @Transient public List taskDetailsList; + @Column(name = "IS_CHECK_SN") + @ApiParam("是否校验条码") + public Integer isCheckSn; } From 43ad2e35c99dfdb8b60722b9f0633ba4f45a8ba6 Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Tue, 16 Apr 2019 20:50:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=94=99=E8=AF=AF--?= =?UTF-8?q?=E5=88=98=E6=95=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 39608ba..fdbeed4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -127,7 +127,7 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "打印时间") private String printDate; - public Integer getIsSn() { - return isSn == null ? 0 : this.getIsSn(); - } +// public Integer getIsSn() { +//// return isSn == null ? 0 : this.getIsSn(); +//// } } From 93f4d1cfd731a20283f3a30072c5d6aca3c22a1f Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Tue, 16 Apr 2019 22:24:51 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java | 4 ++-- .../estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java | 3 +++ .../pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java | 10 +++++++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java index 6cc2dc7..81e9435 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java @@ -145,8 +145,8 @@ public class SwebEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ORDER_TYPE { - CREATE(10, "标准包装"), - RECEIPT(20, "非标包装"); + STANDARD(10, "标准包装"), + NON_STANDARD(20, "非标包装"); private int value; private String description; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java index ed7f4c7..8076ebd 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java @@ -17,6 +17,9 @@ import java.io.Serializable; @AllArgsConstructor public class SwebLoginUserModel implements Serializable { + @ApiParam(value = "用户ID") + private Long id; + @ApiParam(value = "用户名") private String userName; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java index 335e031..d6df41b 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java @@ -5,7 +5,7 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import javax.persistence.Column; -import java.util.List; +import javax.persistence.Transient; import java.util.Map; /** @@ -46,10 +46,14 @@ public class SwebPOForPubListResultItemModel extends BaseBean { @Column(name = "ITEM_STATUS") private Integer itemStatus; - @ApiParam(value = "订单类型", example = "1") + @ApiParam(value = "订单类型", example = "10") @Column(name = "ORDER_TYPE") public Integer orderType; @ApiParam(value = "时间数量列表", example = "1") - public List> timeList; + public Map timeObject; + + @Transient + @ApiParam(value = "是否可编辑（前端使用）") + public boolean isSet = false; }