From 696c9f6f674ea478d738cdb277c6f1c74ad637b3 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期二, 13 八月 2024 15:21:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 66 ++++++++++++---------
src/main/webapp/views/console.html | 11 +++
src/main/webapp/static/css/console.css | 15 ++++
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 18 +++---
src/main/resources/application.yml | 12 ++--
5 files changed, 77 insertions(+), 45 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 eec3662..2e92c6e 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -993,36 +993,41 @@
// 鑾峰彇宸ヤ綔鐘舵�佷负 2,3,4,5,6 鐨勫叆搴撳伐浣滄。
WrkMast wrkMast = wrkMastMapper.selectPakInStep23456(slave.getId(), staProtocol.getWorkNo().intValue(), crnStn.getStaNo());
if(null == wrkMast || (wrkMast.getCrnNo()==2 && wrkMast.getWrkSts()==2 && crnProtocol.getCrnNo()!=2 && (wrkMast.getIoType()==1 || wrkMast.getIoType()==10)) ){
-// News.error("{}绔欑偣鏌ヨ鏃犲緟鍏ュ簱鏁版嵁 宸ヤ綔鍙�={}", crnStn.getStaNo(), staProtocol.getWorkNo());
- // 宸茬粡瀛樺湪鍚婅溅鎵ц浠诲姟鏃讹紝鍒欒繃婊�
- if (wrkMastMapper.selectWorking(slave.getId()) != null) {
- continue;
- }
- if (Cools.isEmpty(staProtocol.getWorkNo())){
- continue;
- }
- // 鍒ゆ柇鍫嗗灈鏈虹姸鎬佺瓑寰呯‘璁�
- if (crnProtocol.modeType == CrnModeType.AUTO
- && crnProtocol.statusType == CrnStatusType.IDLE
- && crnProtocol.forkPosType == CrnForkPosType.HOME) {
- News.info("鍫嗗灈鏈烘帴椹充换鍔℃墽琛岋紝宸ヤ綔鍙凤細"+staProtocol.getWorkNo()+"锛涙墽琛屽爢鍨涙満鍙凤細"+slave.getId()+"锛涙帴椹冲彇璐т綅锛�"+crnStn.getStaNo()+"锛涙帴椹虫斁璐т綅锛�"+staProtocol.getSiteId());
- // 鍫嗗灈鏈烘帴椹充换鍔″懡浠や笅鍙戝尯 --------------------------------------------------------------------------
- CrnCommand crnCommand = new CrnCommand();
- crnCommand.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
- crnCommand.setTaskNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
- crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
- crnCommand.setCommand((short) 0);
- crnCommand.setTaskMode(CrnTaskModeType.XY_MOVE); // 浠诲姟妯″紡: 绔欎綅杞Щ
- crnCommand.setSourcePosX(crnStn.getRow().shortValue()); // 婧愬簱浣嶆帓
- crnCommand.setSourcePosY(crnStn.getBay().shortValue()); // 婧愬簱浣嶅垪
- crnCommand.setSourcePosZ(crnStn.getLev().shortValue()); // 婧愬簱浣嶅眰
- crnCommand.setDestinationPosX(Utils.getRow(staProtocol.getSiteId())); // 鐩爣搴撲綅鎺�
- crnCommand.setDestinationPosY(Utils.getBay(staProtocol.getSiteId())); // 鐩爣搴撲綅鍒�
- crnCommand.setDestinationPosZ(Utils.getLev(staProtocol.getSiteId())); // 鐩爣搴撲綅灞�
- if (!MessageQueue.offer(SlaveType.Crn, slave.getId(), new Task(2, crnCommand))) {
- News.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", slave.getId(), JSON.toJSONString(crnCommand));
+ try{
+ // News.error("{}绔欑偣鏌ヨ鏃犲緟鍏ュ簱鏁版嵁 宸ヤ綔鍙�={}", crnStn.getStaNo(), staProtocol.getWorkNo());
+ // 宸茬粡瀛樺湪鍚婅溅鎵ц浠诲姟鏃讹紝鍒欒繃婊�
+ if (wrkMastMapper.selectWorking(slave.getId()) != null) {
+ continue;
}
- return true;
+ if (Cools.isEmpty(staProtocol.getWorkNo()) || !staProtocol.isLoading()){
+ continue;
+ }
+ // 鍒ゆ柇鍫嗗灈鏈虹姸鎬佺瓑寰呯‘璁�
+ if (crnProtocol.modeType == CrnModeType.AUTO
+ && crnProtocol.statusType == CrnStatusType.IDLE
+ && crnProtocol.forkPosType == CrnForkPosType.HOME) {
+ News.info("鍫嗗灈鏈烘帴椹充换鍔℃墽琛岋紝宸ヤ綔鍙凤細"+staProtocol.getWorkNo()+"锛涙墽琛屽爢鍨涙満鍙凤細"+slave.getId()+"锛涙帴椹冲彇璐т綅锛�"+crnStn.getStaNo()+"锛涙帴椹虫斁璐т綅锛�"+staProtocol.getSiteId());
+ // 鍫嗗灈鏈烘帴椹充换鍔″懡浠や笅鍙戝尯 --------------------------------------------------------------------------
+ CrnCommand crnCommand = new CrnCommand();
+ crnCommand.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
+ crnCommand.setTaskNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+ crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
+ crnCommand.setCommand((short) 0);
+ crnCommand.setTaskMode(CrnTaskModeType.XY_MOVE); // 浠诲姟妯″紡: 绔欎綅杞Щ
+ crnCommand.setSourcePosX(crnStn.getRow().shortValue()); // 婧愬簱浣嶆帓
+ crnCommand.setSourcePosY(crnStn.getBay().shortValue()); // 婧愬簱浣嶅垪
+ crnCommand.setSourcePosZ(crnStn.getLev().shortValue()); // 婧愬簱浣嶅眰
+ crnCommand.setDestinationPosX(Utils.getRow(staProtocol.getSiteId())); // 鐩爣搴撲綅鎺�
+ crnCommand.setDestinationPosY(Utils.getBay(staProtocol.getSiteId())); // 鐩爣搴撲綅鍒�
+ crnCommand.setDestinationPosZ(Utils.getLev(staProtocol.getSiteId())); // 鐩爣搴撲綅灞�
+ if (!MessageQueue.offer(SlaveType.Crn, slave.getId(), new Task(2, crnCommand))) {
+ News.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", slave.getId(), JSON.toJSONString(crnCommand));
+ }
+ return true;
+ }
+ continue;
+ } catch (Exception e){
+ News.info("鍫嗗灈鏈烘帴椹充换鍔℃墽琛岋紝涓�鍦猴細"+e.getMessage());
}
continue;
}
@@ -4084,6 +4089,9 @@
*/
public synchronized void ledReset() {
for (LedSlave led : slaveProperties.getLed()) {
+ if (led.getId()>3){
+ continue;
+ }
// 鑾峰彇杈撻�佺嚎plc绾跨▼
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, led.getDevpPlcId());
// 鍛戒护闆嗗悎
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index bda6582..cbb25bd 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -154,9 +154,9 @@
// 鏇存柊鍏ュ嚭搴撴ā寮�
updateIoMode();
ArrayList<Integer> staNos = getStaNo();
- OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) 50);
+ OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) (staNos.size()*2));
if (result.IsSuccess) {
- for (int i = 0; i < 25; i++) {
+ for (int i = 0; i < staNos.size(); i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
StaProtocol staProtocol = station.get(siteId);
if (null == staProtocol) {
@@ -168,9 +168,9 @@
}
}
Thread.sleep(200);
- OperateResultExOne<byte[]> result0 = siemensS7Net.Read("DB101.0", (short) 50);
+ OperateResultExOne<byte[]> result0 = siemensS7Net.Read("DB101.0", (short) (staNos.size()*2));
if (result0.IsSuccess) {
- for (int i = 0; i < 25; i++) {
+ for (int i = 0; i < staNos.size(); i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
StaProtocol staProtocol = station.get(siteId);
if (null == staProtocol) {
@@ -182,11 +182,11 @@
}
}
Thread.sleep(200);
- OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB102.0", (short) 50);
+ OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB102.0", (short) (staNos.size()*2));
if (result1.IsSuccess) {
- for (int i = 0; i < 25; i++) {
+ for (int i = 0; i < staNos.size(); i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i*2, 1);
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i * 2, 1);
StaProtocol staProtocol = station.get(siteId);
staProtocol.setAutoing(status[0]); // 鑷姩
staProtocol.setLoading(status[1]); // 鏈夌墿
@@ -199,10 +199,10 @@
if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
staProtocol.setPakMk(true);
- }else if (staProtocol.getSiteId().equals(300)){
+ } else if (staProtocol.getSiteId().equals(300)) {
BasDevpMapper basDevpMapper = SpringUtils.getBean(BasDevpMapper.class);
BasDevp basDevp = basDevpMapper.selectByDevNo(300);
- if (!basDevp.getWrkNo().equals(basDevp.getWrkNo1())){
+ if (!basDevp.getWrkNo().equals(basDevp.getWrkNo1())) {
staProtocol.setPakMk(true);
}
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index f2fcaf2..d1a507e 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -218,7 +218,7 @@
# 杈撻�佺嚎2
devp[1]:
id: 2
- ip: 10.10.11.61
+ ip: 10.10.10.160
port: 102
rack: 0
slot: 0
@@ -238,7 +238,7 @@
# 杈撻�佺嚎3
devp[2]:
id: 3
- ip: 10.10.12.61
+ ip: 10.10.10.170
port: 102
rack: 0
slot: 0
@@ -282,14 +282,14 @@
id: 1
ip: 10.10.10.205
port: 5005
- devpPlcId: ${wcs-slave.devp[1].id}
+ devpPlcId: ${wcs-slave.devp[0].id}
staArr: 100
# LED2
led[1]:
id: 2
ip: 10.10.10.206
port: 5005
- devpPlcId: ${wcs-slave.devp[2].id}
+ devpPlcId: ${wcs-slave.devp[0].id}
staArr: 300
# LED3
led[2]:
@@ -301,14 +301,14 @@
# LED4
led[3]:
id: 4
- ip: 10.10.11.207
+ ip: 10.10.10.207
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
staArr: 200
# LED5
led[4]:
id: 5
- ip: 10.10.12.207
+ ip: 10.10.10.207
port: 5005
devpPlcId: ${wcs-slave.devp[2].id}
staArr: 200
diff --git a/src/main/webapp/static/css/console.css b/src/main/webapp/static/css/console.css
index a9548f8..bcd69a8 100644
--- a/src/main/webapp/static/css/console.css
+++ b/src/main/webapp/static/css/console.css
@@ -310,6 +310,13 @@
.site-row-1 .site {
width: 80px;
}
+.site-row-112 {
+ top: 89px;
+ left: 599px;
+}
+.site-row-112 .site {
+ width: 70px;
+}
.site-row-2 {
top: 289px;
left: 499px;
@@ -339,7 +346,13 @@
.site-row-5 .site {
width: 70px;
}
-
+.site-row-212 {
+ top: 563px;
+ left: 599px;
+}
+.site-row-212 .site {
+ width: 70px;
+}
.site-row-6 {
top: 213px;
left: 797px;
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index e3de3f4..d4641a7 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -22,6 +22,12 @@
<div id="site-200" class="site" style="height: 30px;line-height: 30px;margin-top: 95px;">200</div>
</div>
<!-- 绗�2鍒�-->
+ <div class="site-row site-row-112">
+ <div id="site-114" class="site" style="height: 30px;line-height: 30px;">114</div>
+ <div id="site-113" class="site" style="height: 30px;line-height: 30px;">113</div>
+ <div id="site-112" class="site" style="height: 30px;line-height: 30px;">112</div>
+ </div>
+ <!-- 绗�2鍒�-->
<div class="site-row site-row-2">
<div id="site-101" class="site" style="height: 36px;line-height: 36px;">101</div>
<div id="site-300" class="site" style="height: 94px;line-height: 94px;">300</div>
@@ -52,6 +58,11 @@
<div id="site-207" class="site" style="height: 32px;line-height: 32px;">207</div>
</div>
<!-- 绗�6鍒� -->
+ <div class="site-row site-row-212">
+ <div id="site-212" class="site" style="height: 30px;line-height: 30px;">212</div>
+ <div id="site-213" class="site" style="height: 30px;line-height: 30px;">213</div>
+ <div id="site-214" class="site" style="height: 30px;line-height: 30px;">214</div>
+ </div>
<div class="site-row site-row-6">
<div id="site-108" class="site" style="height: 36px;line-height: 36px;">108</div>
<div id="site-109" class="site" style="height: 36px;line-height: 36px;">109</div>
--
Gitblit v1.9.1