From e9cdecd287c7ab88ae4b4ad28a9f9343ed9ae23f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 08 九月 2022 13:38:26 +0800
Subject: [PATCH] #

---
 src/main/resources/application.yml |  186 +++++++++++++++++++++++++++++++---------------
 1 files changed, 125 insertions(+), 61 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 7adeacd..2d2c6e2 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://47.97.1.152:51433;databasename=bfasrs
+    url: jdbc:sqlserver://localhost: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,137 @@
 swagger:
   enable: false
 
+wms:
+  url: localhost:8081/bfmwms
+
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:
-  # 鍫嗗灈鏈�
-  crn[0]:
+  # 鍙屾繁
+  doubleDeep: false
+  # 鍙屾繁搴撲綅鎺掑彿
+  doubleLocs: 1,4,5,8,9,12,13,16,17,20
+  # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
+  groupCount: 4
+  # 鍫嗗灈鏈�1
+#  crn[0]:
+#    id: 1
+#    ip: 10.10.10.10
+#    port: 102
+#    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+#    offset: 2
+#    demo: false
+#    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+#    crnInStn[0]:
+#      devpPlcId: ${wcs-slave.devp[0].id}
+#      staNo: 100
+#      row: 2
+#      bay: 1
+#      lev: 1
+#    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+#    crnOutStn[0]:
+#      devpPlcId: ${wcs-slave.devp[0].id}
+#      staNo: 101
+#      row: 3
+#      bay: 1
+#      lev: 1
+#  # 鍫嗗灈鏈�2
+#  crn[1]:
+#    id: 1
+#    ip: 10.10.10.20
+#    port: 102
+#    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+#    offset: 2
+#    demo: false
+#    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+#    crnInStn[0]:
+#      devpPlcId: ${wcs-slave.devp[0].id}
+#      staNo: 100
+#      row: 2
+#      bay: 1
+#      lev: 1
+#    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+#    crnOutStn[0]:
+#      devpPlcId: ${wcs-slave.devp[0].id}
+#      staNo: 101
+#      row: 3
+#      bay: 1
+#      lev: 1
+#  # 鍫嗗灈鏈�3
+#  crn[2]:
+#    id: 1
+#    ip: 10.10.10.30
+#    port: 102
+#    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+#    offset: 2
+#    demo: false
+#    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+#    crnInStn[0]:
+#      devpPlcId: ${wcs-slave.devp[0].id}
+#      staNo: 100
+#      row: 2
+#      bay: 1
+#      lev: 1
+#    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+#    crnOutStn[0]:
+#      devpPlcId: ${wcs-slave.devp[0].id}
+#      staNo: 101
+#      row: 3
+#      bay: 1
+#      lev: 1
+  # 绌挎杞�1
+  ste[0]:
     id: 1
-    ip: 192.168.6.10
-    port: 102
+    ip: 10.10.10.40
+    port: 502
     rack: 0
-    slot: 2
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 5
-      row: 2
-      bay: 1
-      lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 6
-      row: 1
-      bay: 1
-      lev: 1
-  # 绔欑偣
+    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: 192.168.1.125
+    ip: 10.10.10.61
     port: 102
     rack: 0
-    slot: 1
-    # 鍏ュ簱鍙�
+    slot: 0
+    # 鍏ュ簱鍙�1
     inSta[0]:
-      staNo: 2
+      staNo: 176
       barcode: ${wcs-slave.barcode[0].id}
-    # 鍑哄簱鍙�
+    # 绌烘澘鍏ュ簱鍙�1
+    emptyInSta[0]:
+      staNo: 176
+    # 鍑哄簱鍙�1
     outSta[0]:
-      staNo: 6
+      staNo: 173
+    # 鍑哄簱鍙�2
+    outSta[1]:
+      staNo: 182
     # 鎷f枡鍏ュ簱鍙�
     pickSta[0]:
-      staNo: 2
+      staNo: 176
+      barcode: ${wcs-slave.barcode[0].id}
   # 鏉$爜鎵弿浠�
   barcode[0]:
     id: 1
-    ip: 192.168.1.1
-    port: 8888
-  # LED
+    ip: 10.10.10.52
+    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.60
+    port: 5005
+    devpPlcId: ${wcs-slave.devp[0].id}
+    staArr: 173

--
Gitblit v1.9.1