From 37a8fdbad3ff51697569e6211937823849de9f90 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 25 七月 2024 16:31:56 +0800
Subject: [PATCH] #库存明细搜索功能
---
zy-asrs-wms/src/main/webapp/views/locDetl/locDetl.html | 10 +++++-----
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java | 13 +++++++++++++
2 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java
index bdd232c..d401e69 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java
@@ -97,6 +97,18 @@
private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
+ if(Cools.eq(entry.getKey(),"curr")
+ || Cools.eq(entry.getKey(),"limit")
+ || Cools.eq(entry.getKey(),"unreason")
+ || Cools.eq(entry.getKey(),"row")
+ || Cools.eq(entry.getKey(),"condition")){
+ continue;
+ }
+
+ if(Cools.isEmpty(entry.getValue())){
+ continue;
+ }
+
String val = String.valueOf(entry.getValue());
if (val.contains(RANGE_TIME_LINK)){
String[] dates = val.split(RANGE_TIME_LINK);
@@ -120,6 +132,7 @@
@RequestParam(required = false) String timeRange,
@RequestParam Map<String, Object> param) {
QueryWrapper<LocDetl> wrapper = new QueryWrapper<>();
+ convert(param,wrapper);
wrapper.eq("host_id", getHostId());
// if (!Cools.isEmpty(condition)) {
// wrapper.like(LocDetl::getLocNo, condition);
diff --git a/zy-asrs-wms/src/main/webapp/views/locDetl/locDetl.html b/zy-asrs-wms/src/main/webapp/views/locDetl/locDetl.html
index d7477d8..9f310ef 100644
--- a/zy-asrs-wms/src/main/webapp/views/locDetl/locDetl.html
+++ b/zy-asrs-wms/src/main/webapp/views/locDetl/locDetl.html
@@ -34,11 +34,11 @@
<input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
</div>
</div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="row" placeholder="鎺掓暟" autocomplete="off">
- </div>
- </div>
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input class="layui-input" type="text" name="row" placeholder="鎺掓暟" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-inline">
<div class="layui-input-inline">
<input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
--
Gitblit v1.9.1