From 375f33655933258ea981c45df463b8156f41a309 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 02 九月 2025 13:13:39 +0800
Subject: [PATCH] 许可证到期提醒，系统30分钟无操作强制退出
---
src/main/java/com/zy/asrs/controller/WrkDetlLogController.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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..314c3b6 100644
--- a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
@@ -77,12 +77,14 @@
@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;
String maktx = null; // 鍟嗗搧鍚嶇О
String model = null; // 妗跺瀷
- Double volume = null; // 缃愯閲�
+ String volume = null; // 缃愯閲�
Date modiTimeStart = null, modiTimeEnd = null;
for (Map.Entry<String, Object> entry : param.entrySet()) {
String val = String.valueOf(entry.getValue());
@@ -104,12 +106,16 @@
} else if (entry.getKey().equals("model")) {
model = val;
} else if (entry.getKey().equals("volume")) {
- volume = Double.parseDouble(val);
+ volume = 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