From af6719cb98ccc72200778e0d45437c7682aa056e Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 22 十月 2024 13:34:30 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/SiteController.java | 3 ++-
src/main/resources/application.yml | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index 70974ca..aa555ad 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -182,7 +182,8 @@
staProtocol.setStaNo(staNo);
}
if (pakMk != null) {
- staProtocol.setPakMk(pakMk.equals("Y"));
+// staProtocol.setPakMk(pakMk.equals("Y"));
+ devpThread.setPakMk(staProtocol.getSiteId(), pakMk.equals("Y"));
}
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
if (result) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 6f3a73b..cd66754 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://localhost:1433;databasename=jxgtasrs
+ url: jdbc:sqlserver://10.0.100.130:1433;databasename=jxgtasrs
username: sa
password: sa@123
mvc:
@@ -34,7 +34,7 @@
enable: false
wms:
- url: 127.0.0.1:8080/wms
+ url: 10.0.100.130:8080/wms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
--
Gitblit v1.9.1