From ba1c668970f02bcad86561a69aca62490ae8fa33 Mon Sep 17 00:00:00 2001
From: lfdMem <1>
Date: 星期一, 28 四月 2025 15:32:49 +0800
Subject: [PATCH] *

---
 src/main/resources/application.yml |  126 +++++++++++-------------------------------
 1 files changed, 33 insertions(+), 93 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index eed7e75..99628ad 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,11 +8,8 @@
     name: @pom.build.finalName@
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    #    url: jdbc:sqlserver://47.97.1.152:51433;databasename=xgmasrs
-    #    username: sa
-    #    password: Zoneyung@zy56$
-    url: jdbc:sqlserver://192.168.4.15:1433;databasename=xgmasrs
-#    url: jdbc:sqlserver://localhost:1433;databasename=xgmasrs
+#    url: jdbc:sqlserver://127.0.0.1:1433;databasename=lfdasrsMem
+    url: jdbc:sqlserver://192.168.0.17:1433;databasename=lfdasrsMem
     username: sa
     password: sa@123
   mvc:
@@ -38,48 +35,23 @@
   enable: false
 
 wms:
-  url: localhost:8080/xgmwms
-#  url: localhost:8082/xgmwms
-
-#鍫嗗灈鏈烘病鏈夋墽琛屼腑浠诲姟锛岃緭閫佹湁鍏ュ簱浠诲姟锛屽彨鍥炲師鐐�
-crnBackHp:
-  enable: false
+  url: 127.0.0.1:8080/wms
 
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:
   # 鍙屾繁
   doubleDeep: true
   # 鍙屾繁搴撲綅鎺掑彿
-  doubleLocs: 1,4,5,8,9,12
+  doubleLocs: 31,34
   # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
   groupCount: 4
   # 鍫嗗灈鏈�1
   crn[0]:
     id: 1
-    ip: 10.10.10.10
-    port: 8888
-    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=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: 2
-    ip: 10.10.10.13
-    port: 8888
+    ip: 10.10.11.7
+    port: 6000
+    rack: 0
+    slot: 0
     # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
     offset: 2
     demo: false
@@ -87,87 +59,55 @@
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
       staNo: 102
-      row: 6
+      row: 33
       bay: 1
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 103
-      row: 7
+      staNo: 102
+      row: 33
       bay: 1
       lev: 1
-  # 鍫嗗灈鏈�3
-  crn[2]:
-    id: 3
-    ip: 10.10.10.16
-    port: 8888
-    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    offset: 2
-    demo: false
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 104
-      row: 10
-      bay: 1
-      lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 105
-      row: 11
-      bay: 1
-      lev: 1
-
-  # 杈撻�佺嚎
+  # 杈撻�佺嚎1
   devp[0]:
     id: 1
-    ip: 10.10.10.50
+    ip: 10.10.11.10
     port: 102
     rack: 0
     slot: 0
     # 鍏ュ簱鍙�1
     inSta[0]:
-      staNo: 176
+      staNo: 102
       barcode: ${wcs-slave.barcode[0].id}
-    # 鍏ュ簱鍙�2
-    inSta[1]:
-      staNo: 180
-      barcode: ${wcs-slave.barcode[1].id}
+      backSta: 101
+      led: ${wcs-slave.led[0].id}
     # 绌烘澘鍏ュ簱鍙�1
     emptyInSta[0]:
-      staNo: 176
+      staNo: 102
+      barcode: ${wcs-slave.barcode[0].id}
+      backSta: 101
+      led: ${wcs-slave.led[0].id}
+    # 鎷f枡鍏ュ簱鍙�1
+    pickSta[0]:
+      staNo: 102
+      barcode: ${wcs-slave.barcode[0].id}
+      backSta: 101
+      led: ${wcs-slave.led[0].id}
+
     # 鍑哄簱鍙�1
     outSta[0]:
-      staNo: 173
-    # 鍑哄簱鍙�2
-    outSta[1]:
-      staNo: 182
-    # 鎷f枡鍏ュ簱鍙�
-    pickSta[0]:
-      staNo: 176
-      barcode: ${wcs-slave.barcode[0].id}
-  # 鏉$爜鎵弿浠�
+      staNo: 102
+      led: ${wcs-slave.led[0].id}
+  # 鏉$爜鎵弿浠�1
   barcode[0]:
     id: 1
-    ip: 10.10.10.52
-    port: 51236
-  barcode[1]:
-    id: 2
-    ip: 10.10.10.53
+    ip: 10.10.10.121
     port: 51236
    # LED1
   led[0]:
     id: 1
-    ip: 10.10.10.60
+    ip: 10.10.11.210
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 172
-  # LED2
-  led[1]:
-    id: 2
-    ip: 10.10.10.61
-    port: 5005
-    devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 182
+    staArr: 102
\ No newline at end of file

--
Gitblit v1.9.1