From d4422bee151782c193445b3922d0c435555797d5 Mon Sep 17 00:00:00 2001 From: qianhs Date: Tue, 19 Nov 2019 11:32:16 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90=20PO=E8=AE=A2=E5=8D=95=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E7=82=B9=E5=87=BB=E6=9F=A5=E8=AF=A2=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6=E9=94=99=E8=AF=AF?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E8=87=B4=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E3=80=91=E3=80=90bug6493=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java | 15 +++++++++++++++ .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index 70ea929..c9618cd 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -493,6 +493,21 @@ public class DdlPreparedPack { } /** + * 两个提交用or拼接 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotOrIsNull(Object data, String columnName, DdlPackBean packBean) { + if (data != null) { + packBean.addColumnQuery(columnName, " and (model." + columnName + " in (:m_" + columnName + ") " + + "or model." + columnName + " is null)", data); + } + } + + + /** * 封装in查询语句 * * @param data 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 15013e3..d405adc 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 @@ -213,7 +213,7 @@ public class WmsHqlPack { numList.add(0); numList.add(wmsPOMaster.getPriorRC()); numList.add(null); - DdlPreparedPack.getInPackList(numList, "priorRC", result); + DdlPreparedPack.getNotOrIsNull(numList, "priorRC", result); }else{ DdlPreparedPack.getNumEqualPack(wmsPOMaster.getPriorRC(), "priorRC", result); } From 2ad6d166842ade0514368b12d8b122cb4ed2313e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 19 Nov 2019 11:38:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index 79dfe71..e5063c6 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -82,7 +82,7 @@ public class SoftSwitchHqlPack { DdlPreparedPack.getNumNOEqualPack(bsSuitCaseParam.getId(),"id",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitCaseParam.getSuitCaseId(), "suitCaseId", ddlPackBean); - DdlPreparedPack.getStringLikerPack(bsSuitCaseParam.getParamName(),"paramName",ddlPackBean); + DdlPreparedPack.getStringEqualPack(bsSuitCaseParam.getParamName(),"paramName",ddlPackBean); return ddlPackBean; } From 8f07751100bedb282f9ff7a0c517740012be01ec Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Tue, 19 Nov 2019 12:00:54 +0800 Subject: [PATCH 3/3] =?UTF-8?q?LAC=20=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java | 19 ++++++++++++++++++- .../estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java | 5 ----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java index 4ebc6e9..9b32ffa 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java @@ -124,7 +124,24 @@ public class LacLogTask extends BaseBean { @ApiParam(value ="执行说明") private String executionDescription; + + @Transient + @ApiParam(value ="任务记录") + private LacCommandStackRecord record; + + @Transient + @ApiParam(value ="任务记录") + private LacCommandStackTemplate template; + + @Transient + @ApiParam(value ="任务步骤") + private LacCommandStackStep step; + + @Transient + @ApiParam(value ="任务记录") + private LacCommandStackStepTask stackStepTask; + @Transient - @ApiParam(value ="步骤列表") + @ApiParam(value ="执行任务参数") private List detailList; } diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java index d2b3cd2..fb27a2b 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java @@ -69,11 +69,6 @@ public class LacLogTaskDetail extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long taskTypeId; - @Column(name="TASK_NAME_TYPE") - @ApiParam(value ="任务类型") - @JsonSerialize(using = ToStringSerializer.class) - private Long taskNameType; - @Column(name="adapterId") @ApiParam(value ="适配器ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class)