From c4b00b0268f35a7a9e016e818b0f6e27bc3876f0 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 28 三月 2024 08:56:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Four-Way-Rack' into Four-Way-Rack
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/StaDescController.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/StaDescController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/StaDescController.java
index 02ddd41..c014b42 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/StaDescController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/StaDescController.java
@@ -44,6 +44,12 @@
wrapper.ge(StaDesc::getAppeTime, DateUtils.convert(range[0]));
wrapper.le(StaDesc::getAppeTime, DateUtils.convert(range[1]));
}
+ if (!Cools.isEmpty(param.get("device_no"))) {
+ wrapper.eq(StaDesc::getDeviceNo, param.get("device_no"));
+ }
+ if (!Cools.isEmpty(param.get("device_stn"))) {
+ wrapper.eq(StaDesc::getDeviceStn, param.get("device_stn"));
+ }
return R.ok(staDescService.page(new Page<>(curr, limit), wrapper));
}
--
Gitblit v1.9.1