From 5c423ac136ae1e4cd3627fd3a8eb1b26fe5bb3ca Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期二, 14 十月 2025 17:17:18 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 9 +++++----
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 11 ++++++++++-
2 files changed, 15 insertions(+), 5 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 eaeb953..fd7c8aa 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -903,6 +903,10 @@
if (wrkMast.getIoType() >= 100) {
WrkMast wrkMast1 = wrkMastMapper.selectPakOutStep1(crn.getId(), wrkMast.getSourceStaNo());
if (wrkMast1 != null) {
+ if (Integer.parseInt(wrkMast1.getSourceLocNo().substring(2,5)) == 1){
+ this.outPut(crn, crnProtocol, mark);
+ continue;
+ }
this.outTake(crn, crnProtocol, 2, mark);
} else {
this.outPut(crn, crnProtocol, mark);
@@ -928,6 +932,10 @@
if (wrkMast.getIoType() >= 100) {
WrkMast wrkMast1 = wrkMastMapper.selectPakOutStep1(crn.getId(), wrkMast.getSourceStaNo());
if (wrkMast1 != null) {
+ if (Integer.parseInt(wrkMast1.getSourceLocNo().substring(2,5)) == 29){
+ this.outPut(crn, crnProtocol, mark);
+ continue;
+ }
this.outTake(crn, crnProtocol, 1, mark);
} else {
this.outPut(crn, crnProtocol, mark);
@@ -2043,6 +2051,7 @@
// 淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓�
Date now = new Date();
wrkMast.setWrkSts(12L);
+ wrkMast.setPltType(crnStation);
wrkMast.setCrnStrTime(now);
wrkMast.setModiTime(now);
if (wrkMastMapper.updateById(wrkMast) == 0) {
@@ -3795,7 +3804,7 @@
}
if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getTaskNoTwo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO && crnProtocol.getStatusTypeTwo()== CrnStatusType.IDLE) {
- if (crnProtocol.getCrnNo() == 1 && crnProtocol.getBay() == 11 && crnProtocol.getLevel() == 1) {
+ if (crnProtocol.getBay() == 11 && crnProtocol.getLevel() == 1) {
continue;
}
Page<BasCrnOpt> basCrnOptPage = crnOptService.selectPage(new Page<>(1, 1), new EntityWrapper<BasCrnOpt>().eq("crn_no", crn.getId()).orderBy("send_time", false));
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index b74fae7..b43ebc5 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -533,8 +533,8 @@
// convertRow(command);
command.setCrnNo(slave.getId());
// short[] array = new short[10];
- short[] array = new short[9];
- //array[0] = command.getAckFinish(); // 浠诲姟瀹屾垚纭浣�
+ short[] array = new short[10];
+// array[0] = command.getAckFinish(); // 浠诲姟瀹屾垚纭浣�
array[0] = command.getTaskNo(); // 浠诲姟鍙�
array[1] = command.getTaskMode(); // 妯″紡
array[2] = command.getSourcePosX(); // 婧愪綅缃帓鍙�
@@ -551,6 +551,7 @@
OperateResult result = siemensNet.Write("DB100.20", array);
OperateResult result2 = siemensNet.Write("DB100.0", array2);
News.info("鍫嗗灈鏈哄伐浣�2鍛戒护涓嬪彂[id:{}] >>>>> {}", slave.getId(), array);
+ News.info("鍫嗗灈鏈哄伐浣�2浠诲姟瀹屾垚纭浣嶄笅鍙慬id:{}] >>>>> {}", slave.getId(), array2);
int writeCount1 = 1;
do {
@@ -558,7 +559,7 @@
if (!result.IsSuccess || !result2.IsSuccess) {
// if (!resetFlag){
News.error("鍐欏叆鍫嗗灈鏈哄伐浣�2plc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command), writeCount1);
- result = siemensNet.Write("DB100.0", array);
+ result = siemensNet.Write("DB100.20", array);
// }
Thread.sleep(100);
writeCount1++;
@@ -599,7 +600,7 @@
}
// if (!resetFlag){
News.error("鍐欏叆鍫嗗灈鏈哄伐浣�2plc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍥炶涓嶄竴鑷� ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command), writeCount1);
- result = siemensNet.Write("DB100.0", array);
+ result = siemensNet.Write("DB100.20", array);
// }
writeCount1++;
continue;
--
Gitblit v1.9.1