From 4f37250d96659eb386f1c22dae3a76ec27ef35f1 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 28 十二月 2023 16:45:30 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/webapp/views/staDesc/staDesc.html | 4 ++--
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/StaDescController.java | 6 ++++++
2 files changed, 8 insertions(+), 2 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));
}
diff --git a/zy-asrs-wms/src/main/webapp/views/staDesc/staDesc.html b/zy-asrs-wms/src/main/webapp/views/staDesc/staDesc.html
index 8a8e8f3..e8daef9 100644
--- a/zy-asrs-wms/src/main/webapp/views/staDesc/staDesc.html
+++ b/zy-asrs-wms/src/main/webapp/views/staDesc/staDesc.html
@@ -32,12 +32,12 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="crn_no" placeholder="璁惧鍙�" autocomplete="off">
+ <input class="layui-input" type="text" name="device_no" placeholder="璁惧鍙�" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="crn_stn" placeholder="璁惧绔欑偣" autocomplete="off">
+ <input class="layui-input" type="text" name="device_stn" placeholder="璁惧绔欑偣" autocomplete="off">
</div>
</div>
<!--<div class="layui-inline">-->
--
Gitblit v1.9.1