From e0004817f2edb903fd9707b194ba8db2429e33ae Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 04 三月 2024 13:46:57 +0800
Subject: [PATCH] 入出库日志筛选 入库无需校验
---
src/main/webapp/views/saasLog/saasLog.html | 31 +++++++++++++++++++++++++++++--
src/main/webapp/static/js/pla/plaDetl.js | 2 +-
src/main/webapp/static/js/saasLog/saasLog.js | 15 +++++++++++----
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 2 +-
src/main/java/com/zy/asrs/controller/MobileController.java | 2 +-
5 files changed, 43 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index c26c5be..ec4aa72 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -496,7 +496,7 @@
if ((Cools.isEmpty(pla))){
return R.error("璇ュ寘鐗╂枡鏈綍鍏ワ紝鏃犳硶鏌ヨ鍒扮浉鍏充俊鎭�");
}
- if(!Cools.eq(pla.getStatus(), GlobleParameter.PLA_STATUS_0) && type != 2){
+ if(!(Cools.eq(pla.getStatus(), GlobleParameter.PLA_STATUS_0) || Cools.eq(pla.getStatus(), GlobleParameter.PLA_STATUS_00)) && type != 2){
return R.error("璇ュ寘鐗╂枡涓嶄负寰呭叆搴撶姸鎬侊紝鏃犳硶杩涜鍏ュ簱鎿嶄綔");
}
return R.ok(pla);
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 2c01801..2297a18 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -1213,7 +1213,7 @@
throw new CoolException("绯荤粺鏈娴嬪埌璇ュ寘鐗╂枡淇℃伅锛岃閲嶆柊褰曞叆");
}
- if(!pla.getStatus().equals(GlobleParameter.PLA_STATUS_0)){
+ if(!pla.getStatus().equals(GlobleParameter.PLA_STATUS_0) && !pla.getStatus().equals(GlobleParameter.PLA_STATUS_00)){
throw new CoolException("璇ョ墿鏂欑姸鎬佷笉涓哄緟鍏ュ簱锛屾棤娉曞叆搴�");
}
diff --git a/src/main/webapp/static/js/pla/plaDetl.js b/src/main/webapp/static/js/pla/plaDetl.js
index bcfbba1..c54b440 100644
--- a/src/main/webapp/static/js/pla/plaDetl.js
+++ b/src/main/webapp/static/js/pla/plaDetl.js
@@ -120,7 +120,7 @@
},
//height: 'full',
limit: 16,
- limits: [ 50, 100, 200, 500,2000,5000,10000],
+ limits: [16, 50, 100, 200, 500,2000,5000,10000],
even: true,
toolbar: '#toolbar',
cellMinWidth: 50,
diff --git a/src/main/webapp/static/js/saasLog/saasLog.js b/src/main/webapp/static/js/saasLog/saasLog.js
index cf0658a..a10be60 100644
--- a/src/main/webapp/static/js/saasLog/saasLog.js
+++ b/src/main/webapp/static/js/saasLog/saasLog.js
@@ -5,9 +5,16 @@
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
- var layDate = layui.laydate;
var form = layui.form;
var admin = layui.admin;
+ var laydate = layui.laydate;
+
+ // 鏃ユ湡鏃堕棿鑼冨洿
+ laydate.render({
+ elem: '#ID-laydate-range-datetime',
+ type: 'datetime',
+ range: true
+ });
// 鏁版嵁娓叉煋
tableIns = table.render({
@@ -15,13 +22,14 @@
headers: {token: localStorage.getItem('token')},
url: baseUrl+'/saasLog/list/auth',
page: true,
+ totalRow: true, // 寮�鍚悎璁¤
limit: 15,
limits: [15, 30, 50, 100, 200, 500],
// toolbar: '#toolbar',
cellMinWidth: 50,
height: 'full-120',
cols: [[
- {type: 'checkbox'}
+ //{type: 'checkbox'}
,{field: 'id', align: 'center',title: 'id', hide:true}
,{field: 'locNo', align: 'center',title: '搴撲綅'}
,{field: 'type$', align: 'center',title: '鎿嶄綔绫诲瀷'}
@@ -31,11 +39,10 @@
,{field: 'targetLocNo', align: 'center',title: '鐩爣搴撲綅'}
,{field: 'owner', align: 'center',title: '涓讳綋'}
,{field: 'workshop', align: 'center',title: '杞﹂棿'}
- ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
+ ,{field: 'anfme', align: 'center',title: '鏁伴噺',totalRow:true}
// ,{field: 'createByName', align: 'center',title: '鎿嶄綔浜�'}
,{field: 'ioTime$', align: 'center',title: '鎿嶄綔鏃堕棿'}
,{field: 'createBy', align: 'center',title: '', hide:true}
-
]],
request: {
diff --git a/src/main/webapp/views/saasLog/saasLog.html b/src/main/webapp/views/saasLog/saasLog.html
index 2211671..8a7cfc0 100644
--- a/src/main/webapp/views/saasLog/saasLog.html
+++ b/src/main/webapp/views/saasLog/saasLog.html
@@ -18,9 +18,36 @@
<div class="layui-form toolbar" id="search-box">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">缂栧彿:</label>
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ <select name="type">
+ <option value="">鎿嶄綔绫诲瀷</option>
+ <option value="0">鍏ュ簱</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="loc_no" placeholder="搴撲綅" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <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="workshop" placeholder="杞﹂棿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 300px">
+ <!-- <div class="layui-input-inline">-->
+ <!-- <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">-->
+ <!-- </div>-->
+ <div class="layui-input-inline" style="width: 300px">
+ <input type="text" class="layui-input" name="io_time" id="ID-laydate-range-datetime" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿">
</div>
</div>
<div class="layui-inline"> 
--
Gitblit v1.9.1