From e22cafd7f7ce99f5faccffb61ba8280e81fd3015 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期四, 18 一月 2024 11:04:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/model/MatDto.java | 5 +++++
src/main/java/com/zy/asrs/utils/RouteUtils.java | 4 ++++
src/main/webapp/static/images/zy-logo.png | 0
src/main/webapp/views/console-old.html | 2 +-
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 8 ++++----
src/main/webapp/views/console.html | 2 +-
src/main/webapp/views/index.html | 2 +-
src/main/webapp/views/monitor/monitor0.html | 2 +-
src/main/webapp/views/monitor/monitor.html | 2 +-
9 files changed, 18 insertions(+), 9 deletions(-)
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 7859cd6..95f5d98 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -3292,10 +3292,10 @@
Set<Integer> workNos = wrkMasts.stream().map(WrkMast::getWrkNo).collect(Collectors.toSet());
// 鑾峰彇LED绾跨▼
LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, led.getId());
-// // 鐩稿悓宸ヤ綔鍙烽泦鍚堝垯杩囨护
-// if (CollectionUtils.equals(ledThread.getWorkNos(), workNos)) {
-// continue;
-// }
+ // 鐩稿悓宸ヤ綔鍙烽泦鍚堝垯杩囨护
+ if (CollectionUtils.equals(ledThread.getWorkNos(), workNos)) {
+ continue;
+ }
// 鍛戒护涓嬪彂 -------------------------------------------------------------------------------
if (!commands.isEmpty()) {
// if (led.getId() == 7) {
diff --git a/src/main/java/com/zy/asrs/utils/RouteUtils.java b/src/main/java/com/zy/asrs/utils/RouteUtils.java
index a0676d2..aa66a4e 100644
--- a/src/main/java/com/zy/asrs/utils/RouteUtils.java
+++ b/src/main/java/com/zy/asrs/utils/RouteUtils.java
@@ -27,6 +27,10 @@
add(110);add(120);add(111);add(121);
}};
+ public static final List<Integer> MERGE_STA_NO_FIVE = new ArrayList<Integer>() {{
+ add(113);add(123);add(114);add(1142);
+ }};
+
// 姝ｅ簭
public static final List<Integer> TRACK_POSITION_POSITIVE_SEQUENCE = new ArrayList<Integer>() {{
add(101);add(102);add(104);add(122);add(105);add(107);add(118);add(108);add(119);add(110);add(120);add(111);add(121);add(113);add(123);add(114);add(1142);add(116);add(117);
diff --git a/src/main/java/com/zy/common/model/MatDto.java b/src/main/java/com/zy/common/model/MatDto.java
index 0c9e224..f8e26dc 100644
--- a/src/main/java/com/zy/common/model/MatDto.java
+++ b/src/main/java/com/zy/common/model/MatDto.java
@@ -24,6 +24,9 @@
//鎵规
private String model;
+ //鍗峰彿
+ private String juanNo;
+
// 鐗╂枡鏁伴噺
private Double count;
@@ -40,12 +43,14 @@
this.matNo = matNo;
this.maknx = maknx;
this.count = count;
+ this.specs = specs;
}
public MatDto(WrkDetl wrkDetl) {
this.matNo = wrkDetl.getMatnr();
this.maknx = wrkDetl.getMaktx();
this.specs = wrkDetl.getMatnr();
this.batch = wrkDetl.getBatch();
+ this.juanNo = wrkDetl.getSku();
this.count = wrkDetl.getAnfme();
}
}
diff --git a/src/main/webapp/static/images/zy-logo.png b/src/main/webapp/static/images/zy-logo.png
index e2fc662..d40e8cb 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 4ec664f..784c5de 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="寰愬伐姹変簯" height="44" width="80">
</div>
</div>
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index e18345c..967f7f8 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -21,7 +21,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="寰愬伐姹変簯" height="44" width="80">-->
</div>
</div>
<!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 -->
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index 72f9e61..f79598b 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -27,7 +27,7 @@
<!-- 涓讳綋鍐呭 -->
<iframe id="content" src="console.html"></iframe>
<footer class="footer">
- Copyright 漏 2015 All Rights Reserved. <a href="https://www.zoneyung.com" target="_blank">娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙�</a> 淇濈暀鎵�鏈夋潈鍒�
+ Copyright 漏 2023 All Rights Reserved. <a href="https://www.zoneyung.com" target="_blank">寰愬伐姹変簯</a> 淇濈暀鎵�鏈夋潈鍒�
</footer>
</body>
<script>
diff --git a/src/main/webapp/views/monitor/monitor.html b/src/main/webapp/views/monitor/monitor.html
index a2d8d81..0538ed6 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>寰愬伐姹変簯</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..f2f8324 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>寰愬伐姹変簯</span>
<img src="../../static/image/barcode.png">
</div>
</div>
--
Gitblit v1.9.1