From 4e3b8155722b66e25df3c6fd42cc586b68dea391 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/OpcNGTemperingTask.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/OpcNGTemperingTask.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/OpcNGTemperingTask.java
index 826707b..e1b9d7e 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/OpcNGTemperingTask.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/OpcNGTemperingTask.java
@@ -17,7 +17,6 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
-import java.util.Comparator;
import java.util.List;
import java.util.Optional;
@@ -108,7 +107,7 @@
}
List<TemperingGlassInfo> glassList = temperingAgoService.selectGlassInfoById(temperingid);
if (glassList != null && glassList.size() > 0) {
- int glasstype = GetGlassType(glassList.get(0).getFilmsid());//鑶滅郴
+ int glasstype = GetGlassType(glassList.get(0).getFilmsId());//鑶滅郴
int process = 0;//閽㈠寲绫诲瀷
int thiness = (int) glassList.get(0).getThickness();//鍘氬害
String engineerId = glassList.get(0).getEngineerId();
--
Gitblit v1.8.0