From 6c710d40df8e3b1af295f05165ba021328a74112 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 23 十月 2023 14:32:30 +0800
Subject: [PATCH] #
---
src/main/webapp/views/locMast/locMast.html | 10 ++++++++++
src/main/java/com/zy/asrs/controller/LocMastController.java | 11 ++++++++++-
src/main/webapp/views/stoMan/stoQue.html | 10 ++++++++++
src/main/webapp/static/js/locMast/locMast.js | 2 +-
src/main/webapp/static/js/stoMan/stoQue.js | 1 +
5 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index d2d4f7d..df6f1bc 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -68,16 +68,25 @@
}
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ boolean sign = false;
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
if (val.contains(RANGE_TIME_LINK)){
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
- } else {
+ } else if (entry.getKey().equals("loc_no")){
wrapper.like(entry.getKey(), val);
+ } else {
+ if (entry.getKey().equals("loc_type1")){
+ sign=true;
+ }
+ wrapper.eq(entry.getKey(), val);
}
}
+ if (sign){
+ wrapper.and().ne("loc_sts","Y");
+ }
}
@RequestMapping(value = "/locMast/add/auth")
diff --git a/src/main/webapp/static/js/locMast/locMast.js b/src/main/webapp/static/js/locMast/locMast.js
index afe7365..9e8bcef 100644
--- a/src/main/webapp/static/js/locMast/locMast.js
+++ b/src/main/webapp/static/js/locMast/locMast.js
@@ -54,7 +54,7 @@
// ,{field: 'barcode', align: 'center',title: ''}
// ,{field: 'PdcType', align: 'center',title: ''}
// ,{field: 'ctnNo', align: 'center',title: ''}
- ,{field: 'locType1$', align: 'center',title: '楂樹綆绫诲瀷'}
+ ,{field: 'locType1$', align: 'center',title: '澶у皬绫诲瀷'}
// ,{field: 'locType2$', align: 'center',title: '瀹界獎绫诲瀷'}
// ,{field: 'locType3$', align: 'center',title: '杞婚噸绫诲瀷'}
diff --git a/src/main/webapp/static/js/stoMan/stoQue.js b/src/main/webapp/static/js/stoMan/stoQue.js
index 76e6a1b..14ad105 100644
--- a/src/main/webapp/static/js/stoMan/stoQue.js
+++ b/src/main/webapp/static/js/stoMan/stoQue.js
@@ -40,6 +40,7 @@
return html;
},width:80}
,{field: 'barcode', align: 'center',title: '鏉＄爜鍙�'}
+ ,{field: 'locType1$', align: 'center',title: '澶у皬绫诲瀷'}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', width: 180}
,{ fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate'}
diff --git a/src/main/webapp/views/locMast/locMast.html b/src/main/webapp/views/locMast/locMast.html
index 25692c1..ee84d92 100644
--- a/src/main/webapp/views/locMast/locMast.html
+++ b/src/main/webapp/views/locMast/locMast.html
@@ -42,6 +42,16 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
+ <select name="loc_type1" id="loc_type1" class="layui-input" type="text" placeholder="搴撲綅绫诲瀷" autocomplete="off">
+ <!-- <option style="display: none"></option>-->
+ <option value=""></option>
+ <option value="1">灏忓簱浣�</option>
+ <option value="2">澶у簱浣�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
<input class="layui-input" type="text" name="crn_no" placeholder="鍫嗗灈鏈哄彿" autocomplete="off">
</div>
</div>
diff --git a/src/main/webapp/views/stoMan/stoQue.html b/src/main/webapp/views/stoMan/stoQue.html
index aa87942..ffc3e82 100644
--- a/src/main/webapp/views/stoMan/stoQue.html
+++ b/src/main/webapp/views/stoMan/stoQue.html
@@ -45,6 +45,16 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
+ <select name="loc_type1" id="loc_type1" class="layui-input" type="text" placeholder="搴撲綅绫诲瀷" autocomplete="off">
+ <!-- <option style="display: none"></option>-->
+ <option value=""></option>
+ <option value="1">灏忓簱浣�</option>
+ <option value="2">澶у簱浣�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
<input class="layui-input" type="text" name="crn_no" placeholder="鍫嗗灈鏈哄彿" autocomplete="off">
</div>
</div>
--
Gitblit v1.9.1