From 252bfe6c268c95444525c16c95845a4ee8d10fd5 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 07 三月 2025 16:46:24 +0800
Subject: [PATCH] 四期
---
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
index f3158bd..7c43a50 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -168,8 +168,8 @@
locDto.getCsocode(),
locDto.getIsoseq(),
locDto.getProcessSts());
- OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
- AgvLocDetl locDetl = agvLocDetlService.selectItem(wrkMast.getSourceLocNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
+ //OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
+ // AgvLocDetl locDetl = agvLocDetlService.selectItem(wrkMast.getSourceLocNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq());
// 娴佹按 -- 鏂板璁㈠崟鏄庣粏
// FlowLog flowLog = new FlowLog();
// flowLog.setFid(String.valueOf(flowId));
@@ -579,16 +579,20 @@
agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, false);
}
} else {
- List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().like("loc_no", "02F1").like("source_loc_no", "F1"));
- if (Integer.parseInt(config.getValue()) <= agvWrkMasts.size()) {
- agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, true);
+ if (station.endsWith("F4") && locType == 3) {
+ agvLocMast = agvCommonService.getLocNoOnXiSuer(locType, 1);
} else {
- if (isCurrLev.get()) {
+ List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().like("loc_no", "02F1").like("source_loc_no", "F1"));
+ if (Integer.parseInt(config.getValue()) <= agvWrkMasts.size()) {
agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, true);
} else {
- agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, false);
+ if (isCurrLev.get()) {
+ agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, true);
+ } else {
+ agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, false);
+ }
+ //agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),false,false);
}
- //agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),false,false);
}
}
@@ -737,7 +741,8 @@
// //agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),false,false);
// }
// }
- agvLocMast = agvCommonService.getLocByLocRule(3, 1, code);
+ // 棰勭暀20涓簱浣�
+ agvLocMast = agvCommonService.getLocByLocRule20(3, 1, code,false);
String devNo = agvBasDevp.getDevNo();
--
Gitblit v1.9.1