From 4823761fb741876fda2fa95ea212ee1ce53dac02 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 22 十月 2024 08:59:14 +0800
Subject: [PATCH] 磨边添加进片时清除破损拿走数据
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java | 2 +-
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java | 2 ++
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java | 6 ++++++
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java | 23 +++++++++++++++++++----
4 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
index 8cb3614..ac51c77 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
@@ -283,7 +283,7 @@
baseMapper.delete(
new LambdaQueryWrapper<Damage>()
.eq(Damage::getGlassId, glassId)
- .in(Damage::getType, Const.GLASS_STATE_DAMAGE, Const.GLASS_STATE_TAKE)
+ .in(Damage::getType, Const.GLASS_STATE_DAMAGE_TAKE)
);
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
index 4feec2c..8e0191c 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
@@ -231,6 +231,7 @@
details.setSlot(nearestEmpty.getSlot());
details.setDeviceId(nearestEmpty.getDeviceId());
edgStorageCageDetailsService.save(details);
+ damageService.deleteByGlassId(glassId);
log.info("5銆佺幓鐠冧俊鎭凡瀛樺叆鐞嗙墖绗艰鎯呰〃锛岀幓鐠冧俊鎭负{}", details);
//娣诲姞杩涚墖浠诲姟
boolean taskCache = saveTaskCache(details.getGlassId(), 0, nearestEmpty.getSlot(), Const.GLASS_CACHE_TYPE_IN);
@@ -802,6 +803,7 @@
damage.setType(1);
damage.setRemark("杩囧崸寮忕悊鐗�");
damageService.insertDamage(damage);
+ damageService.deleteByGlassId(glassId);
return Boolean.TRUE;
}
return Boolean.FALSE;
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 170123e..8d558eb 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
@@ -627,7 +627,7 @@
.eq(BigStorageCageFeedTask::getTaskState, 1)
.eq(BigStorageCageFeedTask::getLine, Const.A10_OUT_TARGET_POSITION)
);
- if (CollectionUtils.isNotEmpty(bigStorageCageFeedTasks1)&& glassIds1 != null) {
+ if (CollectionUtils.isNotEmpty(bigStorageCageFeedTasks1) && glassIds1 != null) {
List<String> matchingIds1 = bigStorageCageFeedTasks1.stream()
.map(BigStorageCageFeedTask::getGlassId)
.filter(glassIds1::contains)
@@ -640,7 +640,7 @@
.set(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_UP)
);
}
- if (CollectionUtils.isNotEmpty(bigStorageCageFeedTasks2)&& glassIds2 != null) {
+ if (CollectionUtils.isNotEmpty(bigStorageCageFeedTasks2) && glassIds2 != null) {
List<String> matchingIds2 = bigStorageCageFeedTasks2.stream()
.map(BigStorageCageFeedTask::getGlassId)
.filter(glassIds2::contains)
@@ -656,7 +656,7 @@
if (CollectionUtils.isEmpty(glassIds1)) {
bigStorageCageFeedTaskService.update(
new LambdaUpdateWrapper<BigStorageCageFeedTask>()
- .eq(BigStorageCageFeedTask::getLine,Const.A09_OUT_TARGET_POSITION)
+ .eq(BigStorageCageFeedTask::getLine, Const.A09_OUT_TARGET_POSITION)
.eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_UP)
.gt(BigStorageCageFeedTask::getTargetSlot, 0)
.lt(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_SLOT)
@@ -666,7 +666,7 @@
if (CollectionUtils.isEmpty(glassIds2)) {
bigStorageCageFeedTaskService.update(
new LambdaUpdateWrapper<BigStorageCageFeedTask>()
- .eq(BigStorageCageFeedTask::getLine,Const.A10_OUT_TARGET_POSITION)
+ .eq(BigStorageCageFeedTask::getLine, Const.A10_OUT_TARGET_POSITION)
.eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_UP)
.gt(BigStorageCageFeedTask::getTargetSlot, 0)
.lt(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_SLOT)
@@ -679,6 +679,21 @@
* 鎸夌収鐜荤拑id鍒ゆ柇鐜荤拑鐘舵�佸強鍗ц浆绔嬫槸鍚﹀彲鐩存帴鍚姩
*/
public Boolean judgeGlassTypeStatus(String glassId, Integer line, String mesAddress) {
+ //鍒ゆ柇姝ょ幓鐠冩槸鍦ㄧ鍐呮垨宸茬敓鎴愯繘鐗囦换鍔�
+ BigStorageCageFeedTask bigStorageCageFeedTask = bigStorageCageFeedTaskService.getOne(
+ new LambdaQueryWrapper<BigStorageCageFeedTask>()
+ .lt(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_SLOT)
+ .eq(BigStorageCageFeedTask::getGlassId, glassId)
+ );
+ BigStorageCageDetails bigStorageCageDetails = bigStorageCageDetailsService.getOne(
+ new LambdaQueryWrapper<BigStorageCageDetails>()
+ .eq(BigStorageCageDetails::getGlassId, glassId)
+ .ne(BigStorageCageDetails::getState, Const.GLASS_STATE_IN)
+ );
+ if (bigStorageCageFeedTask != null || bigStorageCageDetails != null) {
+ log.info("姝ょ幓鐠冨瓨浠诲姟鎴栧凡鍦ㄧ鍐�");
+ return Boolean.TRUE;
+ }
//1銆佽幏鍙栦换鍔¤〃涓浉閭荤幓鐠�
List<EdgGlassTaskInfo> edgGlassTaskInfoList;
edgGlassTaskInfoList = edgGlassTaskInfoService.list(new LambdaQueryWrapper<EdgGlassTaskInfo>()
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java
index dd93257..af6a8b1 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java
@@ -194,6 +194,12 @@
}
@Test
+ public void deleteByGlassId(){
+ damageService.deleteByGlassId("P24081203|2|5");
+ }
+
+
+ @Test
public void ca(){
try {
// 鐩爣绯荤粺鐨凙PI URL
--
Gitblit v1.8.0