From adbda4e54b89ea45d42fbb5079c93023dc702520 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 01 三月 2022 15:26:08 +0800
Subject: [PATCH] Merge branch 'xgmwcs' of http://47.97.1.152:5880/r/zy-wcs into xgmwcs
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 7 -
src/main/java/com/zy/core/thread/LedThread.java | 2
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 3
src/main/webapp/views/console.html | 123 +++++++++++++++++++++++++++++------------
src/main/resources/application.yml | 2
5 files changed, 92 insertions(+), 45 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 6379d35..034bbdf 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -33,10 +33,7 @@
import com.zy.core.thread.ScaleThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.*;
@@ -282,7 +279,7 @@
return R.ok();
}
- @PostMapping("/barcode/output/site")
+ @GetMapping("/barcode/output/site")
public R crnOutput(){
// StringBuilder str = new StringBuilder();
// String s;
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 b27d91d..e8daaa8 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -298,8 +298,7 @@
/**
* 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
*/
- @Async
- public void stnToCrnStnPick(){
+ public synchronized void stnToCrnStnPick(){
for (DevpSlave devp : slaveProperties.getDevp()) {
// 閬嶅巻鎷ｆ枡鍏ュ簱鍙�
for (DevpSlave.Sta pickSta : devp.getPickSta()) {
diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index de41c18..197b219 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -151,7 +151,7 @@
}
} else {
page.newLine("鑷姩鍖栫珛浣撲粨搴�");
- page.newLine("瑗挎牸閭佽偂浠芥湁闄愬叕鍙�");
+ page.newLine("瑗挎牸杩堣偂浠芥湁闄愬叕鍙�");
}
// 璁剧疆瀛椾綋
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 3c687bd..1af7423 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -180,7 +180,7 @@
staNo: 182
# 鎷ｆ枡鍏ュ簱鍙�
pickSta[0]:
- staNo: 173
+ staNo: 176
barcode: ${wcs-slave.barcode[0].id}
# 鏉＄爜鎵弿浠�
barcode[0]:
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 6dd20cd..e28905a 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -972,36 +972,24 @@
<div class="table-head">
<li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
</div>
- <div class="table-body">
- <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
- <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
- <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
- <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
- <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
+ <div id="barcode1" class="table-body">
+
</div>
</div>
<div class="tablebox">
<div class="table-head">
<li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
</div>
- <div class="table-body">
- <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
- <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
- <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
- <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
- <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
+ <div id="barcode2" class="table-body">
+
</div>
</div>
<div class="tablebox">
<div class="table-head">
<li><span>鏉＄爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
</div>
- <div class="table-body">
- <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
- <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
- <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
- <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
- <li><span>鍑哄簱鍗�1</span><span class="right">12-12 12:12</span></li>
+ <div id="barcode3" class="table-body">
+
</div>
</div>
</div>
@@ -1230,6 +1218,67 @@
</body>
</html>
+<script>
+ var tData = []
+ var tDate1 = []
+ var tDate2 = []
+ var tDate3 = []
+ function getCodeData(){
+ $.ajax({
+ url:baseUrl +'/console/barcode/output/site',
+ method:'GET',
+ success:function (res) {
+ if(res.code === 200){
+ tData = eval(res.data);
+ console.log(tData)
+ if(tData.length<=5){
+ tData1 = tData
+ } else if (tData.length<=10){
+ tDate1 = tData.slice(0,5)
+ tData.splice(0,5)
+ tDate2 = tData
+ console.log(tDate2)
+ } else if(tData.length<=15){
+ tDate1 = tData.slice(0,5)
+ tDate2 = tData.slice(6,10)
+ tData.splice(0,10)
+ tDate3 = tData
+ console.log(tDate3)
+ } else {
+ tData = tData.slice(-15)
+ tDate1 = tData.slice(-15)
+ tDate2 = tData.slice(-10)
+ tDate3 = tData.slice(-5)
+
+ }
+ }
+ }
+ })
+ }
+ setInterval(function () {
+ getCodeData();
+ renderBarCode();
+ }, 1000)
+
+
+
+
+ function renderBarCode() {
+ for (var i = 0;i<tDate1.length;i++){
+ console.log(tDate1[i])
+ var str1 = '<li><span>' + tDate1[i].barcode + '</span><span class="right">' + tDate1[i].time + '</span></li>'
+ $('#barcode1').append(str1)
+ }
+ for(var j = 0;j<tDate2.length;j++){
+ var str2 = '<li><span>' + tDate2[j].barcode + '</span><span class="right">' + tDate2[j].time + '</span></li>'
+ $('#barcode2').append(str2)
+ }
+ for(var k = 0;k<tDate3.length;k++){
+ var str3 = '<li><span>' + tDate3[k].barcode + '</span><span class="right">' + tDate3[k].time + '</span></li>'
+ $('#barcode3').append(str3)
+ }
+ }
+</script>
<script type="text/javascript">
// 寮圭獥绔欑偣淇℃伅
$('.site').on('click',function(){
@@ -1248,7 +1297,7 @@
},
method:'post',
success:function (res) {
- for (var val in data) {
+ for (var val in res.data) {
var find = $("#siteWindow").find(":input[name='" + val + "']");
if (find[0].type==='text') {
find.val(data[val]);
@@ -1259,15 +1308,6 @@
}
})
- // res.data
- for (var val in data) {
- var find = $("#siteWindow").find(":input[name='" + val + "']");
- if (find[0].type==='text') {
- find.val(data[val]);
- } else if (find[0].type === 'checkbox') {
- find.attr("checked", data[val] === 'Y');
- }
- }
});
// 鍫嗗灈鏈轰俊鎭�
@@ -1277,17 +1317,28 @@
$("#siteWindow").attr("style","display:none;");
$('.detailed').empty();
$('.detailed').append(id+'鍙峰爢鍨涙満');
- $.post(baseUrl+"/console/crn/detail", {crnNo: id}, function (res) {
- console.log(res)
- for (var val in res.data) {
- var find = $("#crnWindow").find(":input[name='" + val + "']");
- if (find[0].type==='text') {
- find.val(res.data[val]);
- } else if (find[0].type === 'checkbox') {
- find.attr("checked", res.data[val] === 'Y');
+ $.ajax({
+ url:baseUrl+"/console/crn/detail",
+ headers:{
+ 'token': localStorage.getItem('token')
+ },
+ data:{
+ crnNo: id
+ },
+ method:'post',
+ success:function (res) {
+ for (var val in res.data) {
+ var find = $("#crnWindow").find(":input[name='" + val + "']");
+ if (find[0].type==='text') {
+ find.val(res.data[val]);
+ } else if (find[0].type === 'checkbox') {
+ find.attr("checked", res.data[val] === 'Y');
+ }
}
}
+
})
+
})
// 寮圭獥鍏抽棴
$('button').on('click',function(){
--
Gitblit v1.9.1