From da3528953feea71e85a8e6d2ccdd56d423e4f6e3 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期二, 09 三月 2021 10:16:26 +0800
Subject: [PATCH] 1.0.4 库物料状态维护-新增待检状态的物料查询
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 5 +++++
src/main/webapp/views/locMatStatus/locMatStatus.html | 1 +
2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index a9bbe09..4dad1f7 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -83,8 +83,13 @@
@RequestParam(required = false)String orderByType,
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
+
excludeTrash(param);
EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
+ if ("0".equals(param.get("mat_status"))) {
+ wrapper.isNull("mat_status");
+ param.remove("mat_status");
+ }
convert(param, wrapper);
allLike(LocDetl.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
diff --git a/src/main/webapp/views/locMatStatus/locMatStatus.html b/src/main/webapp/views/locMatStatus/locMatStatus.html
index d59ed96..74074af 100644
--- a/src/main/webapp/views/locMatStatus/locMatStatus.html
+++ b/src/main/webapp/views/locMatStatus/locMatStatus.html
@@ -27,6 +27,7 @@
<div class="layui-inline">
<select id="matStatusSelect" name="mat_status">
<option value="">璇烽�夋嫨鐗╂枡鐘舵��</option>
+ <option value="0">寰呮</option>
<option value="1">鑹搧</option>
<option value="2">涓嶈壇鍝�</option>
</select>
--
Gitblit v1.9.1