From c471b38363268108200e6c88c87fc219d17eb17f Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 26 十一月 2024 13:13:58 +0800
Subject: [PATCH] 项目搭建完成

---
 src/main/resources/application.yml |  157 ++++++++++++++++++++--------------------------------
 1 files changed, 60 insertions(+), 97 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 884787f..68edfc1 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:1433;databasename=htasrs
+    url: jdbc:sqlserver://127.0.0.1:1433;databasename=jsjasrs
     username: sa
     password: sa@123
   mvc:
@@ -33,6 +33,9 @@
 swagger:
   enable: false
 
+wms:
+  url: 127.0.0.1:8080/jsjwms
+
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:
   # 鍙屾繁
@@ -41,171 +44,131 @@
   doubleLocs: 1,4,5,8
   # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
   groupCount: 4
+
   # 鍫嗗灈鏈�1
   crn[0]:
     id: 1
-    ip: 192.168.10.10
+    ip: 10.10.10.1
     port: 102
     rack: 0
-    slot: 1
+    slot: 0
     # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
     offset: 2
     demo: false
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 205
-      row: 2
-      bay: 65
-      lev: 1
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[1]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 118
-      row: 2
-      bay: 0
+      staNo: 103
+      row: 3
+      bay: 1
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 203
-      row: 3
-      bay: 65
-      lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[1]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 120
-      row: 3
-      bay: 0
+      staNo: 101
+      row: 2
+      bay: 1
       lev: 1
   # 鍫嗗灈鏈�2
   crn[1]:
     id: 2
-    ip: 192.168.10.20
+    ip: 10.10.10.10
     port: 102
     rack: 0
-    slot: 1
+    slot: 0
     # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
     offset: 2
     demo: false
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 202
+      staNo: 105
       row: 6
-      bay: 65
-      lev: 1
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[1]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 124
-      row: 6
-      bay: 0
+      bay: 1
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 200
+      staNo: 107
       row: 7
-      bay: 65
+      bay: 1
       lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[1]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 100
-      row: 7
-      bay: 0
-      lev: 1
-  # 杈撻�佺嚎
+
+  # 杈撻�佺嚎1
   devp[0]:
     id: 1
-    ip: 192.168.10.100
+    ip: 10.10.10.18
     port: 102
     rack: 0
-    slot: 1
+    slot: 0
     # 鍏ュ簱鍙�1
     inSta[0]:
-      staNo: 205
+      staNo: 103
       barcode: ${wcs-slave.barcode[0].id}
+      backSta: 102
+      led: ${wcs-slave.led[1].id}
     # 鍏ュ簱鍙�2
     inSta[1]:
-      staNo: 202
+      staNo: 105
       barcode: ${wcs-slave.barcode[1].id}
+      backSta: 104
+      led: ${wcs-slave.led[2].id}
     # 绌烘澘鍏ュ簱鍙�1
     emptyInSta[0]:
-      staNo: 205
-    # 绌烘澘鍏ュ簱鍙�2
+      staNo: 103
+      barcode: ${wcs-slave.barcode[0].id}
+      backSta: 102
+      led: ${wcs-slave.led[1].id}
     emptyInSta[1]:
-      staNo: 202
-    # 绌烘澘鍏ュ簱鍙�3
-    emptyInSta[2]:
-      staNo: 126
+      staNo: 105
+      barcode: ${wcs-slave.barcode[1].id}
+      backSta: 104
+      led: ${wcs-slave.led[2].id}
     # 鍑哄簱鍙�1
     outSta[0]:
-      staNo: 200
+      staNo: 100
+      led: ${wcs-slave.led[0].id}
     # 鍑哄簱鍙�2
     outSta[1]:
-      staNo: 203
-    # 鍑哄簱鍙�3
-    outSta[2]:
-      staNo: 103
-    # 鎷f枡鍏ュ簱鍙�
-    pickSta[0]:
-      staNo: 127
-    # 鎷f枡鍏ュ簱鍙�
-    pickSta[1]:
-      staNo: 128
-  # 鏉$爜鎵弿浠�
+      staNo: 106
+      led: ${wcs-slave.led[3].id}
+
+  # 鏉$爜鎵弿浠�1
   barcode[0]:
     id: 1
-    ip: 192.168.10.130
+    ip: 10.10.10.121
     port: 51236
-  # 鏉$爜鎵弿浠�
+  # 鏉$爜鎵弿浠�2
   barcode[1]:
     id: 2
-    ip: 192.168.10.131
+    ip: 10.10.10.122
     port: 51236
+
   # LED1
   led[0]:
     id: 1
-    ip: 192.168.10.211
+    ip: 10.10.10.190
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 113
+    staArr: 100
   # LED2
   led[1]:
     id: 2
-    ip: 192.168.10.221
+    ip: 10.10.10.191
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 109
+    staArr: 102,103
   # LED3
   led[2]:
     id: 3
-    ip: 192.168.10.231
+    ip: 10.10.10.192
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 103
-  # 纾呯О
-  scale[0]:
-    id: 1
-    ip: 192.168.10.135
-    port: 2
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+    staArr: 104,105
+  # LED4
+  led[3]:
+    id: 4
+    ip: 10.10.10.192
+    port: 5005
+    devpPlcId: ${wcs-slave.devp[0].id}
+    staArr: 106
\ No newline at end of file

--
Gitblit v1.9.1