From a65b3d6fb2f1490ad0c95cc276a6523932ed53d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 13 May 2019 14:35:01 +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=9F=BA=E7=A1=80=E6=96=B9=E6=B3=95=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?+=E6=B5=81=E7=A8=8B=E9=85=8D=E7=BD=AE+=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=94=9F=E6=88=90=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84=E5=B1=82?= =?UTF-8?q?=E4=BC=98=E5=8C=96+=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86?= =?UTF-8?q?=E4=B8=BB=E7=A8=8B=E5=BA=8F=E6=9F=A5=E8=AF=A2=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E5=8D=95=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9=E8=B0=83=E5=B7=A5?= =?UTF-8?q?=E5=8E=82=E4=BB=A3=E7=A0=81=EF=BC=88=E4=BB=A3=E7=A0=81=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E9=94=99=E8=AF=AF=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java | 6 ++++++ .../i3plus/pojo/wms/bean/WmsActionGroupDetails.java | 1 + .../cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java | 3 +++ .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 19 +++++++++++-------- 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java index c858ba4..df3f6d5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -47,6 +49,7 @@ public class WmsActionGroup extends BaseBean { @Column(name = "INIT_AM_ID") @ApiParam(value = "初始化组件编号", example = "0") + @JsonSerialize(using = ToStringSerializer.class) private Long initAmId; // @Transient @@ -55,6 +58,7 @@ public class WmsActionGroup extends BaseBean { @Column(name = "DETAILS_AM_ID") @ApiParam(value = "明细处理组件编号", example = "0") + @JsonSerialize(using = ToStringSerializer.class) private Long detailsAmId; // @Transient @@ -63,6 +67,7 @@ public class WmsActionGroup extends BaseBean { @Column(name = "SUBMIT_AM_ID") @ApiParam(value = "提交组件编号", example = "0") + @JsonSerialize(using = ToStringSerializer.class) private Long submitAmId; // @Transient @@ -71,6 +76,7 @@ public class WmsActionGroup extends BaseBean { @Column(name = "END_AM_ID") @ApiParam(value = "结束组件编号", example = "0") + @JsonSerialize(using = ToStringSerializer.class) private Long endAmId; // // @Transient diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java index d448205..54a9528 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java @@ -87,5 +87,6 @@ public class WmsActionGroupDetails extends BaseBean { @Column(name = "SHOW_AM_ID") @ApiParam(value = "回显组件方法ID", example = "1") + @JsonSerialize(using = ToStringSerializer.class) private Long showAmId; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java index 4198ff5..48c4aa2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -50,6 +52,7 @@ public class WmsActionStep extends BaseBean { @Column(name = "AT_ID") @ApiParam(value = "步骤类型编号", example = "0") + @JsonSerialize(using = ToStringSerializer.class) private Long atId; //get单独处理 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 1a1d4e1..0f3f1e6 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 @@ -988,7 +988,7 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getInPackArray(new Object[]{WmsEnumUtil.QC_INFO_STATUS.CREATE.getValue() , + DdlPreparedPack.getInPackArray(new Object[]{WmsEnumUtil.QC_INFO_STATUS.CREATE.getValue(), WmsEnumUtil.QC_INFO_STATUS.FINISH.getValue()}, "orderStatus", result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result); //单号 @@ -1477,18 +1477,21 @@ public class WmsHqlPack { * @return */ public static DdlPackBean packHqlWmsTransModule(WmsTransModule wmsTransModule) { - DdlPackBean result = new DdlPackBean(); + DdlPackBean packBean = new DdlPackBean(); if (!Strings.isNullOrEmpty(wmsTransModule.getTmName())) { - DdlPreparedPack.getStringEqualPack(wmsTransModule.getTmName(), "tmName", result); + DdlPreparedPack.getStringEqualPack(wmsTransModule.getTmName(), "tmName", packBean); } if (!Strings.isNullOrEmpty(wmsTransModule.getCallClass())) { - DdlPreparedPack.getStringEqualPack(wmsTransModule.getCallClass(), "callClass", result); + DdlPreparedPack.getStringEqualPack(wmsTransModule.getCallClass(), "callClass", packBean); } if (!Strings.isNullOrEmpty(wmsTransModule.getTmDesc())) { - DdlPreparedPack.getStringLikerPack(wmsTransModule.getTmDesc(), "tmDesc", result); + DdlPreparedPack.getStringLikerPack(wmsTransModule.getTmDesc(), "tmDesc", packBean); } - getStringBuilderPack(wmsTransModule, result); - return result; + if (StringUtils.isNotBlank(wmsTransModule.orderBy())) { + packBean.setOrderByStr(wmsTransModule.orderBy()); + } + getStringBuilderPack(wmsTransModule, packBean); + return packBean; } /** @@ -1587,7 +1590,7 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getInPackArray(new Object[]{WmsEnumUtil.CS_ORDER_STATUS.STARTING_INVENTORY.getValue() , + DdlPreparedPack.getInPackArray(new Object[]{WmsEnumUtil.CS_ORDER_STATUS.STARTING_INVENTORY.getValue(), WmsEnumUtil.CS_ORDER_STATUS.IN_INVENTORY.getValue()}, "orderStatus", result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result); DdlPreparedPack.getStringEqualPack(wmsCSOrderMaster.getOrderNo(), "orderNo", result);