From 4d8089f35b577dda064345b6323838649bc99576 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 23 五月 2024 10:12:42 +0800
Subject: [PATCH] 1、上片机修改读写PLC方式 2、修改卧式理片ip地址

---
 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
index 3fd3a87..bdae975 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
@@ -52,16 +52,16 @@
                     int workId = upwork.getWorkstationId();//宸ヤ綅id
                     double width = upwork.getPatternWidth();//瀹藉害
                     double height = upwork.getPatternHeight();//楂樺害
-                    S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("WorkId").getAddress(), workId);
-                    S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("GlassWidth").getAddress(), (long) width);
-                    S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("GlassHeight").getAddress(), (long) height);
-                    S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlc").getAddress(), 1);
+                    S7object.getinstance().plccontrol.WriteWord(plcParameterObject.getPlcParameter("WorkId").getAddress(), (short) workId);
+                    S7object.getinstance().plccontrol.WriteWord(plcParameterObject.getPlcParameter("GlassWidth").getAddress(), (short) width);
+                    S7object.getinstance().plccontrol.WriteWord(plcParameterObject.getPlcParameter("GlassHeight").getAddress(), (short) height);
+                    S7object.getinstance().plccontrol.WriteWord(plcParameterObject.getPlcParameter("MesToPlc").getAddress(), (short) 1);
                     //鏇存敼涓婄墖琛ㄧ姸鎬�
                     upPattenUsageService.updateUpPattenUsageState(upPattenUsage, workId);
 
                 }
             }
-            if("1".equals(mesToPlc)&& "0".equals(loadRequest)){
+            if ("1".equals(mesToPlc) && "0".equals(loadRequest)) {
                 //璇锋眰瀛椾负闆舵椂锛屼换鍔″瓧娓呴浂
                 S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlc").getAddress(), 0);
             }
@@ -73,7 +73,7 @@
     }
 
     @Scheduled(fixedDelay = 300)
-    public void plcLoadGlassReport(){
+    public void plcLoadGlassReport() {
         //鑾峰彇鏄惁鏈夋眹鎶�
         String loadStatus = plcParameterObject.getPlcParameter("PlcStatus").getValue();
         if (loadStatus != null) {
@@ -101,7 +101,7 @@
         }
     }
 
-    public void overTask(String loadStatus, int state)  {
+    public void overTask(String loadStatus, int state) {
         UpPattenUsage upPattenUsage = upPattenUsageService.selectOverTask();
         if (upPattenUsage != null) {
             log.info("鏀跺埌姹囨姤娓厈}鐘舵��", loadStatus);

--
Gitblit v1.8.0