From 09c9c55d62cdcc6db5e99ee238ae0e78d082ee1a Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 21 十月 2024 13:34:25 +0800
Subject: [PATCH] 添加大理片多线程

---
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 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 7ba0b87..4feec2c 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
@@ -114,10 +114,10 @@
         String confirmationWrodAddress = plcParameterObject.getPlcParameter("MES_confirmation_word").getAddress();
         String currentSlot = plcParameterObject.getPlcParameter("Current_slot").getValue();
 
-//        taskRequestTypeValue = "3";
+//        taskRequestTypeValue = "2";
 //        out08Glassstate = "1";
 //        out10Glassstate = "1";
-//        currentSlot = "2";
+//        currentSlot = "5";
 //        confirmationWrodValue = "0";
 //        glassIdeValue = "P24092706|15|5";
 
@@ -257,7 +257,6 @@
                 .eq(GlassInfo::getThickness, glassInfo.getThickness())
                 .eq(GlassInfo::getFilmsid, glassInfo.getFilmsid())
                 .eq(GlassInfo::getFlowCardId, glassInfo.getFlowCardId())
-                .ne(GlassInfo::getGlassId, glassInfo.getGlassId())
                 .eq(GlassInfo::getTotalLayer, glassInfo.getTotalLayer())
                 .eq(GlassInfo::getLayer, glassInfo.getLayer())
                 .eq(GlassInfo::getEngineerId, glassInfo.getEngineerId())
@@ -302,7 +301,7 @@
 //      鐜荤拑灏忕墖琛ㄤ腑鐜荤拑宸茬粡鏇挎崲锛屾洿鏂板崸鐞嗙鍐呯幇鏈夌殑鍑嗗鍑虹鐨勭幓鐠冧俊鎭紝
         if (null == swapGlassDetailInfo) {
             GlassInfo glassInfoBase = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>()
-                    .eq(GlassInfo::getGlassId, swapGlassId));
+                    .eq(GlassInfo::getGlassId, glassId));
             //闇�瑕佹浛鎹㈢殑鐜荤拑涓哄瓨杩涘崸鐞嗭紝浠呴渶鏇存柊褰撳墠闇�瑕佸嚭绗肩殑鐜荤拑淇℃伅鍗冲彲
             edgStorageCageDetailsService.update(new LambdaUpdateWrapper<EdgStorageCageDetails>()
                     .eq(EdgStorageCageDetails::getGlassId, glassId)
@@ -355,6 +354,7 @@
         int endcell = 0;
         EdgStorageCageDetails glassInfo = null;
 
+
         boolean flag = queryMaxMinDiff(threshold);
         log.info("1銆佽幏鍙栭挗鍖栫増鍥炬槸鍚﹁秴杩囬槇鍊�:{}", flag);
         if (flag) {

--
Gitblit v1.8.0