Merge remote-tracking branch 'remotes/origin/dev' into test

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -1740,7 +1740,8 @@ public class WmsEnumUtil {
 
         INTERACTIVE_ACTION(10, "交互动作"),
         BACKSTAGE_ACTION(20, "后台动作"),
-        SUBMIT_ACTION(30, "提交动作");
+        SUBMIT_ACTION(30, "提交动作"),
+        SELECT_ACTION(40, "选择动作");
 
         private int value;
         private String description;

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java

@@ -18,6 +18,10 @@ import java.util.Map;
 @Data
 public class DynTableRow {
 
+    // 是否选中
+    private boolean isChecked;
+
+    // 行ID
     private String key;
 
     // 行号

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java

@@ -101,4 +101,13 @@ public class WmsActionLogDetails extends BaseBean {
     @ApiParam(value = "结束执行时间")
     public String endTime;
 
+    public WmsActionLogDetails() {
+
+    }
+
+    public WmsActionLogDetails(String createUser, Long id, Integer seq) {
+        this.createUser = createUser;
+        this.id = id;
+        this.seq = seq;
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -181,8 +181,12 @@ public class WmsHqlPack {
         //查询参数封装
         HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNo(), "partNo", result);
         HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result);
+        if (StringUtils.isNotBlank(wmsIbCheckPlan.getStartDateStart()) && StringUtils.isNotBlank(wmsIbCheckPlan.getStartDateEnd())) {
             HqlPack.timeBuilder(wmsIbCheckPlan.getStartDateStart(), wmsIbCheckPlan.getStartDateEnd(), "startDate", result, false);
+        }
+        if (StringUtils.isNotBlank(wmsIbCheckPlan.getEndDateStart()) && StringUtils.isNotBlank(wmsIbCheckPlan.getEndDateEnd())) {
             HqlPack.timeBuilder(wmsIbCheckPlan.getEndDateStart(), wmsIbCheckPlan.getEndDateEnd(), "endDate", result, false);
+        }
 
         getStringBuilderPack(wmsIbCheckPlan, result);