From 60bf0cffa746f986d3669b6ec3da9db3d84e8817 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 11 四月 2024 13:27:29 +0800
Subject: [PATCH] 添加通讯配置

---
 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/service/LoadGlassService.java |   22 ++++++++++------------
 1 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/service/LoadGlassService.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/service/LoadGlassService.java
index 95514e3..ae34d3d 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/service/LoadGlassService.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/service/LoadGlassService.java
@@ -1,17 +1,15 @@
-package com.mes.service;
+package com.mes.upworkstation.service;
 import java.util.List;
 import org.springframework.stereotype.Service;
-import com.mes.entity.device.PLCAutoMes;
-import com.mes.common.PlcTools.S7control;
-import com.mes.entity.device.PlcParameterObject;
-
-import com.mes.entity.UpWorkstation;
-import com.mes.mapper.LoadGlassMapper;
+import com.mes.common.PLCAutoMes;
+import com.mes.common.PlcParameterObject;
+import com.mes.upworkstation.entity.UpWorkstation;
+import com.mes.upworkstation.mapper.LoadGlassMapper;
 
 @Service
 public class LoadGlassService {
     
-    private S7control s7control;
+
     private LoadGlassMapper LoadGlassMapper;
     PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
     //鏄剧ず宸ヤ綅涓婄殑鐜荤拑淇℃伅
@@ -43,18 +41,18 @@
         int loadid2=LoadGlassMapper.selectPriority(2);
         //鍒ゆ柇涓�浜屽彿宸ヤ綅鍝竟鐨勯『搴忔洿鍏�
         if(loadid1>loadid2) {
-            s7control.WriteWord("DB100.10", (short)2);
+            //s7control.WriteWord("DB100.10", (short)2);
         }else if(loadid1==loadid2){
             //褰撲袱涓伐浣嶄笂鐨勭幓鐠冩暟鐩稿悓鏃讹紝鍒ゆ柇鍝釜宸ヤ綅涓婄殑鐜荤拑鏁版洿灏�,浼樺厛娓呯┖涓�涓灦瀛�
             int glassnum1=Integer.parseInt(plcmes.getPlcParameter("鐜荤拑鏁�").getValue());
             int glassnum2=Integer.parseInt(plcmes.getPlcParameter("鐜荤拑鏁�").getValue());
             if(glassnum1>glassnum2){
-                s7control.WriteWord("DB100.10", (short)2);
+               // s7control.WriteWord("DB100.10", (short)2);
             }else{
-                s7control.WriteWord("DB100.10", (short)1);
+                //s7control.WriteWord("DB100.10", (short)1);
             }
         }else{
-            s7control.WriteWord("DB100.10", (short)1);
+            //s7control.WriteWord("DB100.10", (short)1);
         }
     }
    

--
Gitblit v1.8.0