From 5fb1c85805da8cf8d682bc07272b170d60fd31ea Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 12 十二月 2023 16:49:11 +0800
Subject: [PATCH] 可视化站点显示
---
src/main/webapp/views/agvBasDevpVisualized/basDevp.html | 75 +++++++++++++++++++++++--------------
1 files changed, 46 insertions(+), 29 deletions(-)
diff --git a/src/main/webapp/views/agvBasDevpVisualized/basDevp.html b/src/main/webapp/views/agvBasDevpVisualized/basDevp.html
index acec6aa..9de3dc1 100644
--- a/src/main/webapp/views/agvBasDevpVisualized/basDevp.html
+++ b/src/main/webapp/views/agvBasDevpVisualized/basDevp.html
@@ -35,7 +35,7 @@
<!-- 寰呮坊鍔� -->
<div id="data-search-btn" class="layui-btn-container layui-form-item">
- <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
+ <button id="searchByStaion" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="searchByStaion">鎼滅储</button>
<button id="checkAll" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="checkAll">鍏ㄩ��</button>
<button id="uncheckAll" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="uncheckAll">鍙嶉��</button>
<button id="start" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="start">鍚姩鍏ュ簱</button>
@@ -61,27 +61,31 @@
<!-- <button type="button" class="layui-btn layui-btn-normal" value="{{devNo}}">鎷ｆ枡鍏ュ簱</button>-->
<!-- </div>-->
- {{#if agvWrkDetl}}
+ {{#if containerMoveOutFlag}}
<div style=" padding-bottom: 20px">
-
<button type="button" class="layui-btn layui-btn-normal" value="{{devNo}}" lay-submit lay-filter="containerMoveOut">瀹瑰櫒绂诲満</button>
- <button type="button" class="layui-btn layui-btn-normal" value="{{devNo}}" lay-submit lay-filter="pickIn">鎷ｆ枡鍏ュ簱</button>
-
</div>
{{/if}}
-
+ {{#if pickInFlag}}
+ <div style=" padding-bottom: 20px">
+ <button type="button" class="layui-btn layui-btn-normal" value="{{devNo}}" lay-submit lay-filter="pickIn">鎷ｆ枡/鐩樼偣鍏ュ簱</button>
+ </div>
+ {{/if}}
<div>
宸ヤ綔绔欑紪鐮侊細{{devNo}} </br>
绔欑偣鐘舵�侊細{{locSts$}}
</div>
- {{#if agvWaitPakin}}
+ {{#if agvWaitPakins}}
<div style="padding-top: 10px;">
- 鐗╂枡鍙凤細{{agvWaitPakin.matnr}} </br>
- {{#if agvWaitPakin.batch}}
- 搴忓垪鐮侊細{{agvWaitPakin.batch}} </br>
+ {{#if agvWaitPakins[0].orderNo}}
+ 璁㈠崟鍙凤細{{agvWaitPakins[0].orderNo}} </br>
{{/if}}
- 鎵樼洏鐮侊細{{agvWaitPakin.zpallet}} </br>
- 鏁伴噺锛歿{agvWaitPakin.anfme}}
+ 鐗╂枡鍙凤細{{agvWaitPakins[0].matnr}} </br>
+ {{#if agvWaitPakins[0].batch}}
+ 搴忓垪鐮侊細{{agvWaitPakins[0].batch}} </br>
+ {{/if}}
+ 鏂欑鐮侊細{{agvWaitPakins[0].suppCode}} </br>
+ 鏁伴噺锛歿{agvWaitPakins[0].anfme}}
</div>
{{/if}}
{{#if agvWrkMast}}
@@ -91,14 +95,17 @@
宸ヤ綔绫诲瀷锛歿{agvWrkMast.ioType$}}
</div>
{{/if}}
- {{#if agvWrkDetl}}
+ {{#if agvWrkDetls}}
<div style="padding-top: 10px;">
- 鐗╂枡鍙凤細{{agvWrkDetl.matnr}} </br>
- {{#if agvWrkDetl.batch}}
- 搴忓垪鐮侊細{{agvWrkDetl.batch}} </br>
+ {{#if agvWrkDetls[0].orderNo}}
+ 璁㈠崟鍙凤細{{agvWrkDetls[0].orderNo}} </br>
{{/if}}
- 鎵樼洏鐮侊細{{agvWrkDetl.zpallet}} </br>
- 鏁伴噺锛歿{agvWrkDetl.anfme}}
+ 鐗╂枡鍙凤細{{agvWrkDetls[0].matnr}} </br>
+ {{#if agvWrkDetls[0].batch}}
+ 搴忓垪鐮侊細{{agvWrkDetls[0].batch}} </br>
+ {{/if}}
+ 鏂欑鐮侊細{{agvWrkDetls[0].suppCode}} </br>
+ 鍙栬揣鏁伴噺锛歿{agvWrkDetls[0].anfme}} 缁撲綑鏁伴噺锛歿{agvWrkDetls[0].volume}}
</div>
{{/if}}
</div>
@@ -143,24 +150,26 @@
$('#rowSelect').empty();
if(data.value == 1){
- $('#rowSelect').append("<option value=CS-101>1鍙�</option>");
- $('#rowSelect').append("<option value=CS-102>2鍙�</option>")
+ $('#rowSelect').append("<option value=CS-101>101</option>");
+ $('#rowSelect').append("<option value=CS-102>102</option>")
}
if(data.value == 3){
- $('#rowSelect').append("<option value=CS-305>1鍙�</option>");
- $('#rowSelect').append("<option value=CS-306>2鍙�</option>")
- $('#rowSelect').append("<option value=CS-307>3鍙�</option>")
+ $('#rowSelect').append("<option value=CS-305>305</option>");
+ $('#rowSelect').append("<option value=CS-306>306</option>");
+ $('#rowSelect').append("<option value=CS-307>307</option>");
+ $('#rowSelect').append("<option value=CS-308>308</option>")
+ $('#rowSelect').append("<option value=CS-309>309</option>")
}
form.render();
});
// 鎼滅储
- form.on('submit(search)', function (data) {
- param = null;
- param = {'stationCode' : $('#rowSelect').val()};
- loadData(param);
- });
+ // form.on('submit(search)', function (data) {
+ // param = null;
+ // param = {'stationCode' : $('#rowSelect').val()};
+ // loadData(param);
+ // });
//鍏ㄩ��
form.on('submit(checkAll)', function () {
@@ -168,6 +177,14 @@
for (var i = 0; i < cks.length; i++) {
cks[i].checked = true;
}
+ });
+
+ //鎼滅储
+ form.on('submit(searchByStaion)', function () {
+ console.log("search.....")
+ param = null;
+ param = {'stationCode' : $('#rowSelect').val()};
+ loadData(param);
});
//鍙嶉��
@@ -204,7 +221,7 @@
});
- //鎷ｆ枡鍏ュ簱
+ //鎷ｆ枡/鐩樼偣鍏ュ簱
form.on('submit(pickIn)', function () {
var devNoList = [];
devNoList.push(this.value);
--
Gitblit v1.9.1