From a38d955f816eb64f297cd587b507defd5839892e Mon Sep 17 00:00:00 2001
From: zzgtfwq <zzgtfwq>
Date: 星期二, 09 十二月 2025 15:08:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/model/StartupDto.java | 13 +++++++++++++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 4 ++--
src/main/java/com/zy/asrs/entity/WrkMast.java | 12 ++++++++++++
src/main/java/com/zy/common/model/LocTypeDto.java | 6 +-----
4 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index fb5927a..e1f5c49 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -491,4 +491,16 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.logErrTime);
}
+ public Integer getStaNoSou$() {
+ switch (sourceStaNo){
+ case 118:
+ case 121:
+ case 122:
+ case 218:
+ case 221:
+ case 222:
+ return sourceStaNo+1;
+ }
+ return staNo;
+ }
}
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 10f6565..46167d3 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -221,7 +221,7 @@
// LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
barcodeThread.setBarcode("");
staProtocol.setWorkNo(wrkMast.getWrkNo());
- staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
+ staProtocol.setStaNo(wrkMast.getStaNoSou$().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false,238);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
@@ -330,7 +330,7 @@
// 鏇存柊绔欑偣淇℃伅 涓� 涓嬪彂plc鍛戒护
staProtocol.setWorkNo(dto.getWorkNo());
- staProtocol.setStaNo(dto.getStaNo().shortValue());
+ staProtocol.setStaNo(dto.getStaNoSou$(dto.getStaNo(),staProtocol.getSiteId()).shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false,4087);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
if (!result) {
diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java
index 38fb7d2..9c9ad12 100644
--- a/src/main/java/com/zy/common/model/LocTypeDto.java
+++ b/src/main/java/com/zy/common/model/LocTypeDto.java
@@ -34,11 +34,7 @@
// if (staProtocol.isHigh() == staProtocol.isLow()) {
// throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
// }
- if (staProtocol.getSiteId() == 106 || staProtocol.getSiteId() == 159){
- this.locType1 = 2; // 楂樺簱浣�
- }else {
- this.locType1 = 1; // 浣庡簱浣�
- }
+ this.locType1 = 2; // 楂樺簱浣�
}
/**
diff --git a/src/main/java/com/zy/common/model/StartupDto.java b/src/main/java/com/zy/common/model/StartupDto.java
index 7262b24..e3e95a6 100644
--- a/src/main/java/com/zy/common/model/StartupDto.java
+++ b/src/main/java/com/zy/common/model/StartupDto.java
@@ -23,4 +23,17 @@
*/
private Integer rgvSstaNo;
+ public Integer getStaNoSou$(Integer staNoE,Integer sourceStaNo) {
+ switch (sourceStaNo){
+ case 118:
+ case 121:
+ case 122:
+ case 218:
+ case 221:
+ case 222:
+ return sourceStaNo+1;
+ }
+ return staNoE;
+ }
+
}
--
Gitblit v1.9.1