From c5230926f49e72970787c3525fd313468e1ddf87 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 25 七月 2023 13:15:15 +0800
Subject: [PATCH] 捡料

---
 src/main/resources/application.yml |  257 ++++++++++++++++++++++++---------------------------
 1 files changed, 120 insertions(+), 137 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index de7f74e..737559f 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,23 +8,25 @@
     name: @pom.build.finalName@
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-#    url: jdbc:sqlserver://47.97.1.152:51433;databasename=ynasrs
-    url: jdbc:sqlserver://localhost:1433;databasename=ynasrs
+    url: jdbc:sqlserver://127.0.0.1:1433;databasename=xzjlasrs
     username: sa
 #    password: Zoneyung@zy56$
     password: sa@123
   mvc:
     static-path-pattern: /**
   redis:
-    host: localhost
+    host: 127.0.0.1
     port: 6379
     database: 0
-#    password: xltys1995
+#    password: 123456
 
 mybatis-plus:
   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
@@ -36,7 +38,14 @@
   enable: false
 
 wms:
-  url: localhost:8081/ynwms
+  url: localhost:8081/xzjlwms
+
+erp:
+  db:
+    driver_class_name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+    ur: jdbc:sqlserver://10.10.10.209:1433;databasename=POY_ASRS
+    username: poy-asrs
+    password: Poy@2022
 
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:
@@ -44,170 +53,144 @@
   doubleDeep: true
   # 鍙屾繁搴撲綅鎺掑彿
   doubleLocs: 32
-  # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
-  groupCount: 2
-  # 绌挎杞﹂�氶亾搴撲綅
-  channel: 0200201
-  # 鍫嗗灈鏈�1
-  crn[0]:
-    id: 1
-    ip: 10.10.10.10
-    port: 102
-    rack: 0
-    slot: 0
-    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    offset: 2
-    demo: false
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 105
-      row: 2
-      bay: 1
-      lev: 1
-  # 鍫嗗灈鏈�2
-  crn[1]:
-    id: 2
-    ip: 10.10.10.20
-    port: 102
-    rack: 0
-    slot: 0
-    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    offset: 2
-    demo: false
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 111
-      row: 17
-      bay: 1
-      lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 114
-      row: 18
-      bay: 1
-      lev: 1
-  # 鍫嗗灈鏈�3
-  crn[2]:
-    id: 3
-    ip: 10.10.10.30
-    port: 102
-    rack: 0
-    slot: 0
-    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    offset: 2
-    demo: false
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 119
-      row: 32
-      bay: 1
-      lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 117
-      row: 30
-      bay: 1
-      lev: 1
-  # 绌挎杞�1
-  ste[0]:
-    id: 1
-    ip: 10.10.10.60
-    port: 502
-    rack: 0
-    slot: 0
-  # 绌挎杞�2
-  ste[1]:
-    id: 2
-    ip: 10.10.10.61
-    port: 502
-    rack: 0
-    slot: 0
-  # 绌挎杞�3
-  ste[2]:
-    id: 3
-    ip: 10.10.10.62
-    port: 502
-    rack: 0
-    slot: 0
-  # 绌挎杞�3
-  ste[3]:
-    id: 4
-    ip: 10.10.10.63
-    port: 502
-    rack: 0
-    slot: 0
-  # 绌挎杞�3
-  ste[4]:
-    id: 5
-    ip: 10.10.10.64
-    port: 502
-    rack: 0
-    slot: 0
+
   # 杈撻�佺嚎
   devp[0]:
     id: 1
-    ip: 10.10.10.50
+    ip: 10.10.10.100
     port: 102
     rack: 0
     slot: 0
     # 鍏ュ簱鍙�1
     inSta[0]:
       staNo: 102
+      backSta: 100
       barcode: ${wcs-slave.barcode[0].id}
-      backSta: 102
       led: ${wcs-slave.led[0].id}
-    # 鍏ュ簱鍙�1
-    inSta[1]:
-      staNo: 203
-      barcode: ${wcs-slave.barcode[1].id}
-      backSta: 201
-      led: ${wcs-slave.led[1].id}
     # 绌烘澘鍏ュ簱鍙�1
     emptyInSta[0]:
       staNo: 102
+      backSta: 100
       barcode: ${wcs-slave.barcode[0].id}
-    # 绌烘澘鍏ュ簱鍙�1
-    emptyInSta[1]:
-      staNo: 203
-      barcode: ${wcs-slave.barcode[1].id}
+      led: ${wcs-slave.led[0].id}
     # 鍑哄簱鍙�1
     outSta[0]:
-      staNo: 100
-    # 鍑哄簱鍙�2
-    outSta[1]:
-      staNo: 101
+      staNo: 104
+      led: ${wcs-slave.led[1].id}
     # 鎷f枡鍑哄簱鍙�
     pickInSta[0]:
       staNo: 102
       barcode: ${wcs-slave.barcode[0].id}
-      backSta: 102
+      backSta: 100
       led: ${wcs-slave.led[0].id}
+    # 璐ф灦鍏ュ簱绔欑偣
+    rackInStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 105
+      row: 4
+      bay: 6
+      lev: 1
+    # 璐ф灦鍏ュ簱绔欑偣
+    rackInStn[1]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 106
+      row: 4
+      bay: 6
+      lev: 3
+    # 璐ф灦鍏ュ簱绔欑偣
+    rackInStn[2]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 107
+      row: 4
+      bay: 6
+      lev: 6
+    # 璐ф灦鍏ュ簱绔欑偣
+    rackInStn[3]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 108
+      row: 4
+      bay: 6
+      lev: 6
+    # 璐ф灦鍑哄簱绔欑偣
+    rackOutStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 100
+      row: 15
+      bay: 2
+      lev: 1
+    # 璐ф灦鍑哄簱绔欑偣
+    rackOutStn[1]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 104
+      row: 4
+      bay: 6
+      lev: 1
+    # 璐ф灦鍑哄簱绔欑偣
+    rackOutStn[2]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 105
+      row: 4
+      bay: 6
+      lev: 3
+    # 璐ф灦鍑哄簱绔欑偣
+    rackOutStn[3]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 108
+      row: 4
+      bay: 6
+      lev: 6
+
   # 鏉$爜鎵弿浠�
   barcode[0]:
     id: 1
-    ip: 10.10.10.51
+    ip: 10.10.10.102
     port: 51236
-  # 鏉$爜鎵弿浠�
-  barcode[1]:
-    id: 2
-    ip: 10.10.10.54
-    port: 51236
+
    # LED1
   led[0]:
     id: 1
-    ip: 10.10.10.51
+    ip: 10.10.10.241
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 100
-  # LED1
+    staArr: 102
+  # LED2
   led[1]:
     id: 2
-    ip: 10.10.10.52
+    ip: 10.10.10.242
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 300
+    staArr: 201
+
+  # 鍥涘悜绌挎杞�1
+  shuttle[0]:
+    id: 1
+    ip: 10.10.10.211
+    port: 502
+    rack: 0
+    slot: 0
+  # 鍥涘悜绌挎杞�2
+  shuttle[1]:
+    id: 2
+    ip: 10.10.10.221
+    port: 502
+    rack: 0
+    slot: 0
+  # 鎻愬崌鏈�1
+  lift[0]:
+    id: 1
+    ip: 10.10.10.231
+    port: 502
+    row: 18
+    bay: 2
+    sta[0]:
+      staNo: 105
+      lev: 1
+    sta[1]:
+      staNo: 106
+      lev: 2
+    sta[2]:
+      staNo: 107
+      lev: 3
+    sta[3]:
+      staNo: 108
+      lev: 4
\ No newline at end of file

--
Gitblit v1.9.1