From 7d792a89d6ff605f1a33316731b1486239317aa3 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 11 五月 2023 14:38:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 1
src/main/java/com/zy/asrs/controller/SiteController.java | 3 +
src/main/java/com/zy/asrs/entity/BasDevp.java | 6 ++
src/main/webapp/static/js/console.js | 20 +++++++++
src/main/webapp/static/js/console.map.js | 18 ++++----
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 24 ++++++------
src/main/resources/application.yml | 4 +-
7 files changed, 50 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index 1c5da67..d3dab66 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -85,7 +85,8 @@
vo.setPakMk(staProtocol.isPakMk()?"Y":"N"); // 鍏ュ簱鏍囪
vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N"); // 绌烘澘淇″彿
vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
- vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "灏�" : "澶�"); //楂樹綆搴撲綅
+// vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "灏�" : "澶�"); //楂樹綆搴撲綅
+ vo.setLocType1(devp.getLocType1$());
// vo.setLocType1(devp.getDevNo()==102 ? "楂�" : "浣�");
}
return R.ok().add(list);
diff --git a/src/main/java/com/zy/asrs/entity/BasDevp.java b/src/main/java/com/zy/asrs/entity/BasDevp.java
index 1e3d022..5c07d29 100644
--- a/src/main/java/com/zy/asrs/entity/BasDevp.java
+++ b/src/main/java/com/zy/asrs/entity/BasDevp.java
@@ -228,9 +228,13 @@
case 0:
return "鏈煡";
case 1:
- return "浣庡簱浣�";
+ return "杈冧綆搴撲綅";
case 2:
+ return "浣庡簱浣�";
+ case 3:
return "楂樺簱浣�";
+ case 4:
+ return "鐗归珮搴撲綅";
default:
return String.valueOf(this.locType1);
}
diff --git a/src/main/java/com/zy/core/model/protocol/StaProtocol.java b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
index c989cb1..0fe3464 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -76,6 +76,7 @@
basDevp.setLocType2((short) 0); // 瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿
basDevp.setLocType3((short) 0); // 杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿
basDevp.setLocType1(high != low && low ? (short) 1 : (short) 2);
+// basDevp.
basDevp.setInQty(inQty !=null ?(int)inQty : 0);
return basDevp;
}
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 545eb41..7065f1b 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -143,9 +143,9 @@
staProtocol.setSiteId(siteId);
station.put(siteId, staProtocol);
}
- staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*2)); // 宸ヤ綔鍙�
+ staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4)); // 宸ヤ綔鍙�
- staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*2 + 2 )); // 鐩爣绔�
+ staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4 + 2 )); // 鐩爣绔�
}
}
Thread.sleep(200);
@@ -176,10 +176,10 @@
staProtocol.setOutEnable(status[3]);// 鍙嚭
staProtocol.setEmptyMk(status[4]); // 绌烘澘淇″彿
staProtocol.setFullPlt(status[5]); // 婊℃墭鐩�
- staProtocol.setHigh(status[6]);
- staProtocol.setHigh1(status[7]);
- staProtocol.setLow(status[8]);
- staProtocol.setLow1(status[9]);
+ staProtocol.setLow(status[6]); // 浣� -- 楂�
+ staProtocol.setLow1(status[7]);
+ staProtocol.setHigh(status[8]);
+ staProtocol.setHigh1(status[9]);
if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
staProtocol.setPakMk(true);
@@ -188,10 +188,10 @@
}
// 鏉＄爜鎵弿鍣�
- if(slave.getId() == 2) {
+ if(slave.getId() == 1) {
Thread.sleep(200);
OperateResultExOne<byte[]> result2 = null;
- result2 = siemensS7Net.Read("DB100.200", (short) (barcodeSize * 8));
+ result2 = siemensS7Net.Read("DB100.150", (short) (barcodeSize * 8));
if (result2.IsSuccess) {
for (int i = 0; i < barcodeSize; i++) {
String barcode = siemensS7Net.getByteTransform().TransString(result2.Content, i * 8, 8, "UTF-8");
@@ -259,11 +259,11 @@
short[] array = new short[2];
array[0] = staProtocol.getWorkNo();
array[1] = staProtocol.getStaNo();
-// OperateResult write = siemensS7Net.Write("DB100." + index*4, array);
+ OperateResult write = siemensS7Net.Write("DB100." + index*4, array);
- OperateResult write = siemensS7Net.Write("DB100." + index*2, staProtocol.getWorkNo()); // 宸ヤ綔鍙�
- Thread.sleep(300);
- OperateResult write1 = siemensS7Net.Write("DB100." + index*2, staProtocol.getStaNo()); // 鐩爣绔�
+// OperateResult write = siemensS7Net.Write("DB100." + index*2, staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+// Thread.sleep(300);
+// OperateResult write1 = siemensS7Net.Write("DB100." + index*2, staProtocol.getStaNo()); // 鐩爣绔�
if (!write.IsSuccess) {
staProtocol = station.get(staProtocol.getSiteId());
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 10bfd85..b106d7e 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -129,12 +129,12 @@
# 鏉＄爜鎵弿浠�1 宸︿笅 1妤煎紑濮�,111
barcode[0]:
id: 1
- ip: 10.10.10.100
+ ip: 10.10.10.3
port: 51236
# 鏉＄爜鎵弿浠�2, 114
barcode[1]:
id: 2
- ip: 10.10.10.101
+ ip: 10.10.10.4
port: 51236
# LED1
led[0]:
diff --git a/src/main/webapp/static/js/console.js b/src/main/webapp/static/js/console.js
index 25325ad..f065a74 100644
--- a/src/main/webapp/static/js/console.js
+++ b/src/main/webapp/static/js/console.js
@@ -62,11 +62,29 @@
}
}
}
- bayWidth = rackss[i].width / bLen
+ bayWidth = (rackss[i].width / bLen)-4
// hpPosition 0 琛ㄧず璐ф灦搴忓彿 宸�->鍙� 1 琛ㄧず璐ф灦搴忓彿 宸�<-鍙�
if (mapInfo.hpPosition == 1) {
bNum = maxBayNo
for (let j = bLen; j > 0; j--) {
+ if (i === 0) {
+ if (j === 13) {
+ bay = "<button class='item' style='width: " + 160 + "px'>" + bNum + "</button>"
+ bays = bays + bay
+ bNum = bNum - interval;
+ continue
+ }
+ bay = "<button class='item' style='width: "+ bayWidth +"px'>" + bNum + "</button>"
+ bays = bays + bay
+ bNum = bNum - interval;
+ continue
+ }
+ if (j === 13) {
+ bay = "<button class='item' style='margin-left: 160px;width: "+ bayWidth +"px'>" + (bNum - 2) + "</button>"
+ bays = bays + bay
+ bNum = bNum - interval - 2;
+ continue
+ }
bay = "<button class='item' style='width: "+ bayWidth +"px'>" + bNum + "</button>"
bays = bays + bay
bNum = bNum - interval;
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index 31c1fb5..4abc3c2 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -3,7 +3,7 @@
"rackCount": 18,
"crnCount": 7,
"stbCount": 77,
- "hpPosition": 0,
+ "hpPosition": 1,
"minBayNo": 2,
"floors": 1,
"racks": [
@@ -34,7 +34,7 @@
"id": "lb_desc1",
"text": "#1",
"top": 324,
- "left": 1794,
+ "left": 1812,
"width": 30,
"height": 23
},
@@ -43,7 +43,7 @@
"id": "lb_desc2",
"text": "#2",
"top": 388,
- "left": 1794,
+ "left": 1812,
"width": 30,
"height": 23
},
@@ -93,7 +93,7 @@
"id": "site-105",
"text": "105",
"top": 386,
- "left": 1067,
+ "left": 1007,
"width": 78,
"height": 24
},
@@ -102,7 +102,7 @@
"id": "site-102",
"text": "102",
"top": 386,
- "left": 1147,
+ "left": 1087,
"width": 78,
"height": 24
},
@@ -111,7 +111,7 @@
"id": "site-104",
"text": "104",
"top": 412,
- "left": 1067,
+ "left": 1007,
"width": 78,
"height": 24
},
@@ -120,7 +120,7 @@
"id": "site-101",
"text": "101",
"top": 412,
- "left": 1147,
+ "left": 1087,
"width": 78,
"height": 24
},
@@ -129,7 +129,7 @@
"id": "site-103",
"text": "103",
"top": 438,
- "left": 1067,
+ "left": 1007,
"width": 78,
"height": 24
},
@@ -138,7 +138,7 @@
"id": "site-100",
"text": "100",
"top": 438,
- "left": 1147,
+ "left": 1087,
"width": 78,
"height": 24
},
--
Gitblit v1.9.1