From fc9d08ef427c4fce72f469edbbb193c92249fd01 Mon Sep 17 00:00:00 2001
From: whycq <you@example.com>
Date: 星期二, 27 六月 2023 18:43:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 13 +++++++++++++
src/main/webapp/views/console.html | 22 ++++++++++++++++++++++
2 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index c7f10e9..1bfdeab 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -167,6 +167,19 @@
return R.ok().add(list);
}
+ @PostMapping("/latest/inSta/data/barcode")
+ @ManagerAuth(memo = "鏉＄爜鎵弿浠疄鏃舵暟鎹�")
+ public R barcodeData(Integer barcodeId){
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeId);
+ if (null == barcodeThread) {
+ return R.ok();
+ }
+ BarcodeDataVo vo = new BarcodeDataVo();
+ vo.setBarcodeId(barcodeId);
+ vo.setCodeValue(barcodeThread.getBarcode());
+ return R.ok().add(vo);
+ }
+
@PostMapping("/latest/data/scale")
@ManagerAuth(memo = "纾呯Г瀹炴椂鏁版嵁")
public R scaleLatestData(){
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index c84560f..fe997be 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -34,8 +34,10 @@
</div>
<!-- 绗�4鍒� -->
<div class="site-row site-row-4">
+<!-- <div id="barcode-103" class="barcode" style="height: 36px;line-height: 36px;">80004175</div>-->
<div id="site-103" class="site" style="height: 36px;line-height: 36px;">103</div>
<div id="site-203" class="site" style="height: 30px;line-height: 30px;margin-top: 96px;">203</div>
+<!-- <div id="barcode-203" class="barcode" style="height: 30px;line-height: 30px;margin-top: 96px;">80003736</div>-->
</div>
<!-- 绗�5鍒� -->
<div class="site-row site-row-5">
@@ -1073,6 +1075,7 @@
getSystemRunningStatus();
getBarcodeInfo();
getScaleInfo();
+ getInStaBarcodeInfo(1);
}, 1000);
setInterval(function () {
getSitesInfo();
@@ -1204,6 +1207,25 @@
}
});
}
+ // 鍏ュ簱绔欐壂鐮佸櫒鏁版嵁瀹炴椂鑾峰彇
+ function getInStaBarcodeInfo(barcodeId) {
+ $.ajax({
+ url: baseUrl + "/latest/inSta/data/barcode",
+ data: {barcodeId:barcodeId},
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function (res) {
+ console.log(res)
+ if (res.code === 200){
+
+ } else if (res.code === 403){
+ parent.location.href = baseUrl+"/login";
+ } else {
+ console.log(res.msg);
+ }
+ }
+ })
+ }
// 鎵爜鍣ㄥ疄鏃舵暟鎹幏鍙�
function getBarcodeInfo(){
--
Gitblit v1.9.1