From f778d39fbbb49efe4dd0aaa0b2f89ed7fa3d5ea6 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期三, 02 八月 2023 15:37:05 +0800
Subject: [PATCH] #

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

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 3c300fe..596e80a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,18 +1,14 @@
 server:
   port: 9090
   servlet:
-    context-path: /gdwcs
+    context-path: /@pom.build.finalName@
 
 spring:
   application:
-    name: gdwcs
+    name: @pom.build.finalName@
   datasource:
-    # sql-server
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    #url: jdbc:sqlserver://192.168.3.99:1433;databasename=gdasrs
-    #username: sa
-    #password: eisoft
-    url: jdbc:sqlserver://localhost:1433;databasename=gdasrs
+    url: jdbc:sqlserver://127.0.0.1:1433;databasename=jxfyasrs
     username: sa
     password: sa@123
   mvc:
@@ -29,7 +25,7 @@
 #    field-strategy: 0
 
 logging:
-  path: /stock/out/wcs/logs
+  path: /stock/out/@pom.build.finalName@/logs
 
 super:
   pwd: xltys1995
@@ -37,118 +33,112 @@
 swagger:
   enable: false
 
+wms:
+  url: 127.0.0.1:8081/fywms
+
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:
+  # 鍙屾繁
+  doubleDeep: true
+  # 鍙屾繁搴撲綅鎺掑彿
+  doubleLocs: 3
+  # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
+  groupCount: 3
   # 鍫嗗灈鏈�1
   crn[0]:
     id: 1
-    ip: 192.168.10.39
-    port: 5015
+    ip: 10.10.10.100
+    port: 102
     rack: 0
     slot: 0
     # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
     offset: 2
+    demo: false
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 4
-      row: 2
+      staNo: 111
+      row: 1
       bay: 1
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 2
-      row: 1
+      staNo: 109
+      row: 2
       bay: 1
       lev: 1
-    # 鍫嗗灈鏈�2
+  # 鍫嗗灈鏈�2
   crn[1]:
     id: 2
-    ip: 192.168.10.40
-    port: 5016
+    ip: 10.10.10.110
+    port: 102
     rack: 0
     slot: 0
-    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=0
+    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
     offset: 2
+    demo: false
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 8
+      staNo: 107
       row: 4
       bay: 1
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 6
-      row: 3
-      bay: 1
+      staNo: 102
+      row: 5
+      bay: 2
       lev: 1
-  # 杈撻�佺嚎
+
+  # 杈撻�佺嚎1
   devp[0]:
     id: 1
-    ip: 192.168.10.65
-    port: 6000
+    ip: 10.10.10.120
+    port: 102
     rack: 0
-    slot: 1
+    slot: 0
     # 鍏ュ簱鍙�1
     inSta[0]:
-      staNo: 3
+      staNo: 101
       barcode: ${wcs-slave.barcode[0].id}
-    # 鍏ュ簱鍙�2
-    inSta[1]:
-      staNo: 7
-      barcode: ${wcs-slave.barcode[0].id}
+      backSta: 1
+      led: ${wcs-slave.led[0].id}
     # 绌烘澘鍏ュ簱鍙�1
     emptyInSta[0]:
-      staNo: 3
-    # 绌烘澘鍏ュ簱鍙�2
-    emptyInSta[1]:
-      staNo: 7
+      staNo: 101
+      barcode: ${wcs-slave.barcode[0].id}
+      backSta: 1
+      led: ${wcs-slave.led[0].id}
+    # 鎷f枡鍏ュ簱鍙�1
+    pickSta[0]:
+      staNo: 101
+      barcode: ${wcs-slave.barcode[0].id}
+      led: ${wcs-slave.led[0].id}
     # 鍑哄簱鍙�1
     outSta[0]:
-      staNo: 1
-    # 鍑哄簱鍙�2
-    outSta[1]:
-      staNo: 5
-    # 鎷f枡鍏ュ簱鍙�
-    pickSta[0]:
-      staNo: 2
-  # 鏉$爜鎵弿浠�
+      staNo: 105
+      led: ${wcs-slave.led[1].id}
+
+  # 鏉$爜鎵弿浠�1
   barcode[0]:
     id: 1
-    ip: 192.168.10.150
+    ip: 10.10.10.121
     port: 51236
-  # LED1
+
+   # LED1
   led[0]:
     id: 1
-    ip: 192.168.10.61
+    ip: 10.10.10.249
     port: 5005
+    devpPlcId: ${wcs-slave.devp[0].id}
+    staArr: 2
   # LED2
   led[1]:
     id: 2
-    ip: 192.168.10.62
+    ip: 10.10.10.248
     port: 5005
-  # 纾呯О
-  scale[0]:
-    id: 1
-    ip: 192.168.10.152
-    port: 8888
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+    devpPlcId: ${wcs-slave.devp[0].id}
+    staArr: 11
\ No newline at end of file

--
Gitblit v1.9.1