From 035a8b59249ff694ccf0849a1a6093d9f79fd8c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 24 Jul 2019 20:36:56 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=BF=A1=E6=81=AF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index b99bad0..b068420 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -570,7 +570,7 @@ public class AndonEnumUtil { CANCEL_ACTION("40", "撤销动作"), COMMIT_ACTION("50","提交动作"), PASS_ACTION("60","审批动作"), - SHIFG_CALL_ACTION("70", "转呼动作"); + REJECT_ACTION("70", "驳回动作"); private String value; private String description; From 341994c3261c92d653ceb9bfdf4a299b242c303f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 26 Jul 2019 14:41:45 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=89=E7=81=AF=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java | 11 ++--------- .../cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java | 8 ++++++++ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java index 9f3a6ea..8f43576 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java @@ -301,16 +301,9 @@ public class AndonManageQueue extends BaseBean { @ApiParam(value = "组织名称") private String organizeNameRdd; - /** - * 1 = 是，2 = 否 - */ - @Column(name = "IS_RESOLVE") - @ApiParam(value = "是否驳回", example = "2") - private Integer isResolve; - - @Column(name = "RESOLVE_OPINION") + @Column(name = "REJECT_OPINION") @ApiParam(value = "驳回意见") - private String resolveOpinion; + private String rejectOpinion; @Transient @ApiParam(value = "安灯状态集合") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java index 2ddb970..f1fa3f0 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java @@ -256,6 +256,14 @@ public class AndonManageRecord extends BaseBean { @ApiParam(value = "重要等级名称") private String importanceNameRdd; + @Column(name = "ORGANIZE_NAME_RDD") + @ApiParam(value = "组织名称") + private String organizeNameRdd; + + @Column(name = "REJECT_OPINION") + @ApiParam(value = "驳回意见") + private String rejectOpinion; + // 是否转呼 public Integer getIsShiftCall() { return this.isShiftCall == null ? 0 : this.isShiftCall; From a4f2a7c84820a680e5c9d2ea8ecd95a92622ff69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 1 Aug 2019 09:51:13 +0800 Subject: [PATCH 3/4] =?UTF-8?q?hql=E4=BF=AE=E6=94=B9asn=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index c9fe1f4..1abcdb7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -658,6 +658,7 @@ public class WmsHqlPack { getStringBuilderPack(wmsASNMasterDetails, result); + DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{"snOneBarCode"}, result); return result; } From 5a6cd405b64b05a2f0f7d26b53619a600271fb20 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 2 Aug 2019 14:02:13 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=20Bug=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java index 9be97bc..e871a03 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java @@ -65,4 +65,13 @@ public class SessionUser implements Serializable { this.languageCode = languageCode; this.userType = userTypeId; } + + /** + * 不建议使用， 推荐使用 AuthUtil.getDeviceId(); 方法 + * @return + */ + @Deprecated + public String getDeviceId() { + return deviceId; + } }