From de8e16542594e01210aba8a72d18f2d2874681c2 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 12 八月 2024 13:39:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/WrkDetlLogController.java | 22 ++++++++++++++++++++--
1 files changed, 20 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 b2df62c..a9bcd5f 100644
--- a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
@@ -79,6 +79,12 @@
try {
Integer wrkNo = null;
String orderNo = null;
+ String matnr = null;
+ String specs = null;
+ String zpallet = null;
+ String batch = null;
+ String model = null;
+ Double anfme = null;
Date modiTimeStart = null, modiTimeEnd = null;
for (Map.Entry<String, Object> entry : param.entrySet()) {
String val = String.valueOf(entry.getValue());
@@ -93,11 +99,23 @@
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("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;
}
}
- List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectWrkDetlLogs(wrkNo, orderNo, modiTimeStart, modiTimeEnd, curr, limit);
+ List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectWrkDetlLogs(wrkNo, orderNo,matnr,specs,zpallet,batch,model,anfme, modiTimeStart, modiTimeEnd, curr, limit);
Page<WrkDetlLog> page1 = new Page<WrkDetlLog>(curr, limit).setRecords(wrkDetlLogs);
- page1.setTotal(wrkDetlLogService.selectWrkDetlLogsTotal(wrkNo, orderNo, modiTimeStart, modiTimeEnd));
+ page1.setTotal(wrkDetlLogService.selectWrkDetlLogsTotal(wrkNo, orderNo,matnr,specs,zpallet,batch,model,anfme, modiTimeStart, modiTimeEnd));
return R.ok(page1);
} catch (Exception e) {
return R.error("寮傚父" + e);
--
Gitblit v1.9.1