From 96868c07fba2beda4a33d4789abe43e01bafc61b Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期一, 26 九月 2022 14:34:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitbit/gzynwcs' into gzynwcs
---
src/main/webapp/static/images/barcode.png | 0
src/main/webapp/static/images/zy-logo.png | 0
src/main/webapp/views/console-old.html | 2 +-
src/main/webapp/views/console.html | 2 +-
src/main/webapp/views/index.html | 2 +-
src/main/webapp/views/monitor/monitor0.html | 2 +-
src/main/java/com/zy/asrs/domain/enums/PackStatusType.java | 6 +++++-
src/main/webapp/views/monitor/monitor.html | 2 +-
pom.xml | 22 +++++++++++-----------
src/main/java/com/zy/asrs/entity/LocMast.java | 4 +++-
src/main/webapp/views/control.html | 2 +-
src/main/resources/application.yml | 6 +++---
12 files changed, 28 insertions(+), 22 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2a93012..4af576b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,77 +110,77 @@
<artifactId>5m3</artifactId>
<scope>system</scope>
<version>0.5.0</version>
- <systemPath>${project.basedir}/src/main/resources/lib/bx05-0.5.0-SNAPSHOT.jar</systemPath>
+ <systemPath>${pom.basedir}/src/main/resources/lib/bx05-0.5.0-SNAPSHOT.jar</systemPath>
</dependency>
<dependency>
<groupId>com.wcs.led</groupId>
<artifactId>5m3message</artifactId>
<scope>system</scope>
<version>0.5.0</version>
- <systemPath>${project.basedir}/src/main/resources/lib/bx05.message-0.5.0-SNAPSHOT.jar</systemPath>
+ <systemPath>${pom.basedir}/src/main/resources/lib/bx05.message-0.5.0-SNAPSHOT.jar</systemPath>
</dependency>
<dependency>
<groupId>com.wcs.led</groupId>
<artifactId>5m3doc</artifactId>
<scope>system</scope>
<version>0.5.0</version>
- <systemPath>${project.basedir}/src/main/resources/lib/bx05-0.5.0-SNAPSHOT-javadoc.jar</systemPath>
+ <systemPath>${pom.basedir}/src/main/resources/lib/bx05-0.5.0-SNAPSHOT-javadoc.jar</systemPath>
</dependency>
<dependency>
<groupId>com.wcs.led</groupId>
<artifactId>rxtx</artifactId>
<scope>system</scope>
<version>2.1.7</version>
- <systemPath>${project.basedir}/src/main/resources/lib/rxtx-2.1.7.jar</systemPath>
+ <systemPath>${pom.basedir}/src/main/resources/lib/rxtx-2.1.7.jar</systemPath>
</dependency>
<dependency>
<groupId>com.wcs.led</groupId>
<artifactId>simple-xml</artifactId>
<scope>system</scope>
<version>2.7.1</version>
- <systemPath>${project.basedir}/src/main/resources/lib/simple-xml-2.7.1.jar</systemPath>
+ <systemPath>${pom.basedir}/src/main/resources/lib/simple-xml-2.7.1.jar</systemPath>
</dependency>
<dependency>
<groupId>com.wcs.led</groupId>
<artifactId>stax</artifactId>
<scope>system</scope>
<version>1.2.0</version>
- <systemPath>${project.basedir}/src/main/resources/lib/stax-1.2.0.jar</systemPath>
+ <systemPath>${pom.basedir}/src/main/resources/lib/stax-1.2.0.jar</systemPath>
</dependency>
<dependency>
<groupId>com.wcs.led</groupId>
<artifactId>stax-api</artifactId>
<scope>system</scope>
<version>1.0.1</version>
- <systemPath>${project.basedir}/src/main/resources/lib/stax-api-1.0.1.jar</systemPath>
+ <systemPath>${pom.basedir}/src/main/resources/lib/stax-api-1.0.1.jar</systemPath>
</dependency>
<dependency>
<groupId>com.wcs.led</groupId>
<artifactId>uia-comm</artifactId>
<scope>system</scope>
<version>0.5.1</version>
- <systemPath>${project.basedir}/src/main/resources/lib/uia-comm-0.5.1.jar</systemPath>
+ <systemPath>${pom.basedir}/src/main/resources/lib/uia-comm-0.5.1.jar</systemPath>
</dependency>
<dependency>
<groupId>com.wcs.led</groupId>
<artifactId>uia-message</artifactId>
<scope>system</scope>
<version>0.6.0</version>
- <systemPath>${project.basedir}/src/main/resources/lib/uia-message-0.6.0.jar</systemPath>
+ <systemPath>${pom.basedir}/src/main/resources/lib/uia-message-0.6.0.jar</systemPath>
</dependency>
<dependency>
<groupId>com.wcs.led</groupId>
<artifactId>uia-utils</artifactId>
<scope>system</scope>
<version>0.2.0</version>
- <systemPath>${project.basedir}/src/main/resources/lib/uia-utils-0.2.0.jar</systemPath>
+ <systemPath>${pom.basedir}/src/main/resources/lib/uia-utils-0.2.0.jar</systemPath>
</dependency>
<dependency>
<groupId>com.wcs.led</groupId>
<artifactId>xpp3</artifactId>
<scope>system</scope>
<version>1.1.3.3</version>
- <systemPath>${project.basedir}/src/main/resources/lib/xpp3-1.1.3.3.jar</systemPath>
+ <systemPath>${pom.basedir}/src/main/resources/lib/xpp3-1.1.3.3.jar</systemPath>
</dependency>
</dependencies>
diff --git a/src/main/java/com/zy/asrs/domain/enums/PackStatusType.java b/src/main/java/com/zy/asrs/domain/enums/PackStatusType.java
index 3b7b9ed..ccde3c2 100644
--- a/src/main/java/com/zy/asrs/domain/enums/PackStatusType.java
+++ b/src/main/java/com/zy/asrs/domain/enums/PackStatusType.java
@@ -12,6 +12,8 @@
LOC_WAIT_TESTINT("鍦ㄥ簱寰呮祴"),
// 鍦ㄥ簱娴嬭瘯涓�
LOC_TESTING("鍦ㄥ簱娴嬭瘯涓�"),
+ // 娴嬭瘯瀹屾垚
+ LOC_TESTEND("娴嬭瘯瀹屾垚"),
// 鍦ㄥ簱闈欑疆涓�
LOC_STAY("鍦ㄥ簱闈欑疆涓�"),
// 闈欑疆瀹屾垚
@@ -38,8 +40,10 @@
} else if (packStatus == 2){
return LOC_TESTING;
} else if (packStatus == 3){
- return LOC_STAY;
+ return LOC_TESTEND;
} else if (packStatus == 4){
+ return LOC_STAY;
+ } else if (packStatus == 5){
return LOC_STAY_OVER;
}
} else if (locSts.equals("O") || locSts.equals("S")){
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 33aa00c..2a220ef 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -312,8 +312,10 @@
case 2:
return "娴嬭瘯涓�";
case 3:
- return "闈欑疆涓�";
+ return "娴嬭瘯瀹屾垚";
case 4:
+ return "闈欑疆涓�";
+ case 5:
return "闈欑疆瀹屾垚";
default:
return String.valueOf(this.packStatus);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 9392b07..c7f23af 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://192.168.4.15:1433;databasename=gzynasrs
+ url: jdbc:sqlserver://localhost:1433;databasename=gzynasrs
username: sa
password: sa@123
mvc:
@@ -34,7 +34,7 @@
enable: false
wms:
- url: localhost:8080/klswms
+ url: localhost:8081/ynwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
@@ -90,7 +90,7 @@
# 杈撻�佺嚎
devp[0]:
id: 1
- ip: 10.10.10.50
+ ip: 192.168.4.250
port: 102
rack: 0
slot: 0
diff --git a/src/main/webapp/static/images/barcode.png b/src/main/webapp/static/images/barcode.png
index 59be12c..2fb4928 100644
--- a/src/main/webapp/static/images/barcode.png
+++ b/src/main/webapp/static/images/barcode.png
Binary files differ
diff --git a/src/main/webapp/static/images/zy-logo.png b/src/main/webapp/static/images/zy-logo.png
index 4865504..2fb4928 100644
--- a/src/main/webapp/static/images/zy-logo.png
+++ b/src/main/webapp/static/images/zy-logo.png
Binary files differ
diff --git a/src/main/webapp/views/console-old.html b/src/main/webapp/views/console-old.html
index e6f6ac4..a9ba04d 100644
--- a/src/main/webapp/views/console-old.html
+++ b/src/main/webapp/views/console-old.html
@@ -22,7 +22,7 @@
<h6>AUTOMATIC WAREHOUSE WCS MONITORING DIAGRAM</h6>
</div>
<div class="head-right">
- <img src="../static/images/zy-logo.png" alt="涓壃" height="44" width="80">
+ <img src="../static/images/zy-logo.png" alt="wcs" height="44" width="80">
</div>
</div>
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 7960bd0..4a5d9fe 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -22,7 +22,7 @@
<h6>AUTOMATIC WAREHOUSE WCS MONITORING DIAGRAM</h6>
</div>
<div class="head-right">
- <img src="../static/images/zy-logo.png" alt="涓壃" height="44" width="80">
+ <img src="../static/images/zy-logo.png" alt="wcs" height="44" width="80">
</div>
</div>
<!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 -->
diff --git a/src/main/webapp/views/control.html b/src/main/webapp/views/control.html
index 54f5a17..928fba0 100644
--- a/src/main/webapp/views/control.html
+++ b/src/main/webapp/views/control.html
@@ -84,7 +84,7 @@
</main>
<footer class="footer">
- Copyright 漏 2015 All Rights Reserved. <a href="http://www.zoneyung.com" target="_blank">娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙�</a> 淇濈暀鎵�鏈夋潈鍒�
+ Copyright 漏 2022 All Rights Reserved. <a href="http://www.zoneyung.com" target="_blank">绔嬪簱wcs鎿嶄綔骞冲彴</a>
</footer>
</body>
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index 6b47357..f503cdc 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -26,7 +26,7 @@
<!-- 涓讳綋鍐呭 -->
<iframe id="content" src="console.html"></iframe>
<footer class="footer">
- Copyright 漏 2015 All Rights Reserved. <a href="http://www.zoneyung.com" target="_blank">娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙�</a> 淇濈暀鎵�鏈夋潈鍒�
+ Copyright 漏 2022 All Rights Reserved. <a href="http://www.zoneyung.com" target="_blank">绔嬪簱wcs鎿嶄綔骞冲彴</a>
</footer>
</body>
<script>
diff --git a/src/main/webapp/views/monitor/monitor.html b/src/main/webapp/views/monitor/monitor.html
index a2d8d81..fd1fdf2 100644
--- a/src/main/webapp/views/monitor/monitor.html
+++ b/src/main/webapp/views/monitor/monitor.html
@@ -186,7 +186,7 @@
<div class="image-border image-border2"></div>
<div class="image-border image-border3"></div>
<div class="image-border image-border4"></div>
- <span>娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙�</span>
+ <span>绔嬪簱wcs鎿嶄綔骞冲彴</span>
<img src="../../static/image/barcode.png">
</div>
</div>
diff --git a/src/main/webapp/views/monitor/monitor0.html b/src/main/webapp/views/monitor/monitor0.html
index b20982a..3f2ef58 100644
--- a/src/main/webapp/views/monitor/monitor0.html
+++ b/src/main/webapp/views/monitor/monitor0.html
@@ -164,7 +164,7 @@
<div class="image-border image-border2"></div>
<div class="image-border image-border3"></div>
<div class="image-border image-border4"></div>
- <span>娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙�</span>
+ <span>绔嬪簱wcs鎿嶄綔骞冲彴</span>
<img src="../../static/image/barcode.png">
</div>
</div>
--
Gitblit v1.9.1