From 4eb6f737fc06afa8a83f910fcb5ca671b694604a Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 01 四月 2025 14:52:53 +0800
Subject: [PATCH] 工作明细历史档增加型号搜索
---
src/main/java/com/zy/asrs/controller/WrkDetlLogController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
index 9ac7380..7b43e1b 100644
--- a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
@@ -80,7 +80,7 @@
Integer wrkNo = null;
String orderNo = null;
String matnr = null;
- String specs = null;
+ String model = null;
String zpallet = null;
String batch = null;
String frozen = null;
@@ -99,8 +99,8 @@
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("model")) {
+ model = val;
} else if (entry.getKey().equals("zpallet")) {
zpallet = val;
} else if (entry.getKey().equals("batch")) {
@@ -113,9 +113,9 @@
frozen = val;
}
}
- List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectWrkDetlLogs(wrkNo, orderNo,matnr,specs,zpallet,batch,anfme, modiTimeStart, modiTimeEnd, frozen, curr, limit);
+ List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectWrkDetlLogs(wrkNo, orderNo,matnr,model,zpallet,batch,anfme, modiTimeStart, modiTimeEnd, frozen, 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,frozen));
+ page1.setTotal(wrkDetlLogService.selectWrkDetlLogsTotal(wrkNo, orderNo,matnr,model,zpallet,batch,anfme, modiTimeStart, modiTimeEnd,frozen));
return R.ok(page1);
} catch (Exception e) {
return R.error("寮傚父" + e);
--
Gitblit v1.9.1