From f512b0475560ed449f936e0b7a27ba197e6bafe5 Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期四, 26 九月 2024 15:16:08 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/liudongl/jc24-wms
---
HTML/views/WareHouseSetting/FlatLibraryLegend.html | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 110 insertions(+), 10 deletions(-)
diff --git a/HTML/views/WareHouseSetting/FlatLibraryLegend.html b/HTML/views/WareHouseSetting/FlatLibraryLegend.html
index 5820381..f14c80c 100644
--- a/HTML/views/WareHouseSetting/FlatLibraryLegend.html
+++ b/HTML/views/WareHouseSetting/FlatLibraryLegend.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
- <title>鍌ㄤ綅鍥句緥</title>
+ <title>骞冲簱鍥句緥</title>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport"
content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -139,7 +139,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鎺�</label>
+ <label class="layui-form-label">妤煎眰</label>
<div class="layui-input-inline">
<select name="Row" id="Row" lay-filter="SelectRow">
<option value="1" selected>涓�妤�</option>
@@ -160,6 +160,10 @@
<!-- 鍌ㄤ綅鍥句緥 -->
<table style="margin:0 auto;">
<tr>
+ <td><button class="btnShow1 five" disabled></button></td>
+ <td>绉诲嚭涓�</td>
+ <td><button class="btnShow1 four" disabled></button></td>
+ <td>绉诲叆涓�</td>
<td><button class="btnShow1 three" disabled></button></td>
<td>鍑哄簱涓�</td>
<td><button class="btnShow1 two" disabled></button></td>
@@ -175,12 +179,12 @@
</div>
<!-- //瀹氭椂鑷埛鏂板簱浣嶅浘渚� -->
- <!-- <div class="layui-inline" style="float: right;">
+ <div class="layui-inline" style="float: right;">
<label class="layui-form-label" style="margin-top: 10px;">鑷姩鍒锋柊</label>
<div class="layui-input-inline" style="width: auto;">
<input type="checkbox" checked="" id="autoRefresh" lay-skin="switch" lay-filter="switchTest" lay-text="寮�|鍏�">
</div>
- </div> -->
+ </div>
</div>
</div>
@@ -368,11 +372,10 @@
//鑾峰彇鏁版嵁娓叉煋搴撲綅鍥�
- function GetSlotVm(houseNo, row,depth) {
+ function GetSlotVm(houseNo, row) {
var param = {
WareHouseNo: houseNo,
- Row: row,
- Depth: depth
+ Row: row
}
sendData(IP + "/Sys/GetFlatLibraryLegend", param, 'get', function (res) {
console.log(res)
@@ -488,6 +491,14 @@
else if (item.Status == 3) {
html1 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
}
+ //绉诲叆涓� 4
+ else if (item.Status == 4) {
+ html1 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲嚭涓� 5
+ else if (item.Status == 5) {
+ html1 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
+ }
} else {
// console.log(i, a);
html1 += '<td></td>'
@@ -522,6 +533,14 @@
else if (item.Status == 3) {
html2 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
}
+ //绉诲叆涓� 4
+ else if (item.Status == 4) {
+ html2 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲嚭涓� 5
+ else if (item.Status == 5) {
+ html2 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
+ }
} else {
// console.log(i, a);
html2 += '<td></td>'
@@ -555,6 +574,14 @@
else if (item.Status == 3) {
html3 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
}
+ //绉诲叆涓� 4
+ else if (item.Status == 4) {
+ html3 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲嚭涓� 5
+ else if (item.Status == 5) {
+ html3 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
+ }
} else {
// console.log(i, a);
html3 += '<td></td>'
@@ -587,6 +614,14 @@
else if (item.Status == 3) {
html4 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
}
+ //绉诲叆涓� 4
+ else if (item.Status == 4) {
+ html4 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲嚭涓� 5
+ else if (item.Status == 5) {
+ html4 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
+ }
} else {
// console.log(i, a);
html4 += '<td></td>'
@@ -618,6 +653,14 @@
//鍑哄簱涓� 3
else if (item.Status == 3) {
html5 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲叆涓� 4
+ else if (item.Status == 4) {
+ html5 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲嚭涓� 5
+ else if (item.Status == 5) {
+ html5 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
}
} else {
// console.log(i, a);
@@ -653,6 +696,14 @@
else if (item.Status == 3) {
html6 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
}
+ //绉诲叆涓� 4
+ else if (item.Status == 4) {
+ html6 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲嚭涓� 5
+ else if (item.Status == 5) {
+ html6 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
+ }
} else {
// console.log(i, a);
html6 += '<td></td>'
@@ -687,6 +738,14 @@
//鍑哄簱涓� 3
else if (item.Status == 3) {
html7 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲叆涓� 4
+ else if (item.Status == 4) {
+ html7 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲嚭涓� 5
+ else if (item.Status == 5) {
+ html7 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
}
} else {
// console.log(i, a);
@@ -735,6 +794,14 @@
else if (item.Status == 3) {
html5 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
}
+ //绉诲叆涓� 4
+ else if (item.Status == 4) {
+ html5 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲嚭涓� 5
+ else if (item.Status == 5) {
+ html5 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
+ }
} else {
// console.log(i, a);
html5 += '<td></td>'
@@ -769,6 +836,14 @@
else if (item.Status == 3) {
html7 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
}
+ //绉诲叆涓� 4
+ else if (item.Status == 4) {
+ html7 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲嚭涓� 5
+ else if (item.Status == 5) {
+ html7 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
+ }
} else {
// console.log(i, a);
html7 += '<td></td>'
@@ -801,6 +876,14 @@
//鍑哄簱涓� 3
else if (item.Status == 3) {
html2 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲叆涓� 4
+ else if (item.Status == 4) {
+ html2 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲嚭涓� 5
+ else if (item.Status == 5) {
+ html2 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
}
} else {
// console.log(i, a);
@@ -835,6 +918,14 @@
else if (item.Status == 3) {
html1 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
}
+ //绉诲叆涓� 4
+ else if (item.Status == 4) {
+ html1 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲嚭涓� 5
+ else if (item.Status == 5) {
+ html1 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
+ }
} else {
// console.log(i, a);
html1 += '<td></td>'
@@ -866,6 +957,14 @@
//鍑哄簱涓� 3
else if (item.Status == 3) {
html4 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲叆涓� 4
+ else if (item.Status == 4) {
+ html4 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲嚭涓� 5
+ else if (item.Status == 5) {
+ html4 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
}
} else {
// console.log(i, a);
@@ -957,10 +1056,11 @@
});
//瀹氭椂鍣�
setInterval(function(){
+ // console.info(1)
if(autoRefresh){
- GetSlotVm($("#WareHouseNo").val(), $("#RoadwayNo").val(), $("#Row").val(), $("#Depth").val());
- //var currentDate = new Date();
- //console.log('鑷姩鍒锋柊浜嗭紝'+currentDate)
+ GetSlotVm($("#WareHouseNo").val(), $("#Row").val());
+ // var currentDate = new Date();
+ // console.log('鑷姩鍒锋柊浜嗭紝'+currentDate)
}
},10000)//10绉掕嚜鍔ㄥ埛鏂颁竴娆�
// #endregion
--
Gitblit v1.8.0