From db3f65265e534f69f60ec8f973079462d4c3efa2 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期六, 26 七月 2025 13:36:54 +0800
Subject: [PATCH] 界面搜索字段完善
---
src/main/webapp/static/js/locDetl/locDetl.js | 5 ++
src/main/webapp/views/locDetl/locDetl.html | 5 ++
src/main/java/com/zy/asrs/controller/WrkDetlLogController.java | 10 ++++-
src/main/webapp/views/wrkDetlLog/wrkDetlLog.html | 22 +++++++++++
src/main/resources/mapper/WrkDetlLogMapper.xml | 6 +++
src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java | 8 ++--
src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java | 8 +++-
src/main/java/com/zy/asrs/service/WrkDetlLogService.java | 4 +-
8 files changed, 58 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
index 0c32961..5e75f68 100644
--- a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
@@ -77,6 +77,8 @@
@RequestParam(required = false) String condition,
@RequestParam Map<String, Object> param) {
try {
+ Integer ioType = null;
+ Integer wrkSts = null;
Integer wrkNo = null;
String orderNo = null;
String zpallet = null;
@@ -105,11 +107,15 @@
model = val;
} else if (entry.getKey().equals("volume")) {
volume = Double.parseDouble(val);
+ } else if (entry.getKey().equals("io_type")) {
+ ioType = Integer.parseInt(val);
+ } else if (entry.getKey().equals("wrk_sts")) {
+ wrkSts = Integer.parseInt(val);
}
}
- List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectWrkDetlLogs(wrkNo, orderNo,maktx,model,zpallet,volume, modiTimeStart, modiTimeEnd, curr, limit);
+ List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectWrkDetlLogs(ioType,wrkSts,wrkNo, orderNo,maktx,model,zpallet,volume, modiTimeStart, modiTimeEnd, curr, limit);
Page<WrkDetlLog> page1 = new Page<WrkDetlLog>(curr, limit).setRecords(wrkDetlLogs);
- page1.setTotal(wrkDetlLogService.selectWrkDetlLogsTotal(wrkNo, orderNo,maktx,model,zpallet,volume, modiTimeStart, modiTimeEnd));
+ page1.setTotal(wrkDetlLogService.selectWrkDetlLogsTotal(ioType,wrkSts,wrkNo, orderNo,maktx,model,zpallet,volume, modiTimeStart, modiTimeEnd));
return R.ok(page1);
} catch (Exception e) {
return R.error("寮傚父" + e);
diff --git a/src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java b/src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java
index f76c718..8840086 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java
@@ -17,7 +17,9 @@
@Insert("insert into asr_wrk_detl_log select * from asr_wrk_detl where wrk_no=#{workNo}")
int save(Integer workNo);
- List<WrkDetlLog> selectWrkDetlLogs(@Param("wrkNo") Integer wrkNo,
+ List<WrkDetlLog> selectWrkDetlLogs(@Param("ioType") Integer ioType,
+ @Param("wrkSts") Integer wrkSts,
+ @Param("wrkNo") Integer wrkNo,
@Param("orderNo") String orderNo,
@Param("maktx") String maktx,
@Param("model") String model,
@@ -28,7 +30,9 @@
@Param("pageNumber") Integer curr,
@Param("pageSize") Integer limit);
- Long selectWrkDetlLogsTotal(@Param("wrkNo") Integer wrkNo,
+ Long selectWrkDetlLogsTotal(@Param("ioType") Integer ioType,
+ @Param("wrkSts") Integer wrkSts,
+ @Param("wrkNo") Integer wrkNo,
@Param("orderNo") String orderNo,
@Param("maktx") String maktx,
@Param("model") String model,
diff --git a/src/main/java/com/zy/asrs/service/WrkDetlLogService.java b/src/main/java/com/zy/asrs/service/WrkDetlLogService.java
index 74d98cd..e54e541 100644
--- a/src/main/java/com/zy/asrs/service/WrkDetlLogService.java
+++ b/src/main/java/com/zy/asrs/service/WrkDetlLogService.java
@@ -10,8 +10,8 @@
boolean save(Integer workNo);
- List<WrkDetlLog> selectWrkDetlLogs(Integer wrkNo, String orderNo,String maktx,String model,String zpallet,Double volume, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit);
+ List<WrkDetlLog> selectWrkDetlLogs(Integer ioType,Integer wrkSts,Integer wrkNo, String orderNo,String maktx,String model,String zpallet,Double volume, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit);
- Long selectWrkDetlLogsTotal(Integer wrkNo, String orderNo,String maktx,String model,String zpallet,Double volume, Date modiTimeStart, Date modiTimeEnd);
+ Long selectWrkDetlLogsTotal(Integer ioType,Integer wrkSts,Integer wrkNo, String orderNo,String maktx,String model,String zpallet,Double volume, Date modiTimeStart, Date modiTimeEnd);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java
index 40a0f22..d1d68ec 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java
@@ -18,12 +18,12 @@
}
@Override
- public List<WrkDetlLog> selectWrkDetlLogs(Integer wrkNo, String orderNo,String maktx,String model,String zpallet,Double volume, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit) {
- return this.baseMapper.selectWrkDetlLogs(wrkNo, orderNo,maktx,model,zpallet,volume, modiTimeStart, modiTimeEnd, curr, limit);
+ public List<WrkDetlLog> selectWrkDetlLogs(Integer ioType,Integer wrkSts,Integer wrkNo, String orderNo,String maktx,String model,String zpallet,Double volume, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit) {
+ return this.baseMapper.selectWrkDetlLogs(ioType,wrkSts,wrkNo, orderNo,maktx,model,zpallet,volume, modiTimeStart, modiTimeEnd, curr, limit);
}
@Override
- public Long selectWrkDetlLogsTotal(Integer wrkNo, String orderNo,String maktx,String model,String zpallet,Double volume, Date modiTimeStart, Date modiTimeEnd) {
- return this.baseMapper.selectWrkDetlLogsTotal(wrkNo, orderNo,maktx,model,zpallet,volume, modiTimeStart, modiTimeEnd);
+ public Long selectWrkDetlLogsTotal(Integer ioType,Integer wrkSts,Integer wrkNo, String orderNo,String maktx,String model,String zpallet,Double volume, Date modiTimeStart, Date modiTimeEnd) {
+ return this.baseMapper.selectWrkDetlLogsTotal(ioType,wrkSts,wrkNo, orderNo,maktx,model,zpallet,volume, modiTimeStart, modiTimeEnd);
}
}
diff --git a/src/main/resources/mapper/WrkDetlLogMapper.xml b/src/main/resources/mapper/WrkDetlLogMapper.xml
index 196b85d..a1bda51 100644
--- a/src/main/resources/mapper/WrkDetlLogMapper.xml
+++ b/src/main/resources/mapper/WrkDetlLogMapper.xml
@@ -77,6 +77,12 @@
<if test="zpallet != null and zpallet != ''">
and a.zpallet like concat('%',#{zpallet},'%')
</if>
+ <if test="ioType != null">
+ and b.io_type = #{ioType}
+ </if>
+ <if test="wrkSts != null">
+ and b.wrk_sts = #{wrkSts}
+ </if>
</sql>
<select id="selectWrkDetlLogs" resultMap="BaseResultMap">
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 343715e..b70068b 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -538,6 +538,11 @@
tableReload(false);
});
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
// 鏃堕棿閫夋嫨鍣�
layDate.render({
elem: '#modiTime\\$',
diff --git a/src/main/webapp/views/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html
index 573e118..427b4e4 100644
--- a/src/main/webapp/views/locDetl/locDetl.html
+++ b/src/main/webapp/views/locDetl/locDetl.html
@@ -52,6 +52,11 @@
<input class="layui-input" type="text" name="model" placeholder="妗跺瀷" autocomplete="off">
</div>
</div>
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" name="modi_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
<!-- <div class="layui-inline">-->
<!-- <div class="layui-input-inline">-->
<!-- <select name="frozen" class="layui-input" type="text" autocomplete="off">-->
diff --git a/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html b/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html
index 9cd922b..4afbe15 100644
--- a/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html
+++ b/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html
@@ -15,6 +15,28 @@
<!-- 鎼滅储鏍� -->
<div id="search-box" class="layui-form layui-card-header">
<div class="layui-inline">
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="ioType" class="layui-input" name="io_type" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
+ <input id="ioType$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="鍏ュ嚭搴撶被鍨�" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="basWrkIotypeQueryByioType" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="basWrkIotypeQueryByioTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline cool-auto-complete">
+ <input id="wrkSts" class="layui-input" name="wrk_sts" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
+ <input id="wrkSts$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="宸ヤ綔鐘舵��" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="basWrkStatusQueryBywrkSts" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="basWrkStatusQueryBywrkStsSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline">
<div class="layui-input-inline">
<input class="layui-input" type="text" name="wrk_no" placeholder="宸ヤ綔鍙�" autocomplete="off">
</div>
--
Gitblit v1.9.1