From e86a8267dd7acd49cde660c9f4151a687c4c42e6 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 18 四月 2024 11:54:07 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

---
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/LogicService.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/LogicService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/LogicService.java
index c4334cb..393d153 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/LogicService.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/LogicService.java
@@ -4,7 +4,7 @@
 
 import com.mes.common.PLCAutoMes;
 import com.mes.common.PlcParameterObject;
-import com.mes.common.S7object;
+//import com.mes.common.S7object;
 import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
 import com.mes.glassinfo.entity.GlassInfo;
 import com.mes.taskcache.mapper.HangzhouMesMapper;
@@ -55,7 +55,7 @@
                 //2.鍥炲 1杩涚墖
                 EdgStorageCageDetails item=list.get(0);
                 hangzhouMesMapper.insertCacheTask(GlassInfo.getId()+"","0",item.getSlot()+"","1");
-                S7object.getinstance().plccontrol.WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 1);
+//                S7object.getinstance().plccontrol.WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 1);
                 return true;
             }
 

--
Gitblit v1.8.0