From 4a20998cd4ff8ccce471fed8b766ee928d5255dc Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 11 十月 2024 11:18:56 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinLogController.java | 11 ++++++++---
1 files changed, 8 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 d215ca4..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
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zy.asrs.common.wms.entity.WaitPakin;
import com.zy.asrs.common.wms.entity.WaitPakinLog;
import com.zy.asrs.common.wms.service.WaitPakinLogService;
import com.zy.asrs.framework.annotations.ManagerAuth;
@@ -37,14 +38,18 @@
@RequestParam(required = false) String timeRange,
@RequestParam Map<String, Object> param) {
LambdaQueryWrapper<WaitPakinLog> wrapper = new LambdaQueryWrapper<>();
- if (!Cools.isEmpty(condition)) {
- wrapper.like(WaitPakinLog::getId, condition);
- }
+ wrapper.eq(WaitPakinLog::getHostId, getHostId());
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