Merge branch 'dev' of i3-IMPP/i3plus-pojo into test

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

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<LacLogTaskDetail> detailList;
 }

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)

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;
     }

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);
         }