From 554a833b682f4052d7297c633cf4dd68818a33f2 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期四, 15 二月 2024 09:37:16 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/MainProcess.java | 90 +++++++++++++++---------------
src/main/webapp/static/js/common.js | 2
pom.xml | 2
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 4
src/main/resources/application.yml | 48 +--------------
5 files changed, 54 insertions(+), 92 deletions(-)
diff --git a/pom.xml b/pom.xml
index 01ecc09..ed7041e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,7 +185,7 @@
</dependencies>
<build>
- <finalName>jtwcs</finalName>
+ <finalName>yxwcs</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index e86a7d6..3f24ad8 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -48,7 +48,7 @@
//鍒濆鍖朢GV鍦板浘
// mainService.initRgvMap();
//鍒锋柊RGV鍦板浘
- mainService.refreshRgvMap();
+// mainService.refreshRgvMap();
// 婕旂ず
// mainService.crnDemoOfLocMove1();
// 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
@@ -73,39 +73,39 @@
// 鍏ュ簱 ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
mainService.storeFinished();
- /////////////////////////////////////RGV璋冨害/////////////////////////////////////
- i++;
- k++;
- if (i<7) {
- // RGV ===>> 灏忚溅浠诲姟浣滀笟涓嬪彂
- try{
- boolean rgvIoExecuteSign = mainService.rgvIoExecute(i);
- if (rgvIoExecuteSign){
- k = 0;
- } else if (k>7){
- k = 0;
- mainService.rgvRunWrkMastEmptyStaAvoidance();//閬胯
- }
- }catch (Exception e){
- log.error("RGV ===>> 灏忚溅浠诲姟浣滀笟涓嬪彂寮傚父"+e);
- }
- }else {
- i = 0;
- }
- //瀹屾垚灏忚溅浠诲姟
- mainService.rgvCompleteWrkMastSta();
- /////////////////////////////////////RGV璋冨害/////////////////////////////////////
+// /////////////////////////////////////RGV璋冨害/////////////////////////////////////
+// i++;
+// k++;
+// if (i<7) {
+// // RGV ===>> 灏忚溅浠诲姟浣滀笟涓嬪彂
+// try{
+// boolean rgvIoExecuteSign = mainService.rgvIoExecute(i);
+// if (rgvIoExecuteSign){
+// k = 0;
+// } else if (k>7){
+// k = 0;
+// mainService.rgvRunWrkMastEmptyStaAvoidance();//閬胯
+// }
+// }catch (Exception e){
+// log.error("RGV ===>> 灏忚溅浠诲姟浣滀笟涓嬪彂寮傚父"+e);
+// }
+// }else {
+// i = 0;
+// }
+// //瀹屾垚灏忚溅浠诲姟
+// mainService.rgvCompleteWrkMastSta();
+// /////////////////////////////////////RGV璋冨害/////////////////////////////////////
- // 寮傚父淇℃伅璁板綍
- mainService.recErr();
- // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐� 2妤�
- mainService.storeEmptyPlt();
- // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,1妤煎彔鐩樻満绌烘澘鍏ュ簱
- mainService.storeEmptyPlt3();
- // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,1妤煎彔鐩樻満鍙犵洏
- mainService.storeEmptyPlt2();
- // 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱鎷嗙洏鍖� 1妤兼媶鍨涗綅缃� 绌烘澘鍙犵洏
- mainService.storeEmptyPlt4();
+// // 寮傚父淇℃伅璁板綍
+// mainService.recErr();
+// // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐� 2妤�
+// mainService.storeEmptyPlt();
+// // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,1妤煎彔鐩樻満绌烘澘鍏ュ簱
+// mainService.storeEmptyPlt3();
+// // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,1妤煎彔鐩樻満鍙犵洏
+// mainService.storeEmptyPlt2();
+// // 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱鎷嗙洏鍖� 1妤兼媶鍨涗綅缃� 绌烘澘鍙犵洏
+// mainService.storeEmptyPlt4();
// 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
mainService.ledExecute();
// 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
@@ -124,18 +124,18 @@
// //鎷嗙洏鏈哄绌烘澘鎵爜锛岄┍鍔ㄦ墭鐩樺悜鐮佸灈浣嶏紝涓嶅叆搴�
// mainService.scanBarcodeEmptyBoard();
- //鐮佸灈瀹屾垚椹卞姩鎵樼洏涓嬩竴姝ユ壂鐮佸叆搴�
- mainService.stackingCompletionDriveTray();
- //鎷嗗灈瀹屾垚缁х画涓嬩竴姝� 鍑哄簱鑷虫湀鍙板嚭搴撳彛
- mainService.stackingCompletionDriveTray2();
- //璐存爣瀹屾垚缁х画涓嬩竴姝�
-// mainService.stackingCompletionDriveTray3();
- //鎷嗗灈瀹屾垚缁х画涓嬩竴姝� 杩愯閫斾腑鑷姩閬胯绌烘澘
- mainService.stackingCompletionDriveTray4();
- //鎷嗗灈瀹屾垚鎵樼洏缁х画涓嬩竴姝�
- mainService.stackingCompletionDriveTrayOk2();
- //閫�璐х爜鍨涘畬鎴愭墭鐩樼户缁笅涓�姝�
- mainService.stackingCompletionDriveTrayOk3();
+// //鐮佸灈瀹屾垚椹卞姩鎵樼洏涓嬩竴姝ユ壂鐮佸叆搴�
+// mainService.stackingCompletionDriveTray();
+// //鎷嗗灈瀹屾垚缁х画涓嬩竴姝� 鍑哄簱鑷虫湀鍙板嚭搴撳彛
+// mainService.stackingCompletionDriveTray2();
+// //璐存爣瀹屾垚缁х画涓嬩竴姝�
+//// mainService.stackingCompletionDriveTray3();
+// //鎷嗗灈瀹屾垚缁х画涓嬩竴姝� 杩愯閫斾腑鑷姩閬胯绌烘澘
+// mainService.stackingCompletionDriveTray4();
+// //鎷嗗灈瀹屾垚鎵樼洏缁х画涓嬩竴姝�
+// mainService.stackingCompletionDriveTrayOk2();
+// //閫�璐х爜鍨涘畬鎴愭墭鐩樼户缁笅涓�姝�
+// mainService.stackingCompletionDriveTrayOk3();
} catch (Exception e) {
e.printStackTrace();
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 45e2c6a..d55f90f 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -50,8 +50,8 @@
add(112);add(113);add(114);add(115);
add(116);add(117);add(118);add(119);
add(120);add(121);add(122);add(123);
-// add(124);add(125);add(126);add(127);
- add(130);add(131);
+ add(124);add(125);add(126);add(127);
+ add(128);add(129);add(130);add(131);
add(132);add(133);add(134);add(135);
add(136);add(137);add(138);add(139);
add(140);add(141);add(142);add(143);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index d53c4d1..8c3a937 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://localhost:49977;databasename=srjtasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=ahyxasrs
username: sa
password: sa@123
mvc:
@@ -36,7 +36,7 @@
enable: false
wms:
- url: localhost:8080/jtwms
+ url: localhost:8080/yxwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
@@ -49,7 +49,7 @@
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 192.168.18.13
+ ip: 10.10.10.120
port: 102
rack: 0
slot: 0
@@ -87,7 +87,7 @@
# 鍫嗗灈鏈�2
crn[1]:
id: 2
- ip: 192.168.18.21
+ ip: 10.10.10.130
port: 102
rack: 0
slot: 0
@@ -236,44 +236,6 @@
row: 18
bay: 1
lev: 2
- # 鍫嗗灈鏈�6
- crn[5]:
- id: 6
- ip: 192.168.18.53
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 117
- row: 23
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 211
- row: 23
- bay: 1
- lev: 2
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 115
- row: 22
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 210
- row: 22
- bay: 1
- lev: 2
# RGV绌挎杞�1
rgv[0]:
@@ -335,7 +297,7 @@
# 杈撻�佺嚎
devp[0]:
id: 1
- ip: 192.168.18.71
+ ip: 10.10.10.100
port: 102
rack: 0
slot: 0
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index cb1aa78..5cf7edb 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -1,4 +1,4 @@
-var baseUrl = "/jtwcs";
+var baseUrl = "/yxwcs";
// 璧嬪��
function setVal(el, val) {
--
Gitblit v1.9.1