From 97fb61157e1f007c00c10c01a7307b0cc374a745 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期二, 18 十月 2022 11:53:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hylywcs' into hylywcs
---
src/main/webapp/static/js/console.js | 61 ++++++++++----
src/main/webapp/static/js/console.map.js | 48 ++++++------
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 60 +++++++++++++-
src/main/resources/application.yml | 22 +++++
4 files changed, 142 insertions(+), 49 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 85da205..a8bde3c 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -8,6 +8,7 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
+import com.core.exception.CoolException;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.service.BasDevpService;
import com.zy.core.DevpThread;
@@ -41,10 +42,15 @@
private SiemensS7Net siemensS7Net;
private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
private short heartBeatVal = 1;
- public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
+
+ public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
add(101);add(102);add(103);add(104);
add(201);add(202);add(203);add(204);
- add(301);add(302);add(303);add(304);add(305);add(306);add(401);add(402);
+ add(301);add(302);add(303);add(304);add(305);add(306);
+ }};
+
+ public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
+ add(401);add(402);
}};
/**
@@ -67,6 +73,17 @@
public SiemensDevpThread(DevpSlave slave) {
this.slave = slave;
+ }
+
+ private ArrayList<Integer> getStaNo() {
+ switch (slave.getId()) {
+ case 1:
+ return staNos1;
+ case 2:
+ return staNos2;
+ default:
+ throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
+ }
}
@Override
@@ -102,6 +119,33 @@
}
}
+ /**
+ * 鍒濆鍖栫珯鐐圭姸鎬�
+ */
+ private void initSite() {
+ ArrayList<Integer> staNos = getStaNo();
+ // 绔欑偣缂栧彿
+ for (Integer siteId : staNos) {
+ StaProtocol staProtocol = station.get(siteId);
+ if (null == staProtocol) {
+ staProtocol = new StaProtocol();
+ staProtocol.setSiteId(siteId);
+ station.put(siteId, staProtocol);
+ }
+ staProtocol.setWorkNo((short) 0); // ID
+ staProtocol.setAutoing(false); // 鑷姩
+ staProtocol.setLoading(false); // 鏈夌墿
+ staProtocol.setInEnable(false); // 鍙叆
+ staProtocol.setOutEnable(false); // 鍙嚭
+ staProtocol.setEmptyMk(false); // 绌烘澘淇″彿
+ staProtocol.setStaNo((short) 0); // 鐩爣绔�
+
+ if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
+ staProtocol.setPakMk(true);
+ }
+ }
+ }
+
@Override
public boolean connect() {
boolean result = false;
@@ -116,6 +160,7 @@
} else {
OutputQueue.DEVP.offer(MessageFormat.format( "銆恵0}銆戣緭閫佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
log.error("杈撻�佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ initSite();
}
siemensS7Net.ConnectClose();
return result;
@@ -127,6 +172,7 @@
private void read() throws InterruptedException {
// // 鏇存柊鍏ュ嚭搴撴ā寮�
updateIoMode();
+ ArrayList<Integer> staNos = getStaNo();
int staNoSize = staNos.size();
OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) (staNoSize*4));
if (result.IsSuccess) {
@@ -220,6 +266,7 @@
}
} else {
+ initSite();
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戣鍙栬緭閫佺嚎plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
// log.error("璇诲彇杈撻�佺嚎plc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
}
@@ -232,6 +279,7 @@
if (null == staProtocol) {
return;
}
+ ArrayList<Integer> staNos = getStaNo();
int index = staNos.indexOf(staProtocol.getSiteId());
short[] array = new short[2];
array[0] = staProtocol.getWorkNo();
@@ -297,14 +345,14 @@
}
public static void main(String[] args) {
- System.out.println(staNos.indexOf(129));
- System.out.println(staNos.size());
- for (int i = 0; i<staNos.size(); i++) {
+ System.out.println(staNos1.indexOf(129));
+ System.out.println(staNos1.size());
+ for (int i = 0; i< staNos1.size(); i++) {
// System.out.println(i*2);
// System.out.println(i*2 + 200);
// System.out.println(i);
}
- int index = staNos.indexOf(128);
+ int index = staNos1.indexOf(128);
System.out.println(index*2);
System.out.println(index*2 + 200);
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index e536e1c..00f3463 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -237,6 +237,28 @@
pickSta[3]:
staNo: 402
barcode: ${wcs-slave.barcode[3].id}
+
+ devp[1]:
+ id: 1
+ ip: 10.10.10.60
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍏ュ簱鍙�1
+ inSta[0]:
+ staNo: 401
+ barcode: ${wcs-slave.barcode[3].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[0]:
+ staNo: 401
+ # 鍑哄簱鍙�1
+ outSta[0]:
+ staNo: 402
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[0]:
+ staNo: 402
+ barcode: ${wcs-slave.barcode[3].id}
+
# 鏉＄爜鎵弿浠�
barcode[0]:
id: 1
diff --git a/src/main/webapp/static/js/console.js b/src/main/webapp/static/js/console.js
index 707d1fa..f731681 100644
--- a/src/main/webapp/static/js/console.js
+++ b/src/main/webapp/static/js/console.js
@@ -25,36 +25,59 @@
for (let i = 0;i < rackss.length;i++) {
let bay ='' // 鍗曚釜搴撲綅
let bays = '' // 搴撲綅闆嗗悎
- let bayWidth = rackss[i].width / (rackss[i].maxBayNo / rackss[i].minBayNo)
let maxBayNo = rackss[i].maxBayNo // 鏈�澶у簱浣嶅彿
let minBayNo = rackss[i].minBayNo // 鏈�灏忓簱浣嶅彿
- let bLen = maxBayNo / minBayNo // 搴撲綅涓暟
+ let bLen
+ let interval // 闂撮殧鏁�
+
+ if (maxBayNo<35) {
+ interval = 1
+ bLen = maxBayNo / interval // 搴撲綅涓暟
+ } else {
+ interval = 2
+ bLen = maxBayNo / interval // 搴撲綅涓暟
+ }
+ let bayWidth // 鍗曚釜搴撲綅瀹藉害
let bNum // 搴撲綅鍙风爜
- // hpPosition 0 琛ㄧず璐ф灦搴忓彿 宸�->鍙� 1 琛ㄧず璐ф灦搴忓彿 鍙�->宸�
+
+ if (minBayNo % 2 == 0) { // 浠�2寮�濮�
+ if(interval == 1) {
+ bLen = bLen - 1
+ } else if (interval == 2) {
+ if (maxBayNo % 2 == 0) { // 鍋舵暟
+ bLen = bLen
+ } else { // 濂囨暟
+ maxBayNo = maxBayNo + 1
+ bLen = maxBayNo / interval // 搴撲綅涓暟
+ }
+ }
+ } else { // 浠�1寮�濮�
+ if(interval == 1) {
+ bLen = bLen
+ } else if (interval == 2) {
+ if (maxBayNo % 2 == 0) { // 鍋舵暟
+ bLen = bLen
+ } else { // 濂囨暟
+ bLen = bLen + 1
+ }
+ }
+ }
+ bayWidth = rackss[i].width / bLen
+ // hpPosition 0 琛ㄧず璐ф灦搴忓彿 宸�->鍙� 1 琛ㄧず璐ф灦搴忓彿 宸�<-鍙�
if (mapInfo.hpPosition == 1) {
bNum = maxBayNo
for (let j = bLen; j > 0; j--) {
bay = "<button class='item' style='width: "+ bayWidth +"px'>" + bNum + "</button>"
bays = bays + bay
- bNum = bNum - minBayNo;
+ bNum = bNum - interval;
}
}else {
- if (minBayNo % 2 == 0) {
- bNum = minBayNo
- for (let j = 0; j < bLen; j++) {
- bay = "<button class='item' style='width: "+ bayWidth +"px'>" + bNum + "</button>"
- bays = bays + bay
- bNum = bNum + minBayNo;
- }
- } else {
- bNum = minBayNo + 1
- for (let j = 0; j < bLen; j++) {
- bay = "<button class='item' style='width: "+ bayWidth +"px'>" + bNum + "</button>"
- bays = bays + bay
- bNum = bNum + minBayNo;
- }
+ bNum = minBayNo
+ for (let j = 0; j < bLen; j++) {
+ bay = "<button class='item' style='width: "+ bayWidth +"px'>" + bNum + "</button>"
+ bays = bays + bay
+ bNum = bNum + interval;
}
-
}
rack = "<div class='rack' id='" + rackss[i].id +
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index 191d642..e2b0f03 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -14,8 +14,8 @@
"left": 430,
"width": 1020,
"height": 24,
- "minBayNo": 1,
- "maxBayNo": 30
+ "minBayNo": 2,
+ "maxBayNo": 31
},
{
"type": "rack",
@@ -24,8 +24,8 @@
"left": 430,
"width": 1020,
"height": 24,
- "minBayNo": 1,
- "maxBayNo": 30
+ "minBayNo": 2,
+ "maxBayNo": 31
},
{
"type": "rack",
@@ -34,8 +34,8 @@
"left": 430,
"width": 1020,
"height": 24,
- "minBayNo": 1,
- "maxBayNo": 30
+ "minBayNo": 2,
+ "maxBayNo": 31
},
{
"type": "rack",
@@ -44,8 +44,8 @@
"left": 430,
"width": 1020,
"height": 24,
- "minBayNo": 1,
- "maxBayNo": 30
+ "minBayNo": 2,
+ "maxBayNo": 31
},
{
"type": "rack",
@@ -54,8 +54,8 @@
"left": 430,
"width": 1088,
"height": 24,
- "minBayNo": 1,
- "maxBayNo": 16
+ "minBayNo": 2,
+ "maxBayNo": 17
},
{
"type": "rack",
@@ -64,8 +64,8 @@
"left": 430,
"width": 1088,
"height": 24,
- "minBayNo": 1,
- "maxBayNo": 16
+ "minBayNo": 2,
+ "maxBayNo": 17
},
{
"type": "rack",
@@ -74,8 +74,8 @@
"left": 430,
"width": 1088,
"height": 24,
- "minBayNo": 1,
- "maxBayNo": 16
+ "minBayNo": 2,
+ "maxBayNo": 17
},
{
"type": "rack",
@@ -84,8 +84,8 @@
"left": 430,
"width": 1088,
"height": 24,
- "minBayNo": 1,
- "maxBayNo": 16
+ "minBayNo": 2,
+ "maxBayNo": 17
},
{
"type": "rack",
@@ -134,8 +134,8 @@
"left": 430,
"width": 1020,
"height": 24,
- "minBayNo": 1,
- "maxBayNo": 23
+ "minBayNo": 2,
+ "maxBayNo": 24
},
{
"type": "rack",
@@ -144,8 +144,8 @@
"left": 430,
"width": 1020,
"height": 24,
- "minBayNo": 1,
- "maxBayNo": 23
+ "minBayNo": 2,
+ "maxBayNo": 24
},
{
"type": "rack",
@@ -154,8 +154,8 @@
"left": 430,
"width": 1020,
"height": 24,
- "minBayNo": 1,
- "maxBayNo": 23
+ "minBayNo": 2,
+ "maxBayNo": 24
},
{
"type": "rack",
@@ -164,8 +164,8 @@
"left": 430,
"width": 1020,
"height": 24,
- "minBayNo": 1,
- "maxBayNo": 23
+ "minBayNo": 2,
+ "maxBayNo": 24
},
],
"rackDescs": [
--
Gitblit v1.9.1