From 0bd38e8e9a2481bf9f9f6e35bcbc4362d972da9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 20 Jan 2020 15:38:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 4b67424..50edbaf 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -832,7 +832,7 @@ public class CoreHqlPack { * @return */ public static DdlPackBean packHqlSysDictionaryByIdsAndIsDefault(Long[] ids) { - DdlPackBean result = new DdlPackBean(); + DdlPackBean result = DdlPackBean.getDdlPackBean(); // hql拼接 DdlPreparedPack.getInPack(StringUtils.join(ids,","),"id",result); @@ -877,7 +877,7 @@ public class CoreHqlPack { * @return */ public static DdlPackBean packHqlSysLabelTemplate(SysLabelTemplate sysLabelTemplate) { - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysLabelTemplate); // hql拼接 DdlPreparedPack.getStringLikerPack(sysLabelTemplate.getTemplateName(), "templateName", ddlPackBean); From 901623b2542dee10e7f85b0b57546ea23e6dc651 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 12 Feb 2020 16:22:40 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90=207510=20=E9=A2=86=E6=96=99?= =?UTF-8?q?=EF=BC=8C=E5=8F=91=E8=BF=90=E4=B8=80=E6=AD=A5=E6=B3=95=E5=81=9A?= =?UTF-8?q?=E5=AE=8C=E4=B9=8B=E5=90=8E=E5=9C=A8=E5=8D=95=E6=8D=AE=E5=AD=90?= =?UTF-8?q?=E8=A1=A8=E8=AF=A6=E6=83=85=E4=B8=AD=E6=9D=A1=E7=A0=81=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=BB=BB=E7=84=B6=E4=B8=BA=E5=BE=85=E5=A4=84=E7=90=86?= =?UTF-8?q?=E3=80=82=20=E3=80=91bug7510?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java index 755a876..7bea734 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java @@ -60,6 +60,10 @@ public class WmsCSRange extends BaseBean { @ApiParam("单位") public String unit; + @Column(name="SRC_ORDER_NO") + @ApiParam("原单号") + public String srcOrderNo; + @Transient @ApiParam("存储区编号组") @AnnoOutputColumn(hidden = true) From 8093290bada1c43f77ce77078182e0a7ba272422 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 12 Feb 2020 21:56:56 +0800 Subject: [PATCH 3/3] =?UTF-8?q?lac=E4=BB=BB=E5=8A=A1=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java | 7 +++++++ .../src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java | 4 ++++ 3 files changed, 15 insertions(+) diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java index 8fd5bbc..1c73450 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java @@ -146,6 +146,10 @@ public class LacSuitTask extends BaseBean { private List lacSuitTaskParamList; @Transient + @ApiParam(value ="适配出参") + private List lacSuitTaskOutParamList; + + @Transient @ApiParam(value ="入参适配") private List inputParamAdapterList; diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java index 697b68e..76e34fa 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java @@ -96,4 +96,11 @@ public class LacSuitTaskParam extends BaseBean { @Transient @ApiParam(value ="参数值") private Object value; + + public String getValueStr() { + if (value == null) { + return null; + } + return value.toString(); + } } diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java index 10b2e48..fdf9175 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java @@ -119,6 +119,10 @@ public class LacHqlPack { public static DdlPackBean packHqlLacSuitTaskParamAdapter(LacSuitTaskParamAdapter bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + if(bean!=null) { + DdlPreparedPack.getNumEqualPack(bean.getTaskId(), "taskId", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bean.getParamName(), "paramName", ddlPackBean); + } return ddlPackBean; }