From c471b38363268108200e6c88c87fc219d17eb17f Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 26 十一月 2024 13:13:58 +0800
Subject: [PATCH] 项目搭建完成

---
 src/main/resources/application.yml |  184 ++++++++++++++++++++++++++-------------------
 1 files changed, 106 insertions(+), 78 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index cbcd062..68edfc1 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -7,9 +7,8 @@
   application:
     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://127.0.0.1:1433;databasename=jsjasrs
     username: sa
     password: sa@123
   mvc:
@@ -26,7 +25,7 @@
 #    field-strategy: 0
 
 logging:
-  path: /stock/out/logs
+  path: /stock/out/@pom.build.finalName@/logs
 
 super:
   pwd: xltys1995
@@ -34,113 +33,142 @@
 swagger:
   enable: false
 
+wms:
+  url: 127.0.0.1:8080/jsjwms
+
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:
+  # 鍙屾繁
+  doubleDeep: true
+  # 鍙屾繁搴撲綅鎺掑彿
+  doubleLocs: 1,4,5,8
+  # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
+  groupCount: 4
+
   # 鍫嗗灈鏈�1
   crn[0]:
     id: 1
-    ip: 192.168.3.39
-    port: 5015
+    ip: 10.10.10.1
+    port: 102
     rack: 0
     slot: 0
     # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
     offset: 2
+    demo: false
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 4
-      row: 2
-      bay: 1
-      lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 2
-      row: 1
-      bay: 1
-      lev: 1
-    # 鍫嗗灈鏈�2
-  crn[1]:
-    id: 2
-    ip: 192.168.3.40
-    port: 5016
-    rack: 0
-    slot: 0
-    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=0
-    offset: 2
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 8
-      row: 4
-      bay: 1
-      lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 6
+      staNo: 103
       row: 3
       bay: 1
       lev: 1
-  # 杈撻�佺嚎
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 101
+      row: 2
+      bay: 1
+      lev: 1
+  # 鍫嗗灈鏈�2
+  crn[1]:
+    id: 2
+    ip: 10.10.10.10
+    port: 102
+    rack: 0
+    slot: 0
+    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+    offset: 2
+    demo: false
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 105
+      row: 6
+      bay: 1
+      lev: 1
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 107
+      row: 7
+      bay: 1
+      lev: 1
+
+  # 杈撻�佺嚎1
   devp[0]:
     id: 1
-    ip: 192.168.3.65
-    port: 6000
+    ip: 10.10.10.18
+    port: 102
     rack: 0
-    slot: 1
+    slot: 0
     # 鍏ュ簱鍙�1
     inSta[0]:
-      staNo: 3
+      staNo: 103
       barcode: ${wcs-slave.barcode[0].id}
+      backSta: 102
+      led: ${wcs-slave.led[1].id}
     # 鍏ュ簱鍙�2
     inSta[1]:
-      staNo: 7
-      barcode: ${wcs-slave.barcode[0].id}
+      staNo: 105
+      barcode: ${wcs-slave.barcode[1].id}
+      backSta: 104
+      led: ${wcs-slave.led[2].id}
     # 绌烘澘鍏ュ簱鍙�1
     emptyInSta[0]:
-      staNo: 3
-    # 绌烘澘鍏ュ簱鍙�2
+      staNo: 103
+      barcode: ${wcs-slave.barcode[0].id}
+      backSta: 102
+      led: ${wcs-slave.led[1].id}
     emptyInSta[1]:
-      staNo: 7
+      staNo: 105
+      barcode: ${wcs-slave.barcode[1].id}
+      backSta: 104
+      led: ${wcs-slave.led[2].id}
     # 鍑哄簱鍙�1
     outSta[0]:
-      staNo: 1
+      staNo: 100
+      led: ${wcs-slave.led[0].id}
     # 鍑哄簱鍙�2
     outSta[1]:
-      staNo: 5
-    # 鎷f枡鍏ュ簱鍙�
-    pickSta[0]:
-      staNo: 2
-  # 鏉$爜鎵弿浠�
+      staNo: 106
+      led: ${wcs-slave.led[3].id}
+
+  # 鏉$爜鎵弿浠�1
   barcode[0]:
     id: 1
-    ip: 192.168.2.150
+    ip: 10.10.10.121
     port: 51236
-  # LED
+  # 鏉$爜鎵弿浠�2
+  barcode[1]:
+    id: 2
+    ip: 10.10.10.122
+    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.190
+    port: 5005
+    devpPlcId: ${wcs-slave.devp[0].id}
+    staArr: 100
+  # LED2
+  led[1]:
+    id: 2
+    ip: 10.10.10.191
+    port: 5005
+    devpPlcId: ${wcs-slave.devp[0].id}
+    staArr: 102,103
+  # LED3
+  led[2]:
+    id: 3
+    ip: 10.10.10.192
+    port: 5005
+    devpPlcId: ${wcs-slave.devp[0].id}
+    staArr: 104,105
+  # LED4
+  led[3]:
+    id: 4
+    ip: 10.10.10.192
+    port: 5005
+    devpPlcId: ${wcs-slave.devp[0].id}
+    staArr: 106
\ No newline at end of file

--
Gitblit v1.9.1