From 7256640ae2a47cadda81b5475922fcd75b2f4632 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期五, 04 七月 2025 18:11:24 +0800
Subject: [PATCH] 工作历史档明细搜索条件完善
---
src/main/java/com/zy/asrs/controller/WrkDetlLogController.java | 25 +++++-------
src/main/webapp/views/wrkDetlLog/wrkDetlLog.html | 31 ++++++---------
src/main/resources/mapper/WrkDetlLogMapper.xml | 17 +++-----
src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java | 8 ++--
src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java | 14 +++----
src/main/webapp/static/js/common.js | 2
src/main/java/com/zy/asrs/service/WrkDetlLogService.java | 4 +-
7 files changed, 44 insertions(+), 57 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
index dd97c89..0c32961 100644
--- a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
@@ -79,11 +79,10 @@
try {
Integer wrkNo = null;
String orderNo = null;
- String matnr = null;
- String specs = null;
String zpallet = null;
- String batch = null;
- Double anfme = null;
+ String maktx = null; // 鍟嗗搧鍚嶇О
+ String model = null; // 妗跺瀷
+ Double volume = null; // 缃愯閲�
Date modiTimeStart = null, modiTimeEnd = null;
for (Map.Entry<String, Object> entry : param.entrySet()) {
String val = String.valueOf(entry.getValue());
@@ -98,21 +97,19 @@
wrkNo = Integer.parseInt(val);
} else if (entry.getKey().equals("order_no")) {
orderNo = val;
- } else if (entry.getKey().equals("specs")) {
- specs = val;
+ } else if (entry.getKey().equals("maktx")) {
+ maktx = val;
} else if (entry.getKey().equals("zpallet")) {
zpallet = val;
- } else if (entry.getKey().equals("batch")) {
- batch = val;
- } else if (entry.getKey().equals("anfme")) {
- anfme = Double.parseDouble(val);
- }else if (entry.getKey().equals("matnr")) {
- matnr = val;
+ } else if (entry.getKey().equals("model")) {
+ model = val;
+ } else if (entry.getKey().equals("volume")) {
+ volume = Double.parseDouble(val);
}
}
- List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectWrkDetlLogs(wrkNo, orderNo,matnr,specs,zpallet,batch,anfme, modiTimeStart, modiTimeEnd, curr, limit);
+ List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectWrkDetlLogs(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,matnr,specs,zpallet,batch,anfme, modiTimeStart, modiTimeEnd));
+ page1.setTotal(wrkDetlLogService.selectWrkDetlLogsTotal(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 67a4a26..f76c718 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java
@@ -19,11 +19,10 @@
List<WrkDetlLog> selectWrkDetlLogs(@Param("wrkNo") Integer wrkNo,
@Param("orderNo") String orderNo,
- @Param("matnr") String matnr,
- @Param("specs") String specs,
+ @Param("maktx") String maktx,
+ @Param("model") String model,
@Param("zpallet") String zpallet,
- @Param("batch") String batch,
- @Param("anfme") Double anfme,
+ @Param("volume") Double volume,
@Param("modiTimeStart") Date modiTimeStart,
@Param("modiTimeEnd") Date modiTimeEnd,
@Param("pageNumber") Integer curr,
@@ -31,11 +30,10 @@
Long selectWrkDetlLogsTotal(@Param("wrkNo") Integer wrkNo,
@Param("orderNo") String orderNo,
- @Param("matnr") String matnr,
- @Param("specs") String specs,
+ @Param("maktx") String maktx,
+ @Param("model") String model,
@Param("zpallet") String zpallet,
- @Param("batch") String batch,
- @Param("anfme") Double anfme,
+ @Param("volume") Double volume,
@Param("modiTimeStart") Date modiTimeStart,
@Param("modiTimeEnd") Date modiTimeEnd);
diff --git a/src/main/java/com/zy/asrs/service/WrkDetlLogService.java b/src/main/java/com/zy/asrs/service/WrkDetlLogService.java
index 687da0e..74d98cd 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 matnr,String specs,String zpallet,String batch,Double anfme, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit);
+ List<WrkDetlLog> selectWrkDetlLogs(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 matnr,String specs,String zpallet,String batch,Double anfme, Date modiTimeStart, Date modiTimeEnd);
+ Long selectWrkDetlLogsTotal(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 69f5ead..40a0f22 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 matnr,String specs,String zpallet,String batch,Double anfme, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit) {
- return this.baseMapper.selectWrkDetlLogs(wrkNo, orderNo,matnr,specs,zpallet,batch,anfme, modiTimeStart, modiTimeEnd, curr, limit);
+ 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);
}
@Override
- public Long selectWrkDetlLogsTotal(Integer wrkNo, String orderNo,String matnr,String specs,String zpallet,String batch,Double anfme, Date modiTimeStart, Date modiTimeEnd) {
- return this.baseMapper.selectWrkDetlLogsTotal(wrkNo, orderNo,matnr,specs,zpallet,batch,anfme, modiTimeStart, modiTimeEnd);
+ 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);
}
}
diff --git a/src/main/resources/mapper/WrkDetlLogMapper.xml b/src/main/resources/mapper/WrkDetlLogMapper.xml
index aed5134..196b85d 100644
--- a/src/main/resources/mapper/WrkDetlLogMapper.xml
+++ b/src/main/resources/mapper/WrkDetlLogMapper.xml
@@ -57,9 +57,6 @@
<if test="wrkNo != null and wrkNo != ''">
and a.wrk_no = #{wrkNo}
</if>
- <if test="anfme != null and anfme != ''">
- and a.anfme = #{anfme}
- </if>
<if test="modiTimeStart != null ">
<if test="modiTimeEnd != null ">
and a.modi_time between #{modiTimeStart} and #{modiTimeEnd}
@@ -68,17 +65,17 @@
<if test="orderNo != null and orderNo != ''">
and a.order_no like concat('%',#{orderNo},'%')
</if>
- <if test="batch != null and batch != ''">
- and a.batch like concat('%',#{batch},'%')
+ <if test="maktx != null and maktx != ''">
+ and a.maktx like concat('%',#{maktx},'%')
</if>
- <if test="matnr != null and matnr != ''">
- and a.matnr like concat('%',#{matnr},'%')
+ <if test="model != null and model != ''">
+ and a.model like concat('%',#{model},'%')
+ </if>
+ <if test="volume != null and volume != ''">
+ and a.volume like concat('%',#{volume},'%')
</if>
<if test="zpallet != null and zpallet != ''">
and a.zpallet like concat('%',#{zpallet},'%')
- </if>
- <if test="specs != null and specs != ''">
- and a.specs like concat('%',#{specs},'%')
</if>
</sql>
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 3d4bb5d..c7bf17d 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -224,7 +224,7 @@
var detlCols = [
{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
- ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
+ ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿'}
,{field: 'batch', align: 'center',title: '鎵规', sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺', hide: false}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜', hide: false}
diff --git a/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html b/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html
index 5777d10..9cd922b 100644
--- a/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html
+++ b/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html
@@ -19,11 +19,6 @@
<input class="layui-input" type="text" name="wrk_no" 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">
<input class="layui-input" type="text" name="order_no" placeholder="璁㈠崟鍙�" autocomplete="off">
@@ -31,29 +26,29 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
+ <input class="layui-input" type="text" name="maktx" placeholder="鍟嗗搧鍚嶇О" autocomplete="off">
</div>
</div>
-<!-- <div class="layui-inline">-->
-<!-- <div class="layui-input-inline">-->
-<!-- <input class="layui-input" type="text" name="specs" placeholder="瑙勬牸" autocomplete="off">-->
-<!-- </div>-->
-<!-- </div>-->
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="volume" placeholder="缃愯閲�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="model" placeholder="妗跺瀷" autocomplete="off">
+ </div>
+ </div>
<div class="layui-inline">
<div class="layui-input-inline">
<input class="layui-input" type="text" name="zpallet" placeholder="鎵樼洏鐮�" autocomplete="off">
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-inline" style="width: 300px">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="batch" placeholder="鎵规" autocomplete="off">
+ <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">-->
-<!-- <input class="layui-input" type="text" name="anfme" placeholder="鏁伴噺" autocomplete="off">-->
-<!-- </div>-->
-<!-- </div>-->
<!-- 寰呮坊鍔� -->
<div id="data-search-btn" class="layui-btn-container layui-form-item">
<button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
--
Gitblit v1.9.1