From 36d59c25121e2b7f270d980463be5b455e372d2b Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 09 十二月 2024 16:24:25 +0800
Subject: [PATCH] 修复玻璃id替换与预排格子冲突的bug
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
index abca8a6..a677319 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
@@ -857,7 +857,9 @@
);
}
String carRequest = plcParameterObject.getPlcParameter("CarRequest").getValue();
- log.info("澶ц溅褰撳墠鐜荤拑id{}",glassIdsCar);
+ log.info("澶ц溅褰撳墠鐜荤拑id{}", glassIdsCar);
+ log.info("鍗ц浆绔�1鐜荤拑id{}", glassIds1);
+ log.info("鍗ц浆绔�2鐜荤拑id{}", glassIds2);
if (CollectionUtils.isNotEmpty(glassIdsCar) && REQUEST_WORD.equals(carRequest)) {
List<BigStorageCageFeedTask> bigStorageCageFeedTasks = bigStorageCageFeedTaskService.list(
new LambdaQueryWrapper<BigStorageCageFeedTask>()
@@ -865,7 +867,10 @@
.eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_UP)
.eq(BigStorageCageFeedTask::getTargetSlot, 0)
);
- computeTargetByLineCar(bigStorageCageFeedTasks.get(0).getLine());
+ if(CollectionUtils.isNotEmpty(bigStorageCageFeedTasks)){
+ log.info("鑾峰彇鍒扮殑杩涚墖浠诲姟淇℃伅{}", bigStorageCageFeedTasks);
+ computeTargetByLineCar(bigStorageCageFeedTasks.get(0).getLine(), glassIdsCar);
+ }
}
@@ -1081,11 +1086,13 @@
/**
* 璁＄畻浠诲姟琛ㄨ繘鐗囩嚎璺殑鐩爣鏍煎瓙锛屽苟鍚姩浠诲姟
*/
- public boolean computeTargetByLineCar(Integer line) {
+ public boolean computeTargetByLineCar(Integer line, List<String> carGlassId) {
//1銆佽幏鍙栦换鍔¤〃涓殑鎵�鏈夌幓鐠冿紙鎸囧畾绾胯矾涓斿凡缁忚繘鍗ц浆绔嬪畬鎴愶級
List<BigStorageCageFeedTask> taskList = bigStorageCageFeedTaskService.list(new LambdaQueryWrapper<BigStorageCageFeedTask>()
.eq(BigStorageCageFeedTask::getLine, line)
- .and(e -> e.isNull(BigStorageCageFeedTask::getTargetSlot).or().eq(BigStorageCageFeedTask::getTargetSlot, Const.OUT_TARGET_POSITION_ZERO))
+ .in(BigStorageCageFeedTask::getGlassId, carGlassId)
+ .and(e -> e.isNull(BigStorageCageFeedTask::getTargetSlot).or()
+ .eq(BigStorageCageFeedTask::getTargetSlot, Const.OUT_TARGET_POSITION_ZERO))
.in(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_UP_ALL)
.orderByAsc(BigStorageCageFeedTask::getId));
//2銆佸幓绗煎瓙鍐呮煡鎵炬槸鍚﹀彲浠ョ户缁瓨鏀剧殑绗煎瓙
@@ -1116,6 +1123,13 @@
if (info == null) {
continue;
}
+ if(info.getSlot()==null){
+ computeSlot(info.getGlassId());
+ info=glassInfoService.getOne(
+ new LambdaQueryWrapper<GlassInfo>()
+ .eq(GlassInfo::getGlassId,info.getGlassId())
+ );
+ }
BigStorageCageDetails cageDetails = new BigStorageCageDetails();
BeanUtils.copyProperties(info, cageDetails);
//2銆佽幏鍙栫洰鏍囨牸瀛愪俊鎭�
--
Gitblit v1.8.0