From 2718a5f2b9a4b65d257adaa61f436d7ecaed9656 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 18 九月 2024 09:57:19 +0800
Subject: [PATCH] bug调整
---
src/main/java/com/zy/asrs/controller/WrkDetlLogController.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
index 6456b31..30e49bd 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());
@@ -91,13 +97,25 @@
modiTimeEnd = DateUtils.convert(dates[1]);
} else if (entry.getKey().equals("wrk_no")) {
wrkNo = Integer.parseInt(val);
- } else if (entry.getKey().equals("condition")) {
+ } 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, anfme, model, 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, anfme, model, modiTimeStart, modiTimeEnd));
return R.ok(page1);
} catch (Exception e) {
return R.error("寮傚父" + e);
--
Gitblit v1.9.1