From 58de9685304b936c32807b167af2271d987cc23d Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期四, 02 二月 2023 18:09:12 +0800
Subject: [PATCH] #

---
 src/main/resources/application.yml |  237 +++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 182 insertions(+), 55 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 7adeacd..015bf98 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,15 +1,17 @@
 server:
   port: 9090
+  servlet:
+    context-path: /@pom.build.finalName@
 
 spring:
   application:
-#    name: @pom.artifactId@
-    name:
+    name: @pom.build.finalName@
   datasource:
-    # sql-server
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    url: jdbc:sqlserver://127.0.0.1:1433;databasename=jsasrs
+    url: jdbc:sqlserver://10.10.10.100:1433;databasename=bfasrs
+#    url: jdbc:sqlserver://192.168.4.15:1433;databasename=bfasrs
     username: sa
+    #    password: Zoneyung@zy56$
     password: sa@123
   mvc:
     static-path-pattern: /**
@@ -21,11 +23,11 @@
 
 mybatis-plus:
   mapper-locations: classpath:mapper/*.xml
-  global-config:
-    field-strategy: 0
+#  global-config:
+#    field-strategy: 0
 
 logging:
-  path: /stock/out/logs
+  path: /stock/out/@pom.build.finalName@/logs
 
 super:
   pwd: xltys1995
@@ -33,75 +35,200 @@
 swagger:
   enable: false
 
+wms:
+  url: 10.10.10.200:8081/bfwms
+
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:
-  # 鍫嗗灈鏈�
+  # 鍙屾繁
+  doubleDeep: false
+  # 鍙屾繁搴撲綅鎺掑彿
+  doubleLocs: 1,4,5,8,9,12,13,16,17,20
+  # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
+  groupCount: 4
+  # 鍫嗗灈鏈�1
   crn[0]:
     id: 1
-    ip: 192.168.6.10
+    ip: 10.10.10.10
     port: 102
     rack: 0
-    slot: 2
+    slot: 0
+    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+    offset: 2
+    demo: false
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 5
-      row: 2
-      bay: 1
+      staNo: 107
+      row: 4
+      bay: 4
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 6
-      row: 1
-      bay: 1
+      staNo: 108
+      row: 4
+      bay: 5
       lev: 1
-  # 绔欑偣
-  devp[0]:
-    id: 1
-    ip: 192.168.1.125
+  # 鍫嗗灈鏈�2
+  crn[1]:
+    id: 2
+    ip: 10.10.10.20
     port: 102
     rack: 0
-    slot: 1
-    # 鍏ュ簱鍙�
+    slot: 0
+    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+    offset: 2
+    demo: false
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 111
+      row: 11
+      bay: 5
+      lev: 1
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[1]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 211
+      row: 12
+      bay: 5
+      lev: 1
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 104
+      row: 11
+      bay: 4
+      lev: 1
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[1]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 204
+      row: 12
+      bay: 4
+      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: 207
+      row: 18
+      bay: 4
+      lev: 1
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 208
+      row: 18
+      bay: 5
+      lev: 1
+  # 绌挎杞�1
+  ste[0]:
+    id: 1
+    ip: 10.10.10.40
+    port: 502
+    rack: 0
+    slot: 0
+  # 绌挎杞�2
+  ste[1]:
+    id: 2
+    ip: 10.10.10.41
+    port: 502
+    rack: 0
+    slot: 0
+  # 绌挎杞�3
+  ste[2]:
+    id: 3
+    ip: 10.10.10.42
+    port: 502
+    rack: 0
+    slot: 0
+  # 杈撻�佺嚎
+  devp[0]:
+    id: 1
+    ip: 10.10.10.61
+    port: 102
+    rack: 0
+    slot: 0
+    # 鍏ュ簱鍙�1
     inSta[0]:
-      staNo: 2
+      staNo: 103
       barcode: ${wcs-slave.barcode[0].id}
-    # 鍑哄簱鍙�
+      backSta: 100
+      led: ${wcs-slave.led[0].id}
+    # 鍏ュ簱鍙�1
+    inSta[1]:
+      staNo: 203
+      barcode: ${wcs-slave.barcode[1].id}
+      backSta: 200
+      led: ${wcs-slave.led[2].id}
+    # 绌烘澘鍏ュ簱鍙�1
+    emptyInSta[0]:
+      staNo: 103
+      barcode: ${wcs-slave.barcode[0].id}
+    # 绌烘澘鍏ュ簱鍙�1
+    emptyInSta[1]:
+      staNo: 203
+      barcode: ${wcs-slave.barcode[1].id}
+    # 鍑哄簱鍙�1
     outSta[0]:
-      staNo: 6
-    # 鎷f枡鍏ュ簱鍙�
-    pickSta[0]:
-      staNo: 2
+      staNo: 100
+    # 鍑哄簱鍙�2
+    outSta[1]:
+      staNo: 200
+    # 鎷f枡鍑哄簱鍙�
+    pickOutSta[0]:
+      staNo: 300
+    # 鎷f枡鍑哄簱鍙�
+    pickInSta[0]:
+      staNo: 103
+      barcode: ${wcs-slave.barcode[0].id}
+      backSta: 100
+      led: ${wcs-slave.led[0].id}
+    # 鎷f枡鍑哄簱鍙�
+    pickInSta[1]:
+      staNo: 203
+      barcode: ${wcs-slave.barcode[1].id}
+      backSta: 200
+      led: ${wcs-slave.led[2].id}
   # 鏉$爜鎵弿浠�
   barcode[0]:
     id: 1
-    ip: 192.168.1.1
-    port: 8888
-  # LED
+    ip: 10.10.10.52
+    port: 51236
+  # 鏉$爜鎵弿浠�
+  barcode[1]:
+    id: 2
+    ip: 10.10.10.53
+    port: 51236
+   # LED1
   led[0]:
     id: 1
-    ip: 192.168.1.1
-    port: 8888
-  # 纾呯О
-  scale[0]:
-    id: 1
-    ip: 192.168.1.1
-    port: 8888
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+    ip: 10.10.10.205
+    port: 5005
+    devpPlcId: ${wcs-slave.devp[0].id}
+    staArr: 100
+  # LED1
+  led[1]:
+    id: 2
+    ip: 10.10.10.206
+    port: 5005
+    devpPlcId: ${wcs-slave.devp[0].id}
+    staArr: 300
+  # LED1
+  led[2]:
+    id: 3
+    ip: 10.10.10.207
+    port: 5005
+    devpPlcId: ${wcs-slave.devp[0].id}
+    staArr: 200

--
Gitblit v1.9.1