From eb5e61b0f85c78455caa4e0ba54245aff982ba3d Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 13 六月 2023 09:13:00 +0800
Subject: [PATCH] 孚能

---
 src/main/resources/application.yml |  194 ++++++++++++++++++++----------------------------
 1 files changed, 81 insertions(+), 113 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 9d1b6d9..993d52c 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,10 +8,8 @@
     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://10.10.10.238:1433;databasename=xgmasrs
+    url: jdbc:sqlserver://127.0.0.1:1433;databasename=zjfnasrs
+
     username: sa
     password: sa@123
   mvc:
@@ -37,167 +35,137 @@
   enable: false
 
 wms:
-  url: 10.10.10.238:8080/xgmwms
-#  url: localhost:8082/xgmwms
+  url: localhost:8081/fnwms
 
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:
   # 鍙屾繁
-  doubleDeep: true
+  doubleDeep: false
   # 鍙屾繁搴撲綅鎺掑彿
-  doubleLocs: 1,4,5,8,9,12,13,16,17,20
+  doubleLocs:
   # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
-  groupCount: 4
+  groupCount: 2
   # 鍫嗗灈鏈�1
   crn[0]:
     id: 1
-    ip: 10.10.10.10
+    ip: 10.12.55.70
     port: 8888
+    rack: 0
+    slot: 0
     # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
     offset: 2
     demo: false
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 100
-      row: 2
-      bay: 1
+      staNo: 202
+      row: 1
+      bay: 0
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 101
-      row: 3
-      bay: 1
+      staNo: 203
+      row: 2
+      bay: 0
       lev: 1
   # 鍫嗗灈鏈�2
   crn[1]:
     id: 2
-    ip: 10.10.10.13
+    ip: 10.12.55.60
     port: 8888
+    rack: 0
+    slot: 0
     # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
     offset: 2
     demo: false
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 102
-      row: 6
-      bay: 1
+      staNo: 209
+      row: 3
+      bay: 0
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 103
-      row: 7
-      bay: 1
+      staNo: 210
+      row: 4
+      bay: 0
       lev: 1
-  # 鍫嗗灈鏈�3
-  crn[2]:
-    id: 3
-    ip: 10.10.10.16
-    port: 8888
-    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    offset: 2
-    demo: false
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 104
-      row: 10
-      bay: 1
-      lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 105
-      row: 11
-      bay: 1
-      lev: 1
-  # 鍫嗗灈鏈�4
-  crn[3]:
-    id: 4
-    ip: 10.10.10.19
-    port: 8888
-    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    offset: 2
-    demo: false
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 106
-      row: 14
-      bay: 1
-      lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 107
-      row: 15
-      bay: 1
-      lev: 1
-  # 鍫嗗灈鏈�5
-  crn[4]:
-    id: 5
-    ip: 10.10.10.22
-    port: 8888
-    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    offset: 2
-    demo: false
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 108
-      row: 18
-      bay: 1
-      lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 109
-      row: 19
-      bay: 1
-      lev: 1
+
   # 杈撻�佺嚎
   devp[0]:
     id: 1
-    ip: 10.10.10.50
+    ip: 10.12.55.90
     port: 102
     rack: 0
     slot: 0
     # 鍏ュ簱鍙�1
     inSta[0]:
-      staNo: 176
+      staNo: 201
       barcode: ${wcs-slave.barcode[0].id}
+    # 鍏ュ簱鍙�2
+    inSta[1]:
+      staNo: 206
+      barcode: ${wcs-slave.barcode[1].id}
     # 绌烘澘鍏ュ簱鍙�1
     emptyInSta[0]:
-      staNo: 176
+      staNo: 201
+    # 绌烘澘鍏ュ簱鍙�2
+    emptyInSta[1]:
+      staNo: 206
     # 鍑哄簱鍙�1
     outSta[0]:
-      staNo: 173
+      staNo: 204
     # 鍑哄簱鍙�2
     outSta[1]:
-      staNo: 182
-    # 鎷f枡鍏ュ簱鍙�
-    pickSta[0]:
-      staNo: 176
-      barcode: ${wcs-slave.barcode[0].id}
-  # 鏉$爜鎵弿浠�
+      staNo: 103
+    # 鍑哄簱鍙�3
+    outSta[2]:
+      staNo: 205
+  # 鏉$爜鎵弿浠�1
   barcode[0]:
     id: 1
-    ip: 10.10.10.52
+    ip: 172.28.15.235
     port: 51236
-   # LED1
-  led[0]:
-    id: 1
-    ip: 10.10.10.60
-    port: 5005
-    devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 172
-  # LED2
-  led[1]:
+  # 鏉$爜鎵弿浠�2
+  barcode[1]:
     id: 2
-    ip: 10.10.10.61
-    port: 5005
-    devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 182
+    ip: 172.28.15.235
+    port: 51236
+#   # LED1
+#  led[0]:
+#    id: 1
+#    ip: 10.10.10.60
+#    port: 5005
+#    devpPlcId: ${wcs-slave.devp[0].id}
+#    staArr: 110
+#
+#  #socket
+#  socket[0]:
+#    id: 1
+#    ip: 10.10.10.100
+#    port: 10001
+
+# tcp鏈嶅姟绔厤缃�
+tcp:
+  #tcp/ip鍗忚绔彛
+  port: 51236
+  #蹇冭烦 s
+  heart-seconds: 120
+  #鏈�澶ц繛鎺ユ暟
+  backlog: 128
+  #鏄惁寮�鍚痥eepAlive
+  keep-alive: true
+  #鍙戦�佹粦鍔ㄧ獥鍙�(256KB)
+  sndbuf: 262144
+  #鎺ュ彈婊戝姩绐楀彛(2MB)
+  rcvbuf: 2097152
+  #涓婁笅琛屾棩蹇楁墦鍗�
+  printPacLog: true
+  #鏉$爜闀垮害
+  barcodeLen: 12
+
+test:
+  url: 127.0.0.1:8080/test
\ No newline at end of file

--
Gitblit v1.9.1