From 95a1d28bddb07d7ee6aafc9921bfefd8a61e2600 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 16 十月 2024 09:27:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 4 --
src/main/java/com/zy/core/MainProcess.java | 2
src/main/webapp/static/js/common.js | 2
pom.xml | 2
src/main/resources/application.yml | 84 ++++++++++++++++++++++++++++++++++++-----
5 files changed, 76 insertions(+), 18 deletions(-)
diff --git a/pom.xml b/pom.xml
index ed7041e..7caccb3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,7 +185,7 @@
</dependencies>
<build>
- <finalName>yxwcs</finalName>
+ <finalName>hmasrs</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 53fecbb..c05f38f 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -14,8 +14,4 @@
@Transactional
public class MainServiceImpl {
- @Value("${wms.url}")
- private String wmsUrl;
-
-
}
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index c43a005..2703d47 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -55,7 +55,7 @@
continue;
}
- /************************************JAR璋冨害************************************/
+
} catch (Exception e) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index f081729..2619746 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -9,7 +9,7 @@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
# url: jdbc:sqlserver://10.10.10.201:1433;databasename=ahyxasrs
- url: jdbc:sqlserver://192.168.4.15:1433;databasename=ahyxasrs
+ url: jdbc:sqlserver://127.0.0.1:50948;databasename=gdhmasrs
username: sa
password: sa@123
mvc:
@@ -41,13 +41,6 @@
port: 502
rack: 0
slot: 0
-# # 杈撻�佺嚎
-# devp[1]:
-# id: 2
-# ip: 192.168.4.250
-# port: 102
-# rack: 0
-# slot: 0
# RGV绌挎杞�1
rgv[0]:
id: 1
@@ -56,6 +49,75 @@
rack: 0
slot: 0
demo: false
-
-wms:
- url: localhost:8080/yxwms
\ No newline at end of file
+ # RGV绌挎杞�1
+ rgv[1]:
+ id: 2
+ ip: 192.168.4.250
+ port: 502
+ rack: 0
+ slot: 0
+ demo: false
+ # RGV绌挎杞�1
+ rgv[2]:
+ id: 3
+ ip: 192.168.4.250
+ port: 502
+ rack: 0
+ slot: 0
+ demo: false
+ # RGV绌挎杞�1
+ rgv[3]:
+ id: 4
+ ip: 192.168.4.250
+ port: 502
+ rack: 0
+ slot: 0
+ demo: false
+ # RGV绌挎杞�1
+ rgv[4]:
+ id: 5
+ ip: 192.168.4.250
+ port: 502
+ rack: 0
+ slot: 0
+ demo: false
+ # RGV绌挎杞�1
+ rgv[5]:
+ id: 6
+ ip: 192.168.4.250
+ port: 502
+ rack: 0
+ slot: 0
+ demo: false
+ # RGV绌挎杞�1
+ rgv[6]:
+ id: 7
+ ip: 192.168.4.250
+ port: 502
+ rack: 0
+ slot: 0
+ demo: false
+ # RGV绌挎杞�1
+ rgv[7]:
+ id: 8
+ ip: 192.168.4.250
+ port: 502
+ rack: 0
+ slot: 0
+ demo: false
+ # RGV绌挎杞�1
+ rgv[8]:
+ id: 9
+ ip: 192.168.4.250
+ port: 502
+ rack: 0
+ slot: 0
+ demo: false
+ # RGV绌挎杞�1
+ rgv[9]:
+ id: 10
+ ip: 192.168.4.250
+ port: 502
+ rack: 0
+ slot: 0
+ demo: false
\ No newline at end of file
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 5cf7edb..a5dc4fc 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -1,4 +1,4 @@
-var baseUrl = "/yxwcs";
+var baseUrl = "/hmasrs";
// 璧嬪��
function setVal(el, val) {
--
Gitblit v1.9.1