From 097433ca16e6f8aa7ec736298693dd5c7613e811 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期日, 13 七月 2025 10:19:12 +0800
Subject: [PATCH] 堆垛机分配库位加入可入条件限制
---
src/main/java/com/zy/asrs/controller/WrkDetlLogController.java | 16 ++++++++++++++--
1 files changed, 14 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..0c32961 100644
--- a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
@@ -79,6 +79,10 @@
try {
Integer wrkNo = null;
String orderNo = null;
+ String zpallet = null;
+ String maktx = null; // 鍟嗗搧鍚嶇О
+ String model = null; // 妗跺瀷
+ Double volume = null; // 缃愯閲�
Date modiTimeStart = null, modiTimeEnd = null;
for (Map.Entry<String, Object> entry : param.entrySet()) {
String val = String.valueOf(entry.getValue());
@@ -93,11 +97,19 @@
wrkNo = Integer.parseInt(val);
} else if (entry.getKey().equals("order_no")) {
orderNo = val;
+ } else if (entry.getKey().equals("maktx")) {
+ maktx = val;
+ } else if (entry.getKey().equals("zpallet")) {
+ zpallet = val;
+ } else if (entry.getKey().equals("model")) {
+ model = val;
+ } else if (entry.getKey().equals("volume")) {
+ volume = Double.parseDouble(val);
}
}
- List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectWrkDetlLogs(wrkNo, orderNo, modiTimeStart, modiTimeEnd, curr, limit);
+ List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectWrkDetlLogs(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, modiTimeStart, modiTimeEnd));
+ page1.setTotal(wrkDetlLogService.selectWrkDetlLogsTotal(wrkNo, orderNo,maktx,model,zpallet,volume, modiTimeStart, modiTimeEnd));
return R.ok(page1);
} catch (Exception e) {
return R.error("寮傚父" + e);
--
Gitblit v1.9.1