From b8e0bdefd79d0486e729f9d9a1872c0d05da54d1 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 05 七月 2024 14:46:42 +0800
Subject: [PATCH] 大理片笼进出片任务:生成任务的同时向plc发送任务确认字 下片卧式理片:任务类型有varchar改为int

---
 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 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 9eaf129..e890fb3 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
@@ -96,7 +96,7 @@
                 return;
             }
             log.info("2銆佽幏鍙栧埌鐨勮姹傚瓧涓�0锛屽皢纭瀛楁敼涓�0");
-            S7object.getinstance().plccontrol.writeWord(confirmationWrodAddress, (short) 0);
+            S7object.getinstance().plccontrol.writeWord(confirmationWrodAddress, 0);
             return;
         }
         if (!"0".equals(confirmationWrodValue)) {
@@ -474,6 +474,8 @@
             log.info("鏇存柊璇︽儏琛ㄥ唴鐨勭姸鎬佸け璐�");
             return Boolean.FALSE;
         }
+        //鏇存柊钀芥灦鐜荤拑鏁伴噺
+
         //鐢熸垚浠诲姟淇℃伅
         DownGlassInfo downGlassInfo = new DownGlassInfo();
         BeanUtils.copyProperties(downStorageCageDetails, downGlassInfo);
@@ -490,7 +492,7 @@
         downGlassTask.setStartCell(startCell);
         downGlassTask.setGlassId(glassInfo.getGlassId());
         downGlassTask.setEndCell(endCell);
-        downGlassTask.setTaskType(taskType + "");
+        downGlassTask.setTaskType(taskType);
         downGlassTask.setWidth((int) glassInfo.getWidth());
         downGlassTask.setHeight((int) glassInfo.getHeight());
         downGlassTask.setFlowCardId(glassInfo.getFlowCardId());
@@ -506,13 +508,13 @@
     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);
-        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);
-        s7control.writeWord(plcMesObject.getPlcParameter("confirmationWord").getAddress(), (short) 1);
+        s7control.writeWord(plcMesObject.getPlcParameter("Glass_width").getAddress(), width);
+        s7control.writeWord(plcMesObject.getPlcParameter("Glass_height").getAddress(), height);
+        s7control.writeWord(plcMesObject.getPlcParameter("Glass_thickness").getAddress(), thickness);
+        s7control.writeWord(plcMesObject.getPlcParameter("Start_cell").getAddress(), startCell);
+        s7control.writeWord(plcMesObject.getPlcParameter("End_cell").getAddress(), endCell);
+        s7control.writeWord(plcMesObject.getPlcParameter("task_type").getAddress(), taskType);
+        s7control.writeWord(plcMesObject.getPlcParameter("confirmationWord").getAddress(), 1);
         return Boolean.TRUE;
     }
 }

--
Gitblit v1.8.0