From dd27e775a2adca9d334e483b753bbc939c4a1465 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期六, 03 十二月 2022 16:50:10 +0800
Subject: [PATCH] #

---
 src/main/resources/application.yml |  211 +++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 142 insertions(+), 69 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index c18cd83..a0150f3 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,10 +8,7 @@
     name: @pom.build.finalName@
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-#    url: jdbc:sqlserver://47.97.1.152:51433;databasename=xgmasrs
-#    username: sa
-#    password: Zoneyung@zy56$
-    url: jdbc:sqlserver://localhost:1433;databasename=xgmasrs
+    url: jdbc:sqlserver://127.0.0.1:1433;databasename=xjhsasrs
     username: sa
     password: sa@123
   mvc:
@@ -26,6 +23,8 @@
   mapper-locations: classpath:mapper/*.xml
 #  global-config:
 #    field-strategy: 0
+#  configuration:
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
 logging:
   path: /stock/out/@pom.build.finalName@/logs
@@ -37,182 +36,256 @@
   enable: false
 
 wms:
-  url: localhost:8080/xgmwms
+  url: localhost:8080/hswms
 
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:
   # 鍙屾繁
   doubleDeep: true
   # 鍙屾繁搴撲綅鎺掑彿
-  doubleLocs: 1,4,5,8,9,12,13,16,17,20
+  doubleLocs: 1,4,5,8,9,12,13,16
   # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
   groupCount: 4
   # 鍫嗗灈鏈�1
   crn[0]:
     id: 1
-    ip: 10.10.10.10
-    port: 8888
+    ip: 10.10.10.110
+    port: 102
+    rack: 0
+    slot: 0
     # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
     offset: 2
     demo: false
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 100
-      row: 2
+      staNo: 007
+      row: 3
       bay: 1
       lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnOutStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 101
-      row: 3
+      staNo: 008
+      row: 2
       bay: 1
       lev: 1
   # 鍫嗗灈鏈�2
   crn[1]:
     id: 2
-    ip: 10.10.10.13
-    port: 8888
+    ip: 10.10.10.120
+    port: 102
+    rack: 0
+    slot: 0
     # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
     offset: 2
     demo: false
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 102
-      row: 6
+      staNo: 005
+      row: 7
       bay: 1
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 103
-      row: 7
+      staNo: 006
+      row: 6
       bay: 1
       lev: 1
   # 鍫嗗灈鏈�3
   crn[2]:
     id: 3
-    ip: 10.10.10.16
-    port: 8888
+    ip: 10.10.10.130
+    port: 102
+    rack: 0
+    slot: 0
     # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
     offset: 2
     demo: false
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 104
-      row: 10
+      staNo: 003
+      row: 11
       bay: 1
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 105
-      row: 11
+      staNo: 004
+      row: 10
       bay: 1
       lev: 1
   # 鍫嗗灈鏈�4
   crn[3]:
     id: 4
-    ip: 10.10.10.19
-    port: 8888
+    ip: 10.10.10.140
+    port: 102
+    rack: 0
+    slot: 0
     # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
     offset: 2
     demo: false
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 106
-      row: 14
+      staNo: 001
+      row: 15
       bay: 1
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 107
-      row: 15
+      staNo: 002
+      row: 14
       bay: 1
       lev: 1
   # 鍫嗗灈鏈�5
   crn[4]:
     id: 5
-    ip: 10.10.10.22
-    port: 8888
+    ip: 10.10.10.141
+    port: 102
+    rack: 0
+    slot: 0
     # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
     offset: 2
     demo: false
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 108
-      row: 18
+      staNo: 001
+      row: 15
       bay: 1
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 109
-      row: 19
+      staNo: 002
+      row: 14
       bay: 1
       lev: 1
+  # 鍫嗗灈鏈�6
+  crn[5]:
+    id: 6
+    ip: 10.10.10.142
+    port: 102
+    rack: 0
+    slot: 0
+    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+    offset: 2
+    demo: false
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 001
+      row: 15
+      bay: 1
+      lev: 1
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 002
+      row: 14
+      bay: 1
+      lev: 1
+
+  # RGV绌挎杞�1
+  rgv[0]:
+    id: 1
+    ip: 10.10.10.40
+    port: 502
+    rack: 0
+    slot: 0
+    #RGV鍏ュ簱婧愮珯鐐�
+    rgvInSStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 100
+    rgvInSStn[1]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 101
+    #RGV鍑哄簱婧愮珯鐐�
+    rgvOutSStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 110
+    rgvOutSStn[1]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 112
+    #RGV鐩爣绔欑偣
+    rgvDestStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 102
+    rgvDestStn[1]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 103
+  # RGV绌挎杞�2
+  rgv[1]:
+    id: 2
+    ip: 10.10.10.41
+    port: 502
+    rack: 0
+    slot: 0
+    #RGV鍏ュ簱婧愮珯鐐�
+    rgvInSStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 100
+    rgvInSStn[1]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 101
+    #RGV鍑哄簱婧愮珯鐐�
+    rgvOutSStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 110
+    rgvOutSStn[1]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 112
+    #RGV鐩爣绔欑偣
+    rgvDestStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 102
+    rgvDestStn[1]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 103
+
   # 杈撻�佺嚎
   devp[0]:
     id: 1
-    ip: 10.10.10.50
+    ip: 10.10.10.30
     port: 102
     rack: 0
     slot: 0
     # 鍏ュ簱鍙�1
     inSta[0]:
-      staNo: 176
+      staNo: 15
       barcode: ${wcs-slave.barcode[0].id}
     # 绌烘澘鍏ュ簱鍙�1
     emptyInSta[0]:
-      staNo: 176
+      staNo: 12
     # 鍑哄簱鍙�1
     outSta[0]:
-      staNo: 173
-    # 鍑哄簱鍙�2
-    outSta[1]:
-      staNo: 182
-    # 鎷f枡鍏ュ簱鍙�
+      staNo: 11
+    # 鎷f枡鍏ュ簱鍙�1
     pickSta[0]:
-      staNo: 172
+      staNo: 11
+      barcode: ${wcs-slave.barcode[0].id}
+
   # 鏉$爜鎵弿浠�
   barcode[0]:
     id: 1
-    ip: 192.168.10.130
+    ip: 10.10.10.52
     port: 51236
-  # LED1
+   # LED1
   led[0]:
     id: 1
-    ip: 192.168.10.211
+    ip: 10.10.10.201
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 170
+    staArr: 15
   # LED2
   led[1]:
     id: 2
-    ip: 192.168.10.221
+    ip: 10.10.10.202
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 180
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+    staArr: 11
\ No newline at end of file

--
Gitblit v1.9.1