From 44c14fe845ea66e64e2bb3e8bcd172f4a0840747 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 30 一月 2026 19:07:14 +0800
Subject: [PATCH] pda组托搜索按编号和名称查询
---
src/main/resources/application-dev.yml | 50 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 45 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index ffa0b84..ef583c1 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,5 +1,5 @@
server:
- port: 8080
+ port: 8089
servlet:
context-path: /@pom.build.finalName@
@@ -11,8 +11,11 @@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
username: sa
- password: Skyouc#23
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=jsxswms
+ password: sa@123
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=jgwms
+# username: sa
+# password: Skyouc#23
+# url: jdbc:sqlserver://192.168.4.24:1433;databasename=jsxswms
mvc:
static-path-pattern: /**
redis:
@@ -47,7 +50,7 @@
#License鐩稿叧閰嶇疆
license:
- subject: integrationasrs
+ subject: jgasrs
publicAlias: publicCert
storePass: public_zhongyang_123456789
licensePath: license.lic
@@ -109,4 +112,41 @@
acctID: "647e849ab6fa0f"
username: "llw"
password: "666666"
- lcid: 2052
\ No newline at end of file
+ lcid: 2052
+
+#鍒嗗簱閰嶇疆
+wms:
+ #褰撳墠鏄鍑犲簱
+ currentId: 2
+ #褰撳墠搴撳悕绉�
+ currentName: 鍔犲伐搴�
+ #绔嬪簱AGV鑷姩杩愯揣鍑哄簱鍙ｇ紪鐮� 渚ч潰濂ユ櫘鐟炴柉浜х嚎鍑哄叆搴撳彛
+ wmsTransStartStation1: 205
+ #绔嬪簱AGV鑷姩杩愯揣鍏ュ簱鍙ｇ紪鐮侊紙杈撻�佺嚎锛�
+ wmsTransStartStation2: 202
+ #绔嬪簱AGV鑷姩杩愯揣鍑哄簱鍙ｇ紪鐮侊紙杈撻�佺嚎锛�
+ wmsTransStartStation3: 204
+ #鎵樼洏鐗╂枡鍙�
+ zpalletId: tuopan
+ #鏈夎揣鎵樼洏 pda鎵樼洏鍥炲簱鐢�
+ loadedPallet: loadedPallet
+
+#mes瀵规帴
+mes:
+# url: http://172.26.11.250/dev-api/basicmodel/Api/WMS/
+ url: http://192.9.100.173:8088/prod-api/basicmodel/Api/WMS/
+ #榛樿鎺ュ彛鎿嶄綔浜哄憳id
+ defaultUserId: 30
+
+#娴峰悍瀵规帴
+hik:
+ url: http://172.26.11.98:80/rcs/rtas/
+
+#鍗庢檽瀵规帴
+hx:
+ url: http://127.0.0.1:8089/hx/
+
+#wcs鍦板潃
+wcs:
+ url: http://127.0.0.1:9090/jgwcs
+
--
Gitblit v1.9.1