From 7b1146c3bc59e8b380c5132b25d6fc65fef0ff74 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期五, 14 一月 2022 17:01:30 +0800
Subject: [PATCH] #单据类型区分入库单和出库单
---
src/main/java/zy/cloud/wms/manager/controller/CstmrController.java | 3 ++-
src/main/webapp/views/item/item.html | 5 ++++-
src/main/webapp/static/js/tableData.js | 6 +++---
src/main/java/zy/cloud/wms/manager/controller/ItemController.java | 3 ++-
src/main/webapp/static/js/item/item.js | 4 ++--
5 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/CstmrController.java b/src/main/java/zy/cloud/wms/manager/controller/CstmrController.java
index 63516c1..8bbe89f 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/CstmrController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/CstmrController.java
@@ -42,7 +42,8 @@
convert(param, wrapper);
hostEq(wrapper);
// if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- wrapper.orderBy("create_time",false);
+// wrapper.orderBy("create_time",false);
+ wrapper.orderBy("id",false);
return R.ok(cstmrService.selectPage(new Page<>(curr, limit), wrapper));
}
diff --git a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
index 61d3d42..854eceb 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
@@ -53,7 +53,8 @@
excludeTrash(param);
convert(param, wrapper);
hostEq(wrapper);
- wrapper.orderBy("status",true);
+// wrapper.orderBy("status",true);
+ wrapper.orderBy("id",false);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
return R.ok(itemService.selectPage(new Page<>(curr, limit), wrapper));
}
diff --git a/src/main/webapp/static/js/item/item.js b/src/main/webapp/static/js/item/item.js
index bad2e11..a1794b9 100644
--- a/src/main/webapp/static/js/item/item.js
+++ b/src/main/webapp/static/js/item/item.js
@@ -67,7 +67,7 @@
statusCode: 200
},
done: function(res, curr, count) {
- console.log(res)
+ // console.log(res)
if (res.code === 403) {
top.location.href = baseUrl+"/";
}
@@ -244,7 +244,7 @@
// 鏃堕棿閫夋嫨鍣�
function layDateRender(mData) {
- console.log(mData)
+ // console.log(mData)
setTimeout(function () {
layDate.render({
elem: '#startTime',
diff --git a/src/main/webapp/static/js/tableData.js b/src/main/webapp/static/js/tableData.js
index c3621fa..9ff0868 100644
--- a/src/main/webapp/static/js/tableData.js
+++ b/src/main/webapp/static/js/tableData.js
@@ -41,10 +41,10 @@
type:'GET',
dataType:'JSON',
data:{},
- success:function(res){
+ success:function(res){
+ // console.log(JSON.stringify(res.data));
if(res.code==200){
data=res.data
-
// 鍒ゆ柇鏃堕棿鏄惁鏈塶ull 鏈塶ull鐨勬敼涓� ""
for(var i = 0;i<data.length;i++){
var dataNode = data[i].nodes
@@ -118,7 +118,7 @@
}
}
- tab(endTime$,realEndTime$,);
+ tab(endTime$,realEndTime$);
}
}
diff --git a/src/main/webapp/views/item/item.html b/src/main/webapp/views/item/item.html
index 769a861..31debee 100644
--- a/src/main/webapp/views/item/item.html
+++ b/src/main/webapp/views/item/item.html
@@ -113,7 +113,10 @@
<div class="layui-form-item">
<label class="layui-form-label">瀹炴柦鍛ㄦ湡(鏈�): </label>
<div class="layui-input-block">
- <input class="layui-input" name="realMonth" id="realMonth$" placeholder="濉啓鏁板瓧鏈堜唤" type="number" onkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}" onafterpaste="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}">
+ <input class="layui-input" name="realMonth" id="realMonth$" placeholder="濉啓鏁板瓧鏈堜唤" type="number"
+ onkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}"
+ onafterpaste="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}"
+ oninput="if(value>200)value=200;if(value<0)value=0">
</div>
</div>
</div>
--
Gitblit v1.9.1