From 98c62cb5d06996054110c9fb93025279ca002829 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 05 五月 2023 14:27:03 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 6
src/main/java/com/zy/asrs/controller/SiteController.java | 41 --
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 275 -----------------
src/main/webapp/views/pipeline.html | 28 -
src/main/webapp/static/js/console.map.js | 46 +-
src/main/java/com/zy/core/MainProcess.java | 2
src/main/java/com/zy/common/model/LocTypeDto.java | 30 +
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 70 ----
src/main/resources/application.yml | 361 +----------------------
9 files changed, 96 insertions(+), 763 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index 7c5b684..1c5da67 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -44,7 +44,6 @@
List<Map<String, Object>> res = new ArrayList<>();
for (DevpSlave devp : slaveProperties.getDevp()) {
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
- if (devp.getId() == 1) {
Map<String, Object> map1 = new HashMap<>();
map1.put("floor", 1);
map1.put("modeVal", devpThread.ioModeOf1F1.id);
@@ -56,46 +55,6 @@
map2.put("modeVal", devpThread.ioModeOf1F2.id);
map2.put("modeDesc", devpThread.ioModeOf1F2.desc);
res.add(map2);
- } else {
- Map<String, Object> map3 = new HashMap<>();
- map3.put("floor", 3);
- map3.put("modeVal", devpThread.ioModeOf1F3.id);
- map3.put("modeDesc", devpThread.ioModeOf1F3.desc);
- res.add(map3);
-
- Map<String, Object> map4 = new HashMap<>();
- map4.put("floor", 4);
- map4.put("modeVal", devpThread.ioModeOf1F4.id);
- map4.put("modeDesc", devpThread.ioModeOf1F4.desc);
- res.add(map4);
-
- Map<String, Object> map5 = new HashMap<>();
- map5.put("floor", 5);
- map5.put("modeVal", devpThread.ioModeOf2F1.id);
- map5.put("modeDesc", devpThread.ioModeOf2F1.desc);
- res.add(map5);
-
- Map<String, Object> map6 = new HashMap<>();
- map6.put("floor", 6);
- map6.put("modeVal", devpThread.ioModeOf2F2.id);
- map6.put("modeDesc", devpThread.ioModeOf2F2.desc);
- res.add(map6);
-
- Map<String, Object> map7 = new HashMap<>();
- map7.put("floor", 7);
- map7.put("modeVal", devpThread.ioModeOf3F1.id);
- map7.put("modeDesc", devpThread.ioModeOf3F1.desc);
- res.add(map7);
-
- Map<String, Object> map8 = new HashMap<>();
- map8.put("floor", 8);
- map8.put("modeVal", devpThread.ioModeOf3F2.id);
- map8.put("modeDesc", devpThread.ioModeOf3F2.desc);
- res.add(map8);
- }
-
-
-
}
return R.ok().add(res);
}
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 0bf23b6..f8918e9 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -102,58 +102,17 @@
for (DevpSlave.Sta inSta : devp.getInSta()) {
// 鑾峰彇鏉＄爜鎵弿浠俊鎭�
BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
- BarcodeThread barcodeThread1 = null;
- BarcodeThread barcodeThread2 = null;
if (barcodeThread == null) {
continue;
}
String barcode = barcodeThread.getBarcode();
- String barcode1 = "";
- String barcode2 = "";
- //101绔欐湁3涓壂鐮佸櫒锛屽綋0鎵爜鍣ㄦ病鏈夋暟鎹椂锛岃幏鍙�9銆�10涓や釜鎵爜鍣ㄦ暟鎹�
- if((inSta.getStaNo().equals(101) || inSta.getStaNo().equals(104))){
- barcodeThread1 = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode1());
- if (barcodeThread1 != null) {
- barcode1 = barcodeThread1.getBarcode();
- }
-
- barcodeThread2 = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode2());
- if (barcodeThread2 != null) {
- barcode2 = barcodeThread2.getBarcode();
-
- }
-
- Integer len1=0 , len2=0, len3=0;
- if(barcode != null) {
- String b[]=barcode.split(";");
- barcode=b[b.length-1];
- len1 = barcode.length();
- }
- if(barcode1 != null) {
- String b[]=barcode1.split(";");
- barcode1=b[b.length-1];
- len2 = barcode1.length();
- }
- if(barcode2 != null) {
- String b[]=barcode2.split(";");
- barcode2=b[b.length-1];
- len3 = barcode2.length();
- }
-
- if(len2 > len1 && len2 >= len3){
- barcode = barcode1;
- } else if (len3 > len1 && len3 >= len2){
- barcode = barcode2;
- }
-
- }
- //鍒ゆ柇101鍜�104鏄惁鏄嫞鏂欍�佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
- WrkMast wrkMast1=wrkMastMapper.selectpj(inSta.getStaNo(),barcode);
- if((inSta.getStaNo().equals(101) || inSta.getStaNo().equals(104)) &&!Cools.isEmpty(barcode)&&!Cools.isEmpty(wrkMast1)){
- log.error("101鎴�104鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱", wrkMast1.getWrkNo());
- continue;
- }
+ ////鍒ゆ柇101鍜�104鏄惁鏄嫞鏂欍�佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
+ //WrkMast wrkMast1=wrkMastMapper.selectpj(inSta.getStaNo(),barcode);
+ //if((inSta.getStaNo().equals(101) || inSta.getStaNo().equals(104)) &&!Cools.isEmpty(barcode)&&!Cools.isEmpty(wrkMast1)){
+ // log.error("101鎴�104鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱", wrkMast1.getWrkNo());
+ // continue;
+ //}
if (!Cools.isEmpty(barcode)) {
log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode);
@@ -184,24 +143,6 @@
continue;
}
if (inSta.getStaNo() == 104 && devpThread.ioModeOf1F2 == IoModeType.PAKOUT_MODE) {
- continue;
- }
- if (inSta.getStaNo() == 111 && devpThread.ioModeOf1F3 == IoModeType.PAKOUT_MODE) {
- continue;
- }
- if (inSta.getStaNo() == 114 && devpThread.ioModeOf1F4 == IoModeType.PAKOUT_MODE) {
- continue;
- }
- if (inSta.getStaNo() == 201 && devpThread.ioModeOf2F1 == IoModeType.PAKOUT_MODE) {
- continue;
- }
- if (inSta.getStaNo() == 204 && devpThread.ioModeOf2F2 == IoModeType.PAKOUT_MODE) {
- continue;
- }
- if (inSta.getStaNo() == 301 && devpThread.ioModeOf3F1 == IoModeType.PAKOUT_MODE) {
- continue;
- }
- if (inSta.getStaNo() == 304 && devpThread.ioModeOf3F2 == IoModeType.PAKOUT_MODE) {
continue;
}
@@ -264,12 +205,6 @@
StartupDto dto = jsonObject.getObject("data", StartupDto.class);
barcodeThread.setBarcode("");
- if(barcodeThread1 !=null){
- barcodeThread1.setBarcode("");
- }
- if(barcodeThread2 !=null){
- barcodeThread2.setBarcode("");
- }
staProtocol.setWorkNo(dto.getWorkNo().shortValue());
staProtocol.setStaNo(dto.getStaNo().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false);
@@ -411,24 +346,6 @@
if (inSta.getStaNo() == 101 && devpThread.ioModeOf1F2 != IoModeType.PAKOUT_MODE) {
continue;
}
- if (inSta.getStaNo() == 114 && devpThread.ioModeOf1F3 != IoModeType.PAKOUT_MODE) {
- continue;
- }
- if (inSta.getStaNo() == 111 && devpThread.ioModeOf1F4 != IoModeType.PAKOUT_MODE) {
- continue;
- }
- if (inSta.getStaNo() == 204 && devpThread.ioModeOf2F1 != IoModeType.PAKOUT_MODE) {
- continue;
- }
- if (inSta.getStaNo() == 201 && devpThread.ioModeOf2F2 != IoModeType.PAKOUT_MODE) {
- continue;
- }
- if (inSta.getStaNo() == 301 && devpThread.ioModeOf3F1 != IoModeType.PAKOUT_MODE) {
- continue;
- }
- if (inSta.getStaNo() == 304 && devpThread.ioModeOf3F2 != IoModeType.PAKOUT_MODE) {
- continue;
- }
// 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable()
@@ -482,27 +399,9 @@
String barcode = barcodeThread.getBarcode();
- //101绔欐湁3涓壂鐮佸櫒锛屽綋0鎵爜鍣ㄦ病鏈夋暟鎹椂锛岃幏鍙�9銆�10涓や釜鎵爜鍣ㄦ暟鎹�
- if((pickSta.getStaNo().equals(101) || pickSta.getStaNo().equals(104)) && ( "NoRead".equals(barcode) || Cools.isEmpty(barcode) )){
- BarcodeThread barcodeThread1 = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, pickSta.getBarcode1());
- if (barcodeThread1 != null) {
- barcode = barcodeThread1.getBarcode();
- }
-
- if("NoRead".equals(barcode) || Cools.isEmpty(barcode)) {
- BarcodeThread barcodeThread2 = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, pickSta.getBarcode2());
- if (barcodeThread2 != null) {
- barcode = barcodeThread2.getBarcode();
-
- }
- }
- }
if (!Cools.isEmpty(barcode)) {
log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", pickSta.getBarcode(), barcode);
-// if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
-// continue;
-// }
} else {
continue;
}
@@ -575,24 +474,6 @@
break;
case 103:
sourceStaNo = 104;
- break;
- case 110:
- sourceStaNo = 111;
- break;
- case 113:
- sourceStaNo = 114;
- break;
- case 200:
- sourceStaNo = 201;
- break;
- case 203:
- sourceStaNo = 204;
- break;
- case 300:
- sourceStaNo = 301;
- break;
- case 303:
- sourceStaNo = 304;
break;
}
@@ -986,24 +867,6 @@
continue;
}
if (wrkMast.getStaNo() == 103 && devpThread.ioModeOf1F2 != IoModeType.PAKOUT_MODE) {
- continue;
- }
- if (wrkMast.getStaNo() == 110 && devpThread.ioModeOf1F3 != IoModeType.PAKOUT_MODE) {
- continue;
- }
- if (wrkMast.getStaNo() == 113 && devpThread.ioModeOf1F4 != IoModeType.PAKOUT_MODE) {
- continue;
- }
- if (wrkMast.getStaNo() == 200 && devpThread.ioModeOf2F1 != IoModeType.PAKOUT_MODE) {
- continue;
- }
- if (wrkMast.getStaNo() == 203 && devpThread.ioModeOf2F2 != IoModeType.PAKOUT_MODE) {
- continue;
- }
- if (wrkMast.getStaNo() == 300 && devpThread.ioModeOf3F1 != IoModeType.PAKOUT_MODE) {
- continue;
- }
- if (wrkMast.getStaNo() == 303 && devpThread.ioModeOf3F2 != IoModeType.PAKOUT_MODE) {
continue;
}
@@ -2178,24 +2041,6 @@
case 104:
staNo = 106;
break;
- case 111:
- staNo = 112;
- break;
- case 114:
- staNo = 116;
- break;
- case 201:
- staNo = 202;
- break;
- case 204:
- staNo = 205;
- break;
- case 301:
- staNo = 302;
- break;
- case 304:
- staNo = 305;
- break;
}
WrkMast pakout = wrkMastMapper.selectWorkingPakout(staNo);
switch (inSta.getStaNo()) {
@@ -2233,114 +2078,6 @@
} else {
// 鍏ュ簱妯″紡
devpThread.ioModeOf1F2 = IoModeType.PAKIN_MODE;
- }
- break;
- case 111: // 1F3
- if (pakout != null) {
- if (devpThread.ioModeOf1F3 != IoModeType.PAKOUT_MODE) {
- // 鍑哄簱鍒囨崲涓�
- devpThread.ioModeOf1F3 = IoModeType.PAKOUT_BOOTING;
- WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
- if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
- && !devpThread.getStation().get(inSta.getStaNo() - 1).isLoading()
- && devpThread.getStation().get(inSta.getStaNo() - 1).getWorkNo() == 0) {
- // 鍑哄簱妯″紡
- devpThread.ioModeOf1F3 = IoModeType.PAKOUT_MODE;
- }
- }
- } else {
- // 鍏ュ簱妯″紡
- devpThread.ioModeOf1F3 = IoModeType.PAKIN_MODE;
- }
- break;
- case 114: // 1F4
- if (pakout != null) {
- if (devpThread.ioModeOf1F4 != IoModeType.PAKOUT_MODE) {
- // 鍑哄簱鍒囨崲涓�
- devpThread.ioModeOf1F4 = IoModeType.PAKOUT_BOOTING;
- WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
- if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
- && !devpThread.getStation().get(inSta.getStaNo() - 1).isLoading()
- && devpThread.getStation().get(inSta.getStaNo() - 1).getWorkNo() == 0) {
- // 鍑哄簱妯″紡
- devpThread.ioModeOf1F4 = IoModeType.PAKOUT_MODE;
- }
- }
- } else {
- // 鍏ュ簱妯″紡
- devpThread.ioModeOf1F4 = IoModeType.PAKIN_MODE;
- }
- break;
- case 201: // 2F1
- if (pakout != null) {
- if (devpThread.ioModeOf2F1 != IoModeType.PAKOUT_MODE) {
- // 鍑哄簱鍒囨崲涓�
- devpThread.ioModeOf2F1 = IoModeType.PAKOUT_BOOTING;
- WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
- if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
- && !devpThread.getStation().get(inSta.getStaNo() - 1).isLoading()
- && devpThread.getStation().get(inSta.getStaNo() - 1).getWorkNo() == 0) {
- // 鍑哄簱妯″紡
- devpThread.ioModeOf2F1 = IoModeType.PAKOUT_MODE;
- }
- }
- } else {
- // 鍏ュ簱妯″紡
- devpThread.ioModeOf2F1 = IoModeType.PAKIN_MODE;
- }
- break;
- case 204: // 2F2
- if (pakout != null) {
- if (devpThread.ioModeOf2F2 != IoModeType.PAKOUT_MODE) {
- // 鍑哄簱鍒囨崲涓�
- devpThread.ioModeOf2F2 = IoModeType.PAKOUT_BOOTING;
- WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
- if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
- && !devpThread.getStation().get(inSta.getStaNo() - 1).isLoading()
- && devpThread.getStation().get(inSta.getStaNo() - 1).getWorkNo() == 0) {
- // 鍑哄簱妯″紡
- devpThread.ioModeOf2F2 = IoModeType.PAKOUT_MODE;
- }
- }
- } else {
- // 鍏ュ簱妯″紡
- devpThread.ioModeOf2F2 = IoModeType.PAKIN_MODE;
- }
- break;
- case 301: // 3F1
- if (pakout != null) {
- if (devpThread.ioModeOf3F1 != IoModeType.PAKOUT_MODE) {
- // 鍑哄簱鍒囨崲涓�
- devpThread.ioModeOf3F1 = IoModeType.PAKOUT_BOOTING;
- WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
- if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
- && !devpThread.getStation().get(inSta.getStaNo() - 1).isLoading()
- && devpThread.getStation().get(inSta.getStaNo() - 1).getWorkNo() == 0) {
- // 鍑哄簱妯″紡
- devpThread.ioModeOf3F1 = IoModeType.PAKOUT_MODE;
- }
- }
- } else {
- // 鍏ュ簱妯″紡
- devpThread.ioModeOf3F1 = IoModeType.PAKIN_MODE;
- }
- break;
- case 304: // 3F2
- if (pakout != null) {
- if (devpThread.ioModeOf3F2 != IoModeType.PAKOUT_MODE) {
- // 鍑哄簱鍒囨崲涓�
- devpThread.ioModeOf3F2 = IoModeType.PAKOUT_BOOTING;
- WrkMast pakin = wrkMastMapper.selectWorkingPakin(inSta.getStaNo());
- if (pakin == null && !devpThread.getStation().get(inSta.getStaNo()).isLoading()
- && !devpThread.getStation().get(inSta.getStaNo() - 1).isLoading()
- && devpThread.getStation().get(inSta.getStaNo() - 1).getWorkNo() == 0) {
- // 鍑哄簱妯″紡
- devpThread.ioModeOf3F2 = IoModeType.PAKOUT_MODE;
- }
- }
- } else {
- // 鍏ュ簱妯″紡
- devpThread.ioModeOf3F2 = IoModeType.PAKIN_MODE;
}
break;
}
diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java
index 4cb4b14..d8e3e26 100644
--- a/src/main/java/com/zy/common/model/LocTypeDto.java
+++ b/src/main/java/com/zy/common/model/LocTypeDto.java
@@ -10,7 +10,7 @@
@Data
public class LocTypeDto {
- // 楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿
+ // 楂樹綆绫诲瀷{0:鏈煡,1:杈冧綆搴撲綅,2:浣庡簱浣嶏紝3:楂樺簱浣�,4: 鐗归珮搴撲綅}
private Short locType1;
// 瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿
@@ -29,13 +29,31 @@
}
public LocTypeDto(StaProtocol staProtocol) {
- if (staProtocol.isHigh() == staProtocol.isLow()) {
- throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
+ int trueLen = 0;
+ if (staProtocol.isHigh()) {
+ trueLen++;
+ }
+ if (staProtocol.isHigh1()) {
+ trueLen++;
}
if (staProtocol.isLow()) {
- this.locType1 = 1; // 浣庡簱浣�
- } else {
- this.locType1 = 2; // 楂樺簱浣�
+ trueLen++;
+ }
+ if (staProtocol.isLow1()) {
+ trueLen++;
+ }
+ if (trueLen != 1) {
+ throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
+ }
+
+ if (staProtocol.isLow()) {
+ this.locType1 = 1; // 杈冧綆搴撲綅
+ } else if (staProtocol.isLow1()){
+ this.locType1 = 2; // 浣庡簱浣�
+ } else if (staProtocol.isHigh()){
+ this.locType1 = 3; // 楂樺簱浣�
+ } else if (staProtocol.isHigh1()){
+ this.locType1 = 4; // 鐗归珮搴撲綅
}
}
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index c7b25f7..9b4db08 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -87,7 +87,7 @@
mainService.outOfDevp();
//绌烘墭鐩樿嚜鍔ㄥ嚭搴�
- mainService.autoEmptyOut();
+ //mainService.autoEmptyOut();
// //绌烘墭鐩樿嚜鍔ㄥ叆搴�
// mainService.autoEmptyIn();
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 d2c4888..c989cb1 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -46,6 +46,12 @@
// 浣�
private boolean low;
+ // 楂�
+ private boolean high1;
+
+ // 浣�
+ private boolean low1;
+
// 閿佸畾鏍囪
private boolean pakMk = true;
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 1757937..7808402 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -43,19 +43,12 @@
private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
private short heartBeatVal = 1;
public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
- add(100);add(101);add(102);add(103);add(104);add(105);add(106);
+ add(100);add(101);add(102);add(103);add(104);add(105);
}};
-
- public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
- add(110);add(111);add(112);add(113);add(114);add(115);add(116);
- add(200);add(201);add(202);add(203);add(204);add(205);
- add(300);add(301);add(302);add(303);add(304);add(305);
- }};
-
/**
* 鏉＄爜鏁伴噺
*/
- private int barcodeSize = 6;
+ private int barcodeSize = 2;
/**
* 鍏ュ嚭搴撴ā寮�
@@ -67,14 +60,6 @@
*/
public IoModeType ioModeOf1F1 = IoModeType.NONE;
public IoModeType ioModeOf1F2 = IoModeType.NONE;
- public IoModeType ioModeOf1F3 = IoModeType.NONE;
- public IoModeType ioModeOf1F4 = IoModeType.NONE;
- public IoModeType ioModeOf2F1 = IoModeType.NONE;
- public IoModeType ioModeOf2F2 = IoModeType.NONE;
- public IoModeType ioModeOf3F1 = IoModeType.NONE;
- public IoModeType ioModeOf3F2 = IoModeType.NONE;
-
-
public SiemensDevpThread(DevpSlave slave) {
this.slave = slave;
@@ -83,8 +68,6 @@
switch (slave.getId()) {
case 1:
return staNos1;
- case 2:
- return staNos2;
default:
throw new CoolException("鑾峰彇绔欑偣澶辫触锛�");
}
@@ -181,7 +164,7 @@
}
Thread.sleep(200);
OperateResultExOne<byte[]> result1 = null;
- result1 = siemensS7Net.Read("DB102.100", (short) (staNoSize * 2));
+ result1 = siemensS7Net.Read("DB101.1", (short) (staNoSize * 2));
if (result1.IsSuccess) {
for (int i = 0; i < staNoSize; i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
@@ -193,9 +176,10 @@
staProtocol.setOutEnable(status[3]);// 鍙嚭
staProtocol.setEmptyMk(status[4]); // 绌烘澘淇″彿
staProtocol.setFullPlt(status[5]); // 婊℃墭鐩�
- staProtocol.setHigh(status[6]); // 楂樺簱浣� 鎹蜂赴澶ф墭鐩�
- staProtocol.setLow(status[7]); // 浣庡簱浣� 鎹蜂赴灏忔墭鐩�
- staProtocol.setFull(status[8]); // 鎵樼洏鏄彲鍚︽暣鍨�
+ staProtocol.setHigh(status[6]);
+ staProtocol.setHigh1(status[7]);
+ staProtocol.setLow(status[8]);
+ staProtocol.setLow1(status[9]);
if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
staProtocol.setPakMk(true);
@@ -207,10 +191,10 @@
if(slave.getId() == 2) {
Thread.sleep(200);
OperateResultExOne<byte[]> result2 = null;
- result2 = siemensS7Net.Read("DB100.200", (short) (barcodeSize * 16));
+ result2 = siemensS7Net.Read("DB100.200", (short) (barcodeSize * 8));
if (result2.IsSuccess) {
for (int i = 0; i < barcodeSize; i++) {
- String barcode = siemensS7Net.getByteTransform().TransString(result2.Content, i * 16, 8, "UTF-8");
+ String barcode = siemensS7Net.getByteTransform().TransString(result2.Content, i * 8, 8, "UTF-8");
BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
if (!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
barcodeThread.setBarcode(barcode);
@@ -306,42 +290,6 @@
if (!siemensS7Net.Write("DB100.302", this.ioModeOf1F2.id).IsSuccess) {
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎1F2鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
log.error("鍐欏叆杈撻�佺嚎1F2鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
- }
- }
- if (slave.getId() == 2 && this.ioModeOf1F3 != IoModeType.NONE) {
- if (!siemensS7Net.Write("DB100.300", this.ioModeOf1F3.id).IsSuccess) {
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎1F3鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={2}", slave.getId()));
- log.error("鍐欏叆杈撻�佺嚎1F3鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
- }
- }
- if (slave.getId() == 2 && this.ioModeOf1F4 != IoModeType.NONE) {
- if (!siemensS7Net.Write("DB100.302", this.ioModeOf1F4.id).IsSuccess) {
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎1F4鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={2}", slave.getId()));
- log.error("鍐欏叆杈撻�佺嚎1F4鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
- }
- }
- if (slave.getId() == 2 && this.ioModeOf2F1 != IoModeType.NONE) {
- if (!siemensS7Net.Write("DB100.304", this.ioModeOf2F1.id).IsSuccess) {
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎2F1鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={2}", slave.getId()));
- log.error("鍐欏叆杈撻�佺嚎2F1鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
- }
- }
- if (slave.getId() == 2 && this.ioModeOf2F2 != IoModeType.NONE) {
- if (!siemensS7Net.Write("DB100.306", this.ioModeOf2F2.id).IsSuccess) {
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎2F2鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={2}", slave.getId()));
- log.error("鍐欏叆杈撻�佺嚎2F2鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
- }
- }
- if (slave.getId() == 2 && this.ioModeOf3F1 != IoModeType.NONE) {
- if (!siemensS7Net.Write("DB100.308", this.ioModeOf3F1.id).IsSuccess) {
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎3F1鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={2}", slave.getId()));
- log.error("鍐欏叆杈撻�佺嚎3F1鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
- }
- }
- if (slave.getId() == 2 && this.ioModeOf3F2 != IoModeType.NONE) {
- if (!siemensS7Net.Write("DB100.310", this.ioModeOf3F2.id).IsSuccess) {
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎3F2鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={2}", slave.getId()));
- log.error("鍐欏叆杈撻�佺嚎3F2鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
}
}
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 44ebfa9..de8aaf2 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -35,16 +35,16 @@
enable: false
wms:
- url: localhost:8088/jfwms
+ url: localhost:8088/kdywms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
- doubleDeep: true
+ doubleDeep: false
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8
+ doubleLocs: 1
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
- groupCount: 4
+ groupCount: 2
# 鍫嗗灈鏈�1
crn[0]:
id: 1
@@ -55,128 +55,34 @@
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�1 鍙充笂
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 106
- row: 2
- bay: 84
- lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�2 宸︿笂
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 116
- row: 2
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�3 宸︿笂 2妤�
- crnInStn[2]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 205
- row: 2
- bay: 1
- lev: 4
- # 鍫嗗灈鏈哄叆搴撶珯鐐� 宸︿笂 3妤�
- crnInStn[3]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 305
- row: 2
- bay: 1
- lev: 7
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�1 鍙充笂
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 106
- row: 2
- bay: 84
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�2 宸︿笂
- crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 116
- row: 2
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�3 宸︿笂 2妤�
- crnOutStn[2]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 205
- row: 2
- bay: 1
- lev: 4
- # 鍫嗗灈鏈哄嚭搴撶珯鐐� 宸︿笂 3妤�
- crnOutStn[3]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 305
- row: 2
- bay: 1
- lev: 7
- # 鍫嗗灈鏈�2
- crn[1]:
- id: 2
- ip: 10.10.10.20
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�1 鍙充笅
+ # 鍫嗗灈鏈哄叆搴撶珯1
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 102
- row: 7
- bay: 84
+ row: 2
+ bay: 32
lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�2 宸︿笅
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�2
crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 112
- row: 7
- bay: 1
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 105
+ row: 2
+ bay: 31
lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�3 宸︿笅 2妤�
- crnInStn[2]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 202
- row: 7
- bay: 1
- lev: 4
- # 鍫嗗灈鏈哄叆搴撶珯鐐�4 宸︿笅 3妤�
- crnInStn[3]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 302
- row: 7
- bay: 1
- lev: 7
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�1 鍙充笅
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�1
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 102
- row: 7
- bay: 84
+ row: 2
+ bay: 32
lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�2 宸︿笅
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�2
crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 112
- row: 7
- bay: 1
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 105
+ row: 2
+ bay: 31
lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�3 宸︿笅 2妤�
- crnOutStn[2]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 202
- row: 7
- bay: 1
- lev: 4
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�3 宸︿笅 3妤�
- crnOutStn[3]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 302
- row: 7
- bay: 1
- lev: 7
# 杈撻�佺嚎1
devp[0]:
id: 1
@@ -187,17 +93,13 @@
# 鍏ュ簱鍙�1
inSta[0]:
staNo: 101
- barcode: ${wcs-slave.barcode[6].id}
- barcode1: ${wcs-slave.barcode[7].id}
- barcode2: ${wcs-slave.barcode[8].id}
+ barcode: ${wcs-slave.barcode[0].id}
backSta: 100
led: ${wcs-slave.led[0].id}
# 鍏ュ簱鍙�2
inSta[1]:
staNo: 104
- barcode: ${wcs-slave.barcode[9].id}
- barcode1: ${wcs-slave.barcode[10].id}
- barcode2: ${wcs-slave.barcode[11].id}
+ barcode: ${wcs-slave.barcode[1].id}
backSta: 103
led: ${wcs-slave.led[0].id}
# 绌烘澘鍏ュ簱鍙�1
@@ -215,136 +117,15 @@
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
staNo: 101
- barcode: ${wcs-slave.barcode[6].id}
- barcode1: ${wcs-slave.barcode[7].id}
- barcode2: ${wcs-slave.barcode[8].id}
+ barcode: ${wcs-slave.barcode[0].id}
backSta: 100
led: ${wcs-slave.led[0].id}
# 鎷ｆ枡鍏ュ簱鍙�2
pickSta[1]:
staNo: 104
- barcode: ${wcs-slave.barcode[9].id}
- barcode1: ${wcs-slave.barcode[10].id}
- barcode2: ${wcs-slave.barcode[11].id}
+ barcode: ${wcs-slave.barcode[1].id}
backSta: 103
led: ${wcs-slave.led[0].id}
- # 杈撻�佺嚎2
- devp[1]:
- id: 2
- ip: 10.10.10.90
- port: 102
- rack: 0
- slot: 0
- # 鍏ュ簱鍙�1
- inSta[0]:
- staNo: 111
- barcode: ${wcs-slave.barcode[0].id}
- backSta: 110
- led: ${wcs-slave.led[0].id}
- # 鍏ュ簱鍙�2
- inSta[1]:
- staNo: 114
- barcode: ${wcs-slave.barcode[1].id}
- backSta: 113
- led: ${wcs-slave.led[0].id}
- # 鍏ュ簱鍙�3
- inSta[2]:
- staNo: 201
- barcode: ${wcs-slave.barcode[2].id}
- backSta: 200
- led: ${wcs-slave.led[0].id}
- # 鍏ュ簱鍙�4
- inSta[3]:
- staNo: 204
- barcode: ${wcs-slave.barcode[3].id}
- backSta: 203
- led: ${wcs-slave.led[0].id}
- # 鍏ュ簱鍙�5
- inSta[4]:
- staNo: 301
- barcode: ${wcs-slave.barcode[4].id}
- backSta: 300
- led: ${wcs-slave.led[0].id}
- # 鍏ュ簱鍙�6
- inSta[5]:
- staNo: 304
- barcode: ${wcs-slave.barcode[5].id}
- backSta: 303
- led: ${wcs-slave.led[0].id}
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[0]:
- staNo: 111
- # 绌烘澘鍏ュ簱鍙�2
- emptyInSta[1]:
- staNo: 114
- # 绌烘澘鍏ュ簱鍙�3
- emptyInSta[2]:
- staNo: 201
- # 绌烘澘鍏ュ簱鍙�4
- emptyInSta[3]:
- staNo: 204
- # 绌烘澘鍏ュ簱鍙�5
- emptyInSta[4]:
- staNo: 301
- # 绌烘澘鍏ュ簱鍙�6
- emptyInSta[5]:
- staNo: 304
- # 鍑哄簱鍙�1
- outSta[0]:
- staNo: 110
- # 鍑哄簱鍙�2
- outSta[1]:
- staNo: 113
- # 鍑哄簱鍙�3
- outSta[2]:
- staNo: 200
- # 鍑哄簱鍙�4
- outSta[3]:
- staNo: 203
- # 鍑哄簱鍙�5
- outSta[4]:
- staNo: 300
- # 鍑哄簱鍙�6
- outSta[5]:
- staNo: 303
- # 鎷ｆ枡鍏ュ簱鍙�1
- pickSta[0]:
- staNo: 111
- barcode: ${wcs-slave.barcode[0].id}
- backSta: 110
- led: ${wcs-slave.led[0].id}
- # 鎷ｆ枡鍏ュ簱鍙�2
- pickSta[1]:
- staNo: 114
- barcode: ${wcs-slave.barcode[1].id}
- backSta: 113
- led: ${wcs-slave.led[0].id}
- # 鎷ｆ枡鍏ュ簱鍙�3
- pickSta[2]:
- staNo: 201
- barcode: ${wcs-slave.barcode[2].id}
- backSta: 200
- led: ${wcs-slave.led[0].id}
- # 鎷ｆ枡鍏ュ簱鍙�4
- pickSta[3]:
- staNo: 204
- barcode: ${wcs-slave.barcode[3].id}
- backSta: 203
- led: ${wcs-slave.led[0].id}
- # 鎷ｆ枡鍏ュ簱鍙�5
- pickSta[4]:
- staNo: 301
- barcode: ${wcs-slave.barcode[4].id}
- backSta: 300
- led: ${wcs-slave.led[0].id}
- # 鎷ｆ枡鍏ュ簱鍙�6
- pickSta[5]:
- staNo: 304
- barcode: ${wcs-slave.barcode[5].id}
- backSta: 303
- led: ${wcs-slave.led[0].id}
-
-
# 鏉＄爜鎵弿浠�1 宸︿笅 1妤煎紑濮�,111
barcode[0]:
id: 1
@@ -355,56 +136,6 @@
id: 2
ip: 10.10.10.101
port: 51236
- # 鏉＄爜鎵弿浠�3, 201
- barcode[2]:
- id: 3
- ip: 10.10.10.102
- port: 51236
- # 鏉＄爜鎵弿浠�4,204
- barcode[3]:
- id: 4
- ip: 10.10.10.103
- port: 51236
- # 鏉＄爜鎵弿浠�5,301
- barcode[4]:
- id: 5
- ip: 10.10.10.104
- port: 51236
- # 鏉＄爜鎵弿浠�6,304
- barcode[5]:
- id: 6
- ip: 10.10.10.105
- port: 51236
- # 鏉＄爜鎵弿浠�7,101
- barcode[6]:
- id: 7
- ip: 10.10.10.106
- port: 2002
- # 鏉＄爜鎵弿浠�8,101
- barcode[7]:
- id: 8
- ip: 10.10.10.107
- port: 2002
- # 鏉＄爜鎵弿浠�9,101
- barcode[8]:
- id: 9
- ip: 10.10.10.108
- port: 2002
- # 鏉＄爜鎵弿浠�10,104
- barcode[9]:
- id: 10
- ip: 10.10.10.109
- port: 2002
-
- barcode[10]:
- id: 11
- ip: 10.10.10.110
- port: 2002
- barcode[11]:
- id: 12
- ip: 10.10.10.111
- port: 2002
-
# LED1
led[0]:
id: 1
@@ -418,46 +149,4 @@
ip: 10.10.10.222
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 103
- # LED3
- led[2]:
- id: 3
- ip: 10.10.10.223
- port: 5005
- devpPlcId: ${wcs-slave.devp[1].id}
- staArr: 110
- # LED4
- led[3]:
- id: 4
- ip: 10.10.10.224
- port: 5005
- devpPlcId: ${wcs-slave.devp[1].id}
- staArr: 113
- # LED5
- led[4]:
- id: 5
- ip: 10.10.10.225
- port: 5005
- devpPlcId: ${wcs-slave.devp[1].id}
- staArr: 200
- # LED6
- led[5]:
- id: 6
- ip: 10.10.10.226
- port: 5005
- devpPlcId: ${wcs-slave.devp[1].id}
- staArr: 203
- # LED7
- led[6]:
- id: 7
- ip: 10.10.10.227
- port: 5005
- devpPlcId: ${wcs-slave.devp[1].id}
- staArr: 300
- # LED8
- led[7]:
- id: 8
- ip: 10.10.10.228
- port: 5005
- devpPlcId: ${wcs-slave.devp[1].id}
- staArr: 303
\ No newline at end of file
+ staArr: 103
\ No newline at end of file
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index 526b9d0..31c1fb5 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -90,19 +90,10 @@
"stns": [
{
"type": "stn",
- "id": "site-100",
- "text": "100",
+ "id": "site-105",
+ "text": "105",
"top": 386,
"left": 1067,
- "width": 78,
- "height": 24
- },
- {
- "type": "stn",
- "id": "site-101",
- "text": "101",
- "top": 386,
- "left": 1147,
"width": 78,
"height": 24
},
@@ -110,16 +101,7 @@
"type": "stn",
"id": "site-102",
"text": "102",
- "top": 412,
- "left": 1067,
- "width": 78,
- "height": 24
- },
- {
- "type": "stn",
- "id": "site-103",
- "text": "103",
- "top": 412,
+ "top": 386,
"left": 1147,
"width": 78,
"height": 24
@@ -128,6 +110,24 @@
"type": "stn",
"id": "site-104",
"text": "104",
+ "top": 412,
+ "left": 1067,
+ "width": 78,
+ "height": 24
+ },
+ {
+ "type": "stn",
+ "id": "site-101",
+ "text": "101",
+ "top": 412,
+ "left": 1147,
+ "width": 78,
+ "height": 24
+ },
+ {
+ "type": "stn",
+ "id": "site-103",
+ "text": "103",
"top": 438,
"left": 1067,
"width": 78,
@@ -135,8 +135,8 @@
},
{
"type": "stn",
- "id": "site-105",
- "text": "105",
+ "id": "site-100",
+ "text": "100",
"top": 438,
"left": 1147,
"width": 78,
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index e3af7e1..3702446 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -60,36 +60,12 @@
<fieldset>
<legend>鍏ュ嚭搴撴ā寮忥紙IO-Mode锛�</legend>
<div class="io-mode-box">
- <label>1F1</label>
+ <label>102</label>
<button id="io-mode-1" class="ioModeBtn" onclick="ioModeSwitch(this.id)"> - </button>
</div>
<div class="io-mode-box">
- <label>1F2</label>
+ <label>105</label>
<button id="io-mode-2" class="ioModeBtn" onclick="ioModeSwitch(this.id)"> - </button>
- </div>
- <div class="io-mode-box">
- <label>1F3</label>
- <button id="io-mode-3" class="ioModeBtn" onclick="ioModeSwitch(this.id)"> - </button>
- </div>
- <div class="io-mode-box">
- <label>1F4</label>
- <button id="io-mode-4" class="ioModeBtn" onclick="ioModeSwitch(this.id)"> - </button>
- </div>
- <div class="io-mode-box">
- <label>2F1</label>
- <button id="io-mode-5" class="ioModeBtn" onclick="ioModeSwitch(this.id)"> - </button>
- </div>
- <div class="io-mode-box">
- <label>2F2</label>
- <button id="io-mode-6" class="ioModeBtn" onclick="ioModeSwitch(this.id)"> - </button>
- </div>
- <div class="io-mode-box">
- <label>3F1</label>
- <button id="io-mode-7" class="ioModeBtn" onclick="ioModeSwitch(this.id)"> - </button>
- </div>
- <div class="io-mode-box">
- <label>3F2</label>
- <button id="io-mode-8" class="ioModeBtn" onclick="ioModeSwitch(this.id)"> - </button>
</div>
</fieldset>
</div>
--
Gitblit v1.9.1