From 958db58d4842c2f6de4f3fe9330334f2fd8f1243 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期二, 14 六月 2022 16:00:59 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/locDetl/locDetl.html                  |   12 +++---
 src/main/java/com/zy/asrs/controller/LocDetlController.java |   30 +++++++-------
 src/main/webapp/views/stoMan/stoQue.html                    |   20 +++++++++-
 src/main/webapp/static/js/stoMan/stoQue.js                  |    1 
 4 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 553be70..eaa6577 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -99,26 +99,26 @@
                             "            batch LIKE '%[a-z]%'")));
         }
         param.remove("unreason");
-        String row = "";
+//        String row = "";
         EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
-        if (param.get("row") != null) {
-            String chooseRow = (String) param.get("row");
-            if (chooseRow.length() == 1) {
-                row = "0" + chooseRow;
-                param.remove("row");
-            }else {
-                row = chooseRow;
-                param.remove("row");
-            }
-        }
+//        if (param.get("row") != null) {
+//            String chooseRow = (String) param.get("row");
+//            if (chooseRow.length() == 1) {
+//                row = "0" + chooseRow;
+//                param.remove("row");
+//            }else {
+//                row = chooseRow;
+//                param.remove("row");
+//            }
+//        }
         excludeTrash(param);
         convert(param, wrapper);
         allLike(LocDetl.class, param.keySet(), wrapper, condition);
         if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
-        if (!row.equals("")){
-            wrapper.and()
-                    .where("loc_no like '" +row +"%'");
-        }
+//        if (!row.equals("")){
+//            wrapper.and()
+//                    .where("loc_no like '" +row +"%'");
+//        }
 
         return R.ok(locDetlService.selectPage(new Page<>(curr, limit), wrapper));
     }
diff --git a/src/main/webapp/static/js/stoMan/stoQue.js b/src/main/webapp/static/js/stoMan/stoQue.js
index a4630e5..76e6a1b 100644
--- a/src/main/webapp/static/js/stoMan/stoQue.js
+++ b/src/main/webapp/static/js/stoMan/stoQue.js
@@ -39,6 +39,7 @@
                     html += "disabled='disabled' >";
                     return html;
                 },width:80}
+            ,{field: 'barcode', 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/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html
index dad6b6c..6248d71 100644
--- a/src/main/webapp/views/locDetl/locDetl.html
+++ b/src/main/webapp/views/locDetl/locDetl.html
@@ -29,11 +29,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">
@@ -45,7 +45,7 @@
     <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
         <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
         <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
-        <button id="unreason" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="unreason">鏌ョ湅寮傚父鏁版嵁</button>
+<!--        <button id="unreason" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="unreason">鏌ョ湅寮傚父鏁版嵁</button>-->
     </div>
 
 </div>
diff --git a/src/main/webapp/views/stoMan/stoQue.html b/src/main/webapp/views/stoMan/stoQue.html
index 6201b1e..aa87942 100644
--- a/src/main/webapp/views/stoMan/stoQue.html
+++ b/src/main/webapp/views/stoMan/stoQue.html
@@ -33,6 +33,22 @@
         </div>
     </div>
     <div class="layui-inline">
+        <div class="layui-input-inline cool-auto-complete">
+            <input id="locSts" name="loc_sts" class="layui-input" type="text"  style="display: none">
+            <input id="locSts$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="搴撲綅鐘舵��" onfocus=this.blur()>
+            <div class="cool-auto-complete-window">
+                <input class="cool-auto-complete-window-input" data-key="basLocStsQueryBylocSts" onkeyup="autoLoad2(this.getAttribute('data-key'))">
+                <select class="cool-auto-complete-window-select" data-key="basLocStsQueryBylocStsSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+                </select>
+            </div>
+        </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>
+    <div class="layui-inline">
         <div class="layui-input-inline">
             <input class="layui-input" type="text" name="barcode" placeholder="鎵樼洏鐮�" autocomplete="off">
         </div>
@@ -51,8 +67,8 @@
 </div>
 <script type="text/html" id="toolbar">
     <div class="layui-btn-container">
-        <button class="layui-btn layui-btn-normal layui-btn-sm" id="refresh-sto" lay-event="refreshSto" style="margin-left: 10px">鏇存柊搴撳瓨</button>
-        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
+<!--        <button class="layui-btn layui-btn-normal layui-btn-sm" id="refresh-sto" lay-event="refreshSto" style="margin-left: 10px">鏇存柊搴撳瓨</button>-->
+        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right;margin-top: 10px">瀵煎嚭</button>
     </div>
 </script>
 <!-- 琛ㄦ牸 -->

--
Gitblit v1.9.1