From 34f862e50eda729da5ed06073fc127682d651495 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 25 十二月 2024 16:12:34 +0800
Subject: [PATCH] 钢化查询添加显示版图所占格子号，大理片笼高度限制
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
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 3d20506..ab9669a 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
@@ -211,8 +211,11 @@
new LambdaQueryWrapper<GlassInfo>()
.eq(GlassInfo::getGlassId, glassId)
);
- if (Math.max(feedGlassInfo.getWidth(), feedGlassInfo.getHeight()) > cacheWidth || Math.min(feedGlassInfo.getWidth(), feedGlassInfo.getHeight()) > cacheHeight) {
- log.info("1.1銆佺幓鐠冭秴杩囧崸寮忕悊鐗囨渶澶у昂瀵�:{}", feedGlassInfo);
+ if (Math.max(feedGlassInfo.getWidth(), feedGlassInfo.getHeight()) > cacheWidth ||
+ Math.min(feedGlassInfo.getWidth(), feedGlassInfo.getHeight()) > cacheHeight
+ || Math.min(feedGlassInfo.getWidth(), feedGlassInfo.getHeight()) < Integer.parseInt(minTwoFirstLength)
+ ) {
+ log.info("1.1銆佺幓鐠冭秴杩囧崸寮忕悊鐗囧昂瀵歌寖鍥�:{}", feedGlassInfo);
return;
}
@@ -748,6 +751,7 @@
damage.setType(1);
damage.setRemark("杩囧崸寮忕悊鐗�");
damageService.insertDamage(damage);
+ damageService.deleteByGlassId(glassId);
return Boolean.TRUE;
}
return Boolean.FALSE;
--
Gitblit v1.8.0