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/asrs/service/impl/MainServiceImpl.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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));
--
Gitblit v1.9.1