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 1/2] =?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 2/2] =?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; + } }