From d55581ed00fd0a8ecce78a6ebe6f9e2ee86274b3 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 04 八月 2023 17:01:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs' into tzskasrs
---
src/main/webapp/views/agvBasDevpVisualized/basDevp.html | 101 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 78 insertions(+), 23 deletions(-)
diff --git a/src/main/webapp/views/agvBasDevpVisualized/basDevp.html b/src/main/webapp/views/agvBasDevpVisualized/basDevp.html
index 521e936..acec6aa 100644
--- a/src/main/webapp/views/agvBasDevpVisualized/basDevp.html
+++ b/src/main/webapp/views/agvBasDevpVisualized/basDevp.html
@@ -57,6 +57,19 @@
<input type="checkbox" lay-skin="primary" name="cardCheckBox" value="{{devNo}}"/>
</div>
<div style="float:right; width:85%;">
+<!-- <div>-->
+<!-- <button type="button" class="layui-btn layui-btn-normal" value="{{devNo}}">鎷ｆ枡鍏ュ簱</button>-->
+<!-- </div>-->
+
+ {{#if agvWrkDetl}}
+ <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}}
+
<div>
宸ヤ綔绔欑紪鐮侊細{{devNo}} </br>
绔欑偣鐘舵�侊細{{locSts$}}
@@ -76,6 +89,16 @@
宸ヤ綔鍙凤細{{agvWrkMast.wrkNo}} </br>
宸ヤ綔鐘舵�侊細{{agvWrkMast.wrkSts$ }} </br>
宸ヤ綔绫诲瀷锛歿{agvWrkMast.ioType$}}
+ </div>
+ {{/if}}
+ {{#if agvWrkDetl}}
+ <div style="padding-top: 10px;">
+ 鐗╂枡鍙凤細{{agvWrkDetl.matnr}} </br>
+ {{#if agvWrkDetl.batch}}
+ 搴忓垪鐮侊細{{agvWrkDetl.batch}} </br>
+ {{/if}}
+ 鎵樼洏鐮侊細{{agvWrkDetl.zpallet}} </br>
+ 鏁伴噺锛歿{agvWrkDetl.anfme}}
</div>
{{/if}}
</div>
@@ -114,6 +137,7 @@
var table = layui.table;
var layer = layui.layer;
var param = {'stationCode' : 'CS-101'};
+ loadData(param);
form.on('select(floorSelect)', function (data) {
@@ -136,26 +160,6 @@
param = null;
param = {'stationCode' : $('#rowSelect').val()};
loadData(param);
- // $.ajax({
- // url: baseUrl+"/agv/basDevp/visualized/list/auth",
- // headers: {'token': localStorage.getItem('token')},
- // data: JSON.stringify(param),
- // dataType:'json',
- // contentType:'application/json;charset=UTF-8',
- // method: 'POST',
- // success: function (res) {
- // if (res.code === 200){
- // var tpl = $("#basDevpMapTemplate").html();
- // var template = Handlebars.compile(tpl);
- // var html = template(res.data);
- // $('#basDevpMap').html(html);
- // } else if (res.code === 403){
- // top.location.href = baseUrl+"/";
- // }else {
- // layer.msg(res.msg)
- // }
- // }
- // })
});
//鍏ㄩ��
@@ -172,6 +176,57 @@
for (var i = 0; i < cks.length; i++) {
cks[i].checked = !cks[i].checked;
}
+ });
+
+ //瀹瑰櫒绂诲満
+ form.on('submit(containerMoveOut)', function () {
+ var devNoList = [];
+ devNoList.push(this.value);
+ var moveOutParam = {'devNo' : devNoList};
+ $.ajax({
+ url: baseUrl+"/agv/basDevp/visualized/container/moveOut",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(moveOutParam),
+ dataType:'json',
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ layer.msg(res.msg);
+ loadData(param);
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+
+ });
+
+ //鎷ｆ枡鍏ュ簱
+ form.on('submit(pickIn)', function () {
+ var devNoList = [];
+ devNoList.push(this.value);
+ var pickInParam = {'devNo' : devNoList};
+ $.ajax({
+ url: baseUrl+"/agv/basDevp/visualized/container/pickIn",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(pickInParam),
+ dataType:'json',
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ layer.msg(res.msg);
+ loadData(param);
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ })
});
//鍚姩鍏ュ簱
@@ -206,9 +261,9 @@
//瀹氭椂鍒锋柊鏁版嵁
//setInterval(loadData(param), 1000);
- setInterval(function() {
- loadData(param);
- }, 1000);
+ // setInterval(function() {
+ // loadData(param);
+ // }, 1000);
function loadData(param){
$.ajax({
--
Gitblit v1.9.1