From db3f65265e534f69f60ec8f973079462d4c3efa2 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期六, 26 七月 2025 13:36:54 +0800
Subject: [PATCH] 界面搜索字段完善
---
src/main/java/com/zy/asrs/controller/WrkDetlLogController.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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);
--
Gitblit v1.9.1