From b0cede2d821dddcbc519df5be14b6f5045dd4eca Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期六, 05 六月 2021 10:26:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/webapp/views/pda/combProAgv.html | 49 ++++++++++++------------
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 54 +++++++++++++++++++++++++++
2 files changed, 78 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index cd015e6..44cdceb 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -190,6 +190,33 @@
}
+ // 灏忚溅鍏ュ簱鎼繍鍛戒护 ----------------------------------------------------
+ if (!Cools.isEmpty(param.getCombMats()) && !Cools.isEmpty(param.getAgvSite())) {
+ BasAgv idleAgv = basAgvService.selectIdleAgv();
+ AgvCommand command = new AgvCommand();
+ command.setAgvId(idleAgv.getAgvId());
+ command.setInterCode(basAgvService.getAgvWorkNo());
+ command.setBeginLoc(String.valueOf(param.getAgvSite()));
+ command.setEndLoc("1088");
+ log.info(JSON.toJSONString(command));
+ String result;
+ try {
+ result = new HttpHandler.Builder()
+ .setUri(agvUrl + "/api/interfaceTask/SendTaskByThirdParty")
+ .setJson(JSON.toJSONString(command))
+ .build()
+ .doPost();
+ } catch (IOException e) {
+ e.printStackTrace();
+ throw new CoolException("璁块棶AGV鎺ュ彛澶辫触");
+ }
+ AgvResult agvResult = JSON.parseObject(result, AgvResult.class);
+ log.info(JSON.toJSONString(agvResult));
+ if (!agvResult.getResult()) {
+ log.error("agv鍛戒护鍙戦�佸け璐agvId={}]锛岄敊璇俊鎭�={}", command.getAgvId(), agvResult.getExplain());
+ throw new CoolException("agv鍛戒护鍙戦�佸け璐agvId=" + command.getAgvId() + "]锛岄敊璇俊鎭�=" + agvResult.getExplain());
+ }
+ }
}
@@ -268,6 +295,33 @@
}
}
+ // 灏忚溅鍏ュ簱鎼繍鍛戒护 ----------------------------------------------------
+ if (!Cools.isEmpty(param.getCombMats()) && !Cools.isEmpty(param.getAgvSite())) {
+ BasAgv idleAgv = basAgvService.selectIdleAgv();
+ AgvCommand command = new AgvCommand();
+ command.setAgvId(idleAgv.getAgvId());
+ command.setInterCode(basAgvService.getAgvWorkNo());
+ command.setBeginLoc(String.valueOf(param.getAgvSite()));
+ command.setEndLoc("1088");
+ log.info(JSON.toJSONString(command));
+ String result;
+ try {
+ result = new HttpHandler.Builder()
+ .setUri(agvUrl + "/api/interfaceTask/SendTaskByThirdParty")
+ .setJson(JSON.toJSONString(command))
+ .build()
+ .doPost();
+ } catch (IOException e) {
+ e.printStackTrace();
+ throw new CoolException("璁块棶AGV鎺ュ彛澶辫触");
+ }
+ AgvResult agvResult = JSON.parseObject(result, AgvResult.class);
+ log.info(JSON.toJSONString(agvResult));
+ if (!agvResult.getResult()) {
+ log.error("agv鍛戒护鍙戦�佸け璐agvId={}]锛岄敊璇俊鎭�={}", command.getAgvId(), agvResult.getExplain());
+ throw new CoolException("agv鍛戒护鍙戦�佸け璐agvId=" + command.getAgvId() + "]锛岄敊璇俊鎭�=" + agvResult.getExplain());
+ }
+ }
}
diff --git a/src/main/webapp/views/pda/combProAgv.html b/src/main/webapp/views/pda/combProAgv.html
index f6089c2..73c64d9 100644
--- a/src/main/webapp/views/pda/combProAgv.html
+++ b/src/main/webapp/views/pda/combProAgv.html
@@ -87,11 +87,10 @@
oninput="if(value.length>8)value=value.slice(0,8)" placeholder="鎵爜 / 杈撳叆" autocomplete="off">
</div>
<div class="layui-form">
- <div style="margin: 5px 1px 5px 5px; display: inline-block">
+ <div style="margin: 5px 1px 5px 5px; display: none">
<button id="mat-btn" type="button" class="layui-btn layui-btn-normal" onclick="getMat()"><i class="layui-icon">+</i>鎻愬彇</button>
</div>
<div style="display: inline-block">
- 宸ヤ綔鍖�
<!-- 宸ヤ綔鍖� -->
<div class="layui-inline" style="width: 100px; margin-left: 10px">
<select id="devpSelect">
@@ -244,7 +243,7 @@
// 鑾峰彇宸ヤ綔鍖�
function getDevp(){
$.ajax({
- url: baseUrl+"/available/put/site",
+ url: baseUrl+"/agv/put/site",
headers: {'token': localStorage.getItem('token')},
method: 'POST',
async: false,
@@ -434,28 +433,28 @@
tips("璇烽�夋嫨宸ヤ綔鍖�", true);
return;
}
- alert("灏忚溅鍏宠仈缁勬墭瀹屾垚锛堝姛鑳借繕鏈疄鐜帮級");
-// $.ajax({
-// url: baseUrl + "/mobile/comb/auth/batch",
-// headers: {'token': localStorage.getItem('token')},
-// data: JSON.stringify({
-// barcode: barcode,
-// combMats: matData,
-// }),
-// contentType: 'application/json;charset=UTF-8',
-// method: 'POST',
-// async: false,
-// success: function (res) {
-// if (res.code === 200) {
-// reset();
-// tips("缁勬墭鎴愬姛")
-// } else if (res.code === 403) {
-// top.location.href = baseUrl + "/pda";
-// } else {
-// tips(res.msg, true)
-// }
-// }
-// })
+ $.ajax({
+ url: baseUrl + "/mobile/comb/auth/batch",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify({
+ barcode: barcode,
+ combMats: matData,
+ agvSite: devp
+ }),
+ contentType: 'application/json;charset=UTF-8',
+ method: 'POST',
+ async: false,
+ success: function (res) {
+ if (res.code === 200) {
+ reset();
+ tips("缁勬墭鎴愬姛")
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/pda";
+ } else {
+ tips(res.msg, true)
+ }
+ }
+ })
}
/**
--
Gitblit v1.9.1