From 002f10f7d38dc6791d26a69d061e6b17f9980fd0 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 24 三月 2025 19:41:36 +0800
Subject: [PATCH] 1
---
src/main/webapp/views/agvBasDevpVisualized/basDevp.html | 60 ++++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 38 insertions(+), 22 deletions(-)
diff --git a/src/main/webapp/views/agvBasDevpVisualized/basDevp.html b/src/main/webapp/views/agvBasDevpVisualized/basDevp.html
index d39c441..33ae47a 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>
@@ -63,7 +63,7 @@
{{#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="containerMoveOut">璐ф灦绂诲満</button>
</div>
{{/if}}
{{#if pickInFlag}}
@@ -77,11 +77,14 @@
</div>
{{#if agvWaitPakin}}
<div style="padding-top: 10px;">
+ {{#if agvWaitPakin.orderNo}}
+ 璁㈠崟鍙凤細{{agvWaitPakin.orderNo}} </br>
+ {{/if}}
鐗╂枡鍙凤細{{agvWaitPakin.matnr}} </br>
{{#if agvWaitPakin.batch}}
搴忓垪鐮侊細{{agvWaitPakin.batch}} </br>
{{/if}}
- 鎵樼洏鐮侊細{{agvWaitPakin.zpallet}} </br>
+ 璐ф灦鐮侊細{{agvWaitPakin.suppCode}} </br>
鏁伴噺锛歿{agvWaitPakin.anfme}}
</div>
{{/if}}
@@ -94,12 +97,15 @@
{{/if}}
{{#if agvWrkDetl}}
<div style="padding-top: 10px;">
+ {{#if agvWrkDetl.orderNo}}
+ 璁㈠崟鍙凤細{{agvWrkDetl.orderNo}} </br>
+ {{/if}}
鐗╂枡鍙凤細{{agvWrkDetl.matnr}} </br>
{{#if agvWrkDetl.batch}}
搴忓垪鐮侊細{{agvWrkDetl.batch}} </br>
{{/if}}
- 鎵樼洏鐮侊細{{agvWrkDetl.zpallet}} </br>
- 鏁伴噺锛歿{agvWrkDetl.anfme}}
+ 璐ф灦鐮侊細{{agvWrkDetl.suppCode}} </br>
+ 鍙栬揣鏁伴噺锛歿{agvWrkDetl.anfme}} 缁撲綑鏁伴噺锛歿{agvWrkDetl.volume}}
</div>
{{/if}}
</div>
@@ -120,12 +126,12 @@
<table class="layui-hide" id="basDevpDetl" lay-filter="locDetlByMap"></table>
</div>
-<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
-<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
-<script type="text/javascript" src="../../static/js/agvBasDevpVisualized/basDevp.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js?v=100"></script>
+<script type="text/javascript" src="../../static/layui/layui.js?v=100" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js?v=100" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js?v=100" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js?v=100"></script>
+<script type="text/javascript" src="../../static/js/agvBasDevpVisualized/basDevp.js?v=100" charset="utf-8"></script>
<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
@@ -144,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 () {
@@ -169,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);
});
//鍙嶉��
@@ -179,7 +195,7 @@
}
});
- //瀹瑰櫒绂诲満
+ //璐ф灦绂诲満
form.on('submit(containerMoveOut)', function () {
var devNoList = [];
devNoList.push(this.value);
--
Gitblit v1.9.1