From caee21a5367c06b5de60580de28c30c2b2ba6976 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 01 七月 2024 14:35:08 +0800
Subject: [PATCH] 大理片、人工下片单片玻璃已联调完成,未出现逻辑行的系统bug 下片向plc发送宽高厚保存原有尺寸,避免尺寸*10后超过类型接收最大值造成数据不准确

---
 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java
index 24022fa..4eaa40d 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java
@@ -26,6 +26,7 @@
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
@@ -72,10 +73,10 @@
     private Integer maxHeight;
 
 
-    //    @Scheduled(fixedDelay = 1000)
+    @Scheduled(fixedDelay = 1000)
     public void plcHomeEdgTask() {
         PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
-        String requestWord = plcParameterObject.getPlcParameter("RequestWord").getValue();
+        String requestWord = plcParameterObject.getPlcParameter("requestWord").getValue();
         String glassIdeValue = plcParameterObject.getPlcParameter("requestID").getValue();
         //A08  A09琛ㄧず绾胯矾鐩稿悓  鍙仛绛変环  鏃犳暟鎹浆int寮傚父
         String out06Glassstate = plcParameterObject.getPlcParameter("glassStatus06").getValue();
@@ -505,9 +506,9 @@
     private Boolean sendMessageToPlc(int width, int height, int thickness, int startCell, int endCell, int taskType) {
         S7control s7control = S7object.getinstance().plccontrol;
         PlcParameterObject plcMesObject = S7object.getinstance().PlcMesObject;
-        s7control.writeWord(plcMesObject.getPlcParameter("Glass_width").getAddress(), (short) width * 10);
-        s7control.writeWord(plcMesObject.getPlcParameter("Glass_height").getAddress(), (short) height * 10);
-        s7control.writeWord(plcMesObject.getPlcParameter("Glass_thickness").getAddress(), (short) thickness * 10);
+        s7control.writeWord(plcMesObject.getPlcParameter("Glass_width").getAddress(), (short) width);
+        s7control.writeWord(plcMesObject.getPlcParameter("Glass_height").getAddress(), (short) height);
+        s7control.writeWord(plcMesObject.getPlcParameter("Glass_thickness").getAddress(), (short) thickness);
         s7control.writeWord(plcMesObject.getPlcParameter("Start_cell").getAddress(), (short) startCell);
         s7control.writeWord(plcMesObject.getPlcParameter("End_cell").getAddress(), (short) endCell);
         s7control.writeWord(plcMesObject.getPlcParameter("task_type").getAddress(), (short) taskType);

--
Gitblit v1.8.0