From 82e3d32282cd6bc07e36564306fe5c35fdfb89da Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期一, 23 九月 2024 17:16:32 +0800
Subject: [PATCH] bug修改，初步完成
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinLogController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinLogController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinLogController.java
index f7cff63..23b70a9 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinLogController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinLogController.java
@@ -39,14 +39,17 @@
@RequestParam Map<String, Object> param) {
LambdaQueryWrapper<WaitPakinLog> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(WaitPakinLog::getHostId, getHostId());
- if (!Cools.isEmpty(condition)) {
- wrapper.like(WaitPakinLog::getId, condition);
- }
if (!Cools.isEmpty(timeRange)) {
String[] range = timeRange.split(RANGE_TIME_LINK);
wrapper.ge(WaitPakinLog::getAppeTime, DateUtils.convert(range[0]));
wrapper.le(WaitPakinLog::getAppeTime, DateUtils.convert(range[1]));
}
+ if (!Cools.isEmpty(param.get("zpallet"))) {
+ wrapper.like(WaitPakinLog::getZpallet, param.get("zpallet"));
+ }
+ if (!Cools.isEmpty(param.get("matnr"))) {
+ wrapper.like(WaitPakinLog::getMatnr, param.get("matnr"));
+ }
return R.ok(waitPakinLogService.page(new Page<>(curr, limit), wrapper));
}
--
Gitblit v1.9.1