From 78b52c20a27a02466c8af9c0c8222b9f2f3ff20c Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 18 一月 2024 19:59:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2
src/main/webapp/views/console.html | 2
src/main/webapp/static/js/console.js | 19 +++++-
src/main/webapp/static/css/render.css | 9 +++
src/main/webapp/static/js/console.map.js | 93 ++++++++++++++++++++++++++++++-
5 files changed, 116 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 4f9a94a..b28f535 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -91,7 +91,7 @@
@Value("${wms.url}")
private String wmsUrl;
- public short wrkNo = 10000;
+ public short wrkNo = 11000;
/**
* 缁勬墭
diff --git a/src/main/webapp/static/css/render.css b/src/main/webapp/static/css/render.css
index 808914a..a3e42cd 100644
--- a/src/main/webapp/static/css/render.css
+++ b/src/main/webapp/static/css/render.css
@@ -98,6 +98,15 @@
box-shadow: inset 2px 2px 2px 0px rgba(255, 255, 255, 0.5), 7px 7px 20px 0px rgba(0, 0, 0, 0.1),
4px 4px 5px 0px rgba(0, 0, 0, 0.1);
}
+.barcode {
+ position: absolute;
+ color: #a19c9c;
+ border: 1px solid rgb(108,167,168);
+ cursor: pointer;
+ text-align: center;
+ background-color: rgb(157, 217, 162);
+ font-size: 10px;
+}
/* 16 */
.btn-16 {
border: none;
diff --git a/src/main/webapp/static/js/console.js b/src/main/webapp/static/js/console.js
index f731681..fed00b7 100644
--- a/src/main/webapp/static/js/console.js
+++ b/src/main/webapp/static/js/console.js
@@ -9,8 +9,10 @@
track = '',
tracks = '',
stn = '',
+ barcode = '',
stns = '',
stnArr = [],
+ barcodeArr = [],
floorBtn = '',
floorBtns = '',
floorBtnss = '',
@@ -124,6 +126,7 @@
for (let i = 0; i < areas.length;i++) {
let stnss = areas[i].stns
+ let barcodes = areas[i].barcode
let floor = areas[i].text
floorId = areas[i].id
var position = (i+1)*100
@@ -138,6 +141,7 @@
var index = i
var n = 1
stnArr[index] = ''
+ barcodeArr[index] = ''
total[index] = ''
for (let j = 0; j < stnss.length; j++) {
if (stnss[j].type == "stn") {
@@ -160,11 +164,18 @@
"px'>" + stnss[j].text + "</div>"
stnArr[i] = stnArr[i] + stn
}
-
}
-
+ for (let k = 0; k < barcodes.length; k++) {
+ barcode = "<div class='barcode' id='" + barcodes[k].id +
+ "'style='width:" + barcodes[k].width +
+ "px;height: " + barcodes[k].height +
+ "px;line-height: " + barcodes[k].height +
+ "px;top: "+ barcodes[k].top +
+ "px;left: "+ barcodes[k].left + "px'>" + "</div>"
+ barcodeArr[i] = barcodeArr[i] + barcode
+ }
}
- floorInfo = racks + rackDescs + tracks + crns + stnArr[0] + floorBtnss
+ floorInfo = racks + rackDescs + tracks + crns + stnArr[0] + floorBtnss + barcodeArr[0]
$(".main-part").append(floorInfo)
$("#line-total").html(total[0])
@@ -173,7 +184,7 @@
}
function changFloor(e) {
$(".main-part").empty() // 娓呯┖鑺傜偣
- floorInfo = racks + stnArr[e] +rackDescs + crns + tracks + floorBtnss
+ floorInfo = racks + stnArr[e] +rackDescs + crns + tracks + floorBtnss + barcodeArr[e]
$(".main-part").append(floorInfo)
$("#line-total").empty()
$("#line-total").html(total[e])
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index 8ea6a2f..6f75c5c 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -263,7 +263,36 @@
"left": 991,
"width": 80,
"height": 23
- }]
+ }],
+ "barcode": [
+ {
+ "type": "barcode",
+ "id": "barcode-1",
+ "text": "",
+ "top": 153,
+ "left": 1153,
+ "width": 80,
+ "height": 20
+ },
+ {
+ "type": "barcode",
+ "id": "barcode-2",
+ "text": "",
+ "top": 214,
+ "left": 1153,
+ "width": 80,
+ "height": 20
+ },
+ {
+ "type": "barcode",
+ "id": "barcode-3",
+ "text": "",
+ "top": 261,
+ "left": 1153,
+ "width": 80,
+ "height": 20
+ },
+ ]
}, {
"type": "floor",
"id": "page_floor2",
@@ -376,7 +405,36 @@
"left": 991,
"width": 80,
"height": 23
- }]
+ }],
+ "barcode": [
+ {
+ "type": "barcode",
+ "id": "barcode-4",
+ "text": "",
+ "top": 153,
+ "left": 1153,
+ "width": 80,
+ "height": 20
+ },
+ {
+ "type": "barcode",
+ "id": "barcode-5",
+ "text": "",
+ "top": 214,
+ "left": 1153,
+ "width": 80,
+ "height": 20
+ },
+ {
+ "type": "barcode",
+ "id": "barcode-6",
+ "text": "",
+ "top": 261,
+ "left": 1153,
+ "width": 80,
+ "height": 20
+ },
+ ]
}, {
"type": "floor",
"id": "page_floor3",
@@ -489,7 +547,36 @@
"left": 991,
"width": 80,
"height": 23
- }]
+ }],
+ "barcode": [
+ {
+ "type": "barcode",
+ "id": "barcode-7",
+ "text": "",
+ "top": 153,
+ "left": 1153,
+ "width": 80,
+ "height": 20
+ },
+ {
+ "type": "barcode",
+ "id": "barcode-8",
+ "text": "",
+ "top": 214,
+ "left": 1153,
+ "width": 80,
+ "height": 20
+ },
+ {
+ "type": "barcode",
+ "id": "barcode-9",
+ "text": "",
+ "top": 261,
+ "left": 1153,
+ "width": 80,
+ "height": 20
+ },
+ ]
}]
}]
}
\ No newline at end of file
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index ac98207..bce6404 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -635,7 +635,7 @@
if (res.code === 200) {
var barcodes = res.data;
for (var i = 0; i < barcodes.length; i++) {
- $("#code-decoder-data-" + barcodes[i].barcodeId).html(barcodes[i].codeValue);
+ $("#barcode-"+barcodes[i].barcodeId).html(barcodes[i].codeValue ? barcodes[i].codeValue : "--");
}
} else if (res.code === 403) {
parent.location.href = baseUrl + "/login";
--
Gitblit v1.9.1