From 5ef906d88fe7bd43d546b35cda6964fb4d4a651a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 13 Jun 2019 21:44:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E5=8E=BB=E6=8E=89=E7=94=9F=E6=88=90=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E9=80=BB=E8=BE=91+=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=85=AC=E5=85=B1=E5=88=9D=E5=A7=8B=E5=8C=96=E7=BB=84?= =?UTF-8?q?=E4=BB=B6+=E4=BB=BB=E5=8A=A1=E7=94=9F=E6=88=90=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E8=B0=83=E8=AF=95=E9=82=AE=E4=BB=B6+=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E6=AD=A5=E9=AA=A4=E5=8F=82=E6=95=B0=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=8E=BB=E6=8E=89=E5=B7=A5?= =?UTF-8?q?=E5=8E=82+=E4=BA=A4=E6=98=93=E7=B1=BB=E5=9E=8B=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1=E5=8E=BB=E6=8E=89=E4=BD=9C=E4=B8=9A=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java | 4 ---- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java index 9c4aa2c..5812917 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java @@ -61,8 +61,4 @@ public class WmsTransType extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long tmId; - @Column(name = "OP_TYPE_ID") - @ApiParam(value = "作业类型编号", example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long opTypeId; } 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 61a71fb..f0dde37 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 @@ -1173,8 +1173,8 @@ public class WmsHqlPack { //查询参数封装 DdlPreparedPack.getStringLikerPack(wmsActionStepType.getAtNameC(), "atNameC", result); DdlPreparedPack.getStringLikerPack(wmsActionStepType.getFunCallName(), "funCallName", result); - - getStringBuilderPack(wmsActionStepType, result); + DdlPreparedPack.getNumEqualPack(wmsActionStepType.getIsValid(), "isValid", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result; }