From 12ee7baa78483a3077ac55cc6d11a0ebc543daf4 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 12 十一月 2025 11:14:06 +0800
Subject: [PATCH] 1、中空避免不出片调度修改 2、钢化指定的工程，自动取消指定规则变更 3、中空打印标签修改为只打印配对玻璃的标签
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/OpcLoadGlassTask.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/OpcLoadGlassTask.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/OpcLoadGlassTask.java
index dff3e77..c68e99c 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/OpcLoadGlassTask.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/OpcLoadGlassTask.java
@@ -111,7 +111,10 @@
for (Engineering engineering : engineerings) {
Integer count = upPattenUsageMapper.selectCount(new LambdaQueryWrapper<UpPattenUsage>()
.eq(UpPattenUsage::getEngineeringId, engineering.getEngineerId()).ne(UpPattenUsage::getState, Const.LOAD_RAW_GLASS_SUCCESS));
- if (count == 0) {
+ OptimizeProject project = optimizeProjectService.getOne(new LambdaUpdateWrapper<OptimizeProject>()
+ .eq(OptimizeProject::getProjectNo, 200)
+ .eq(OptimizeProject::getState, engineering.getEngineerId()));
+ if (count == 0 && project != null) {
engineeringMapper.update(null, new LambdaUpdateWrapper<Engineering>().set(Engineering::getState, Const.ENGINEERING_SUCCESS)
.eq(Engineering::getEngineerId, engineering.getEngineerId()));
optimizeProjectService.update(null, new LambdaUpdateWrapper<OptimizeProject>().set(OptimizeProject::getState, 300)
--
Gitblit v1.8.0