From 5989fd098fea045da7a3612d2c9b0da38b2d1d27 Mon Sep 17 00:00:00 2001
From: lsh <lsh>
Date: 星期日, 26 五月 2024 08:32:16 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 16 ++++
src/main/java/com/zy/core/thread/JarThread.java | 4
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 12 ++
src/main/webapp/views/index.html | 49 ++++++++++++
src/main/java/com/zy/core/MainProcess.java | 43 ++++++----
src/main/resources/application.yml | 99 +++++++++++++++++-------
6 files changed, 173 insertions(+), 50 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 ceb91ec..9196e54 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2099,7 +2099,7 @@
continue;
}
if (!locMast.getLocSts().equals("S") && !locMast.getLocSts().equals("Q")) {
- log.error("鍏ュ簱鎿嶄綔搴撲綅鐘舵�佷笉绗﹀悎--鐘舵��, 搴撲綅鍙�={}锛屽簱浣嶇姸鎬�={}", wrkMast.getLocNo(), locMast.getLocSts());
+ log.error("鍏ュ簱鎿嶄綔搴撲綅鐘舵�佷笉绗﹀悎--鐘舵��, 搴撲綅鍙�={}锛屽簱浣嶇姸鎬�={}", locMast.getLocNo(), locMast.getLocSts());
continue;
}
@@ -2893,6 +2893,9 @@
*/
public synchronized void storeFinishedTwo() {
for (CrnSlave crn : slaveProperties.getCrn()) {
+ if (crn.getId()<3 || crn.getId()>5){
+ continue;
+ }
// 鑾峰彇鍫嗗灈鏈轰俊鎭�
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
@@ -5495,4 +5498,11 @@
}
}
+ /**
+ * 鍏ュ嚭搴� ===>> 灏忚溅浣滀笟涓嬪彂
+ */
+ public synchronized boolean steIoExecute(Integer sign) {
+ return false;
+ }
+
}
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index a140f77..2cc40ed 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -72,24 +72,31 @@
mainService.storeFinishedTwo();
/************************************RGV璋冨害************************************/
-// i++;
-// k++;
-// if (i<7) {
-// // RGV ===>> 灏忚溅浠诲姟浣滀笟涓嬪彂
-// try{
- boolean rgvIoExecuteSign = mainService.rgvIoExecute(7); //7鐓滄槦鐗逛緵锛屽乏鍙崇Щ鍔�
-// if (rgvIoExecuteSign){
-// k = 0;
-// } else if (k>7){
-// k = 0;
-// mainService.rgvRunWrkMastEmptyStaAvoidance();//閬胯
-// }
-// }catch (Exception e){
-// log.error("RGV ===>> 灏忚溅浠诲姟浣滀笟涓嬪彂寮傚父"+e);
-// }
-// }else {
-// i = 0;
-// }
+ i++;
+ k++;
+ if (i<8) {
+ // RGV ===>> 灏忚溅浠诲姟浣滀笟涓嬪彂
+ if (i == 7) {
+ try{
+ boolean rgvIoExecuteSign = mainService.rgvIoExecute(i); //7鐓滄槦鐗逛緵锛屽乏鍙崇Щ鍔�
+// if (rgvIoExecuteSign){
+// k = 0;
+// } else if (k>8){
+// k = 0;
+// mainService.rgvRunWrkMastEmptyStaAvoidance();//閬胯
+// }
+ }catch (Exception e){
+ log.error("RGV ===>> 灏忚溅浠诲姟浣滀笟涓嬪彂寮傚父"+e);
+ }
+ }else {
+ //绌挎鏉�
+// boolean rgvIoExecuteSign = mainService.rgvIoExecute(i); //7鐓滄槦鐗逛緵锛屽乏鍙崇Щ鍔�
+
+ }
+
+ }else {
+ i = 0;
+ }
// //瀹屾垚灏忚溅浠诲姟
mainService.rgvCompleteWrkMastSta();
/************************************RGV璋冨害************************************/
diff --git a/src/main/java/com/zy/core/thread/JarThread.java b/src/main/java/com/zy/core/thread/JarThread.java
index 1268aff..d32862d 100644
--- a/src/main/java/com/zy/core/thread/JarThread.java
+++ b/src/main/java/com/zy/core/thread/JarThread.java
@@ -123,9 +123,7 @@
BasJarService service = SpringUtils.getBean(BasJarService.class);
if (null != service) {
// 鍚屾pakMk
- BasJar one = service.selectById(slave.getId());
-
- BasJar basJar = new BasJar();
+ BasJar basJar = service.selectById(slave.getId());
basJar.setJarNo(slave.getId());
if (!service.updateById(jarProtocol.toSqlModel(basJar))){
News.error("纭寲缃恜lc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 9a4d97a..ca18898 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -307,6 +307,22 @@
short commandFinish = 1;
Thread.sleep(100L);
result = siemensNet.Write("DB100.18", commandFinish);
+ int signFinish = 1;
+ while (signFinish<5){
+ OperateResultExOne<byte[]> result10018 = siemensNet.Read("DB100.18", (short) 2);
+ short transInt16 = siemensNet.getByteTransform().TransInt16(result10018.Content, 0);
+ if (transInt16 != commandFinish){
+ log.info("涓嬪彂DB100.18 鍥炶澶辫触" + "commandFinish:"+commandFinish);
+ log.info("涓嬪彂DB100.18 鍥炶澶辫触" + "array:"+ JSON.toJSONString(array));
+ result = siemensNet.Write("DB100.18", commandFinish);
+ signFinish++;
+ }else {
+ log.info("涓嬪彂DB100.18" + "commandFinish:"+commandFinish);
+ log.info("涓嬪彂DB100.18" + "array:"+ JSON.toJSONString(array));
+ break;
+ }
+
+ }
}
try {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 83a0a15..0dc6f80 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -116,17 +116,17 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 153
- staNoOther: 152
- row: 4
+ staNo: 261
+ staNoOther: 261
+ row: 10
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 100
- staNoOther: 101
- row: 1
+ staNo: 200
+ staNoOther: 200
+ row: 9
bay: 1
lev: 1
# 鍫嗗灈鏈�4
@@ -142,17 +142,17 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 153
- staNoOther: 152
- row: 4
+ staNo: 260
+ staNoOther: 260
+ row: 12
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 100
- staNoOther: 101
- row: 1
+ staNo: 250
+ staNoOther: 250
+ row: 11
bay: 1
lev: 1
# 鍫嗗灈鏈�5
@@ -168,17 +168,17 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 153
- staNoOther: 152
- row: 4
+ staNo: 259
+ staNoOther: 259
+ row: 14
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 100
- staNoOther: 101
- row: 1
+ staNo: 241
+ staNoOther: 241
+ row: 13
bay: 1
lev: 1
# 鍫嗗灈鏈�6
@@ -242,24 +242,24 @@
slot: 0
#RGV鍏ュ簱婧愮珯鐐�
rgvInSStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
+ devpPlcId: ${wcs-slave.devp[1].id}
staNo: 100
rgvInSStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
+ devpPlcId: ${wcs-slave.devp[1].id}
staNo: 101
#RGV鍑哄簱婧愮珯鐐�
rgvOutSStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
+ devpPlcId: ${wcs-slave.devp[1].id}
staNo: 110
rgvOutSStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
+ devpPlcId: ${wcs-slave.devp[1].id}
staNo: 112
#RGV鐩爣绔欑偣
rgvDestStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
+ devpPlcId: ${wcs-slave.devp[1].id}
staNo: 102
rgvDestStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
+ devpPlcId: ${wcs-slave.devp[1].id}
staNo: 103
# 杈撻�佺嚎
@@ -286,13 +286,16 @@
staNo: 173
# 澶ф枡绠� 鍙屽伐浣嶅崟浼� 鍏ュ簱鍙�1
inLargeSta[0]:
- staNo: 153
+ staNo: 292
# 澶ф枡绠� 鍙屽伐浣嶅崟浼� 鍏ュ簱鍙�1
inLargeSta[1]:
- staNo: 145
+ staNo: 281
# 澶ф枡绠� 鍙屽伐浣嶅崟浼� 绌烘澘鍏ュ簱鍙�1
emptyInLargeSta[0]:
- staNo: 104
+ staNo: 292
+ # 澶ф枡绠� 鍙屽伐浣嶅崟浼� 绌烘澘鍏ュ簱鍙�2
+ emptyInLargeSta[1]:
+ staNo: 281
# 杈撻�佺嚎
devp[1]:
id: 2
@@ -333,4 +336,44 @@
ip: 192.168.18.5
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 144
\ No newline at end of file
+ staArr: 144
+ # JAR1
+ jar[0]:
+ id: 1
+ ip: 10.10.10.100
+ port: 120
+ # JAR2
+ jar[1]:
+ id: 2
+ ip: 10.10.10.100
+ port: 120
+ # JAR3
+ jar[2]:
+ id: 3
+ ip: 10.10.10.100
+ port: 120
+ # JAR4
+ jar[3]:
+ id: 4
+ ip: 10.10.10.100
+ port: 120
+ # ste1
+ ste[0]:
+ id: 1
+ ip: 10.10.10.100
+ port: 120
+ # ste2
+ ste[1]:
+ id: 2
+ ip: 10.10.10.100
+ port: 120
+ # ste3
+ ste[2]:
+ id: 3
+ ip: 10.10.10.100
+ port: 120
+ # ste4
+ ste[3]:
+ id: 4
+ ip: 10.10.10.100
+ port: 120
\ No newline at end of file
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index 3eb2264..59def43 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -50,5 +50,54 @@
// 绯荤粺杩愯鐘舵��
var systemRunning = true;
+
+
+ news();layx.min('wcs-news');
+ function news() {
+ layx.iframe(
+ 'wcs-news' // id
+ , '绯荤粺鍒嗘瀽鎶ュ憡'
+ , "news.html"
+ , {
+ shadow:false
+ , storeStatus:false
+ // , skin: 'news'
+ , width:800
+ , height:600
+ , position:'rb'
+ // , control:false
+ , opacity:0.9
+ , border:false
+ , icon:'<img src="../static/images/login.png" style="height:22px;display:block;" alt=""/>'
+ , stickMenu:true
+ , maxMenu:false
+ , closeMenu:false
+ , moveLimit:{
+ leftOut: false,
+ rightOut: false,
+ topOut: false,
+ bottomOut: false,
+ }
+ , minWidth:300
+ , minHeight:300
+ , borderRadius: '8px'
+ , shadeDestroy:true
+ , escKey: false
+ , event:{
+ onmin: {
+ after: function () {
+ $('.layx-min-statu').css("left", "inherit").css("right", "10px")
+ }
+ }
+ , onrestore:{
+ after: function () {
+ let win = layx.getFrameContext('wcs-news');
+ win.autoScroll = true
+ }
+ }
+ }
+ }
+ );
+ }
</script>
</html>
--
Gitblit v1.9.1