From 85178af7f9197fa6640a9430e73f8aa289020578 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Fri, 26 Apr 2019 15:59:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=BB=86=E8=8A=82?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java index 5257aed..beb96bf 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java @@ -100,6 +100,14 @@ public class SysMessage extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long readCount; + public long getReadCountVal(){ + if(readCount == null){ + return 0; + } else { + return readCount.longValue(); + } + } + public SysMessage() { } From 927799e1db675a44fa1b9bac11e1ed1ac947903d Mon Sep 17 00:00:00 2001 From: Silliter Date: Fri, 26 Apr 2019 17:48:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BA=93=E5=AE=B9?= =?UTF-8?q?=E6=96=B9=E6=B3=95=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/wms/bean/WmsStockSn.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 ++ 2 files changed, 6 insertions(+) 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 15a11c4..dab72a9 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 @@ -174,6 +174,10 @@ public class WmsStockSn extends BaseBean { @Transient public Boolean isSet = false; + @ApiParam(value = "加减库容标志") + @Transient + public Boolean isAdd; + public WmsStockSn(){} public WmsStockSn(String partNo){ 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 5878f68..2e4bb62 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 @@ -1024,6 +1024,8 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsMoveSn.getPartNo(), "partNo", result); HqlPack.getStringLikerPack(wmsMoveSn.getPartNameRdd(), "partNameRdd", result); HqlPack.getStringEqualPack(wmsMoveSn.getRemark(), "remark", result); + HqlPack.getStringEqualPack(wmsMoveSn.getDestLocateNo(), "destLocateNo", result); + HqlPack.getStringEqualPack(wmsMoveSn.getSrcLocateNo(), "srcLocateNo", result); getStringBuilderPack(wmsMoveSn, result); return result.toString();