From d1099b48aecf383fcefbe7b5a7ac3c2de0f0793f Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 06 十一月 2024 23:22:03 +0800
Subject: [PATCH] 1、卧理进出片功能已完成开发，与电气调试中，新增磨边队列表 2、卧理新增历史任务表，记录卧理两台设备执行过的历史数据 3、大理片笼opc任务，新增玻璃进笼计算方式：在笼内存储同炉的多片玻璃，笼内玻璃顺序可不按照固定的顺序进笼 4、上片任务初步完成开发，新增历史任务表记录上片的历史信息
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/impl/UpWorkstationServiceImpl.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/impl/UpWorkstationServiceImpl.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/impl/UpWorkstationServiceImpl.java
index 9949483..ec327ab 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/impl/UpWorkstationServiceImpl.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/impl/UpWorkstationServiceImpl.java
@@ -74,25 +74,28 @@
* 澧炲姞浜哄伐杈撳叆鐨勫伐浣嶇幓鐠冧俊鎭�/鍒犻櫎浜哄伐鎼蛋鐨勭幓鐠冧俊鎭�
*/
@Override
- public void updateGlassMessage(UpWorkstation upwork) {
+ public Boolean updateGlassMessage(UpWorkstation upwork) {
+ int update = 0;
UpdateWrapper<UpWorkstation> updateWrapper = new UpdateWrapper<>();
if (upwork.getWorkstationId() == 1 || upwork.getWorkstationId() == 3) {
updateWrapper.eq("workstation_id", upwork.getWorkstationId());
- int update = this.baseMapper.update(upwork, updateWrapper);
+ update = this.baseMapper.update(upwork, updateWrapper);
} else {
if (upwork.getPatternHeight() > 2700 || upwork.getPatternHeight() == 0) {
updateWrapper.eq("workstation_id", upwork.getWorkstationId());
- int update = this.baseMapper.update(upwork, updateWrapper);
+ update = this.baseMapper.update(upwork, updateWrapper);
}
}
+ return update>0;
}
@Override
public String updateMesInkageLoad(short inKageWord) {
PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
- log.info("淇敼璁惧涓ゆ爧璇锋眰涓簕}锛�0鑱旂嚎锛�1鑱斿姩", inKageWord);
- S7object.getinstance().plccontrol.WriteWord(plcParameterObject.getPlcParameter("InkageStatus").getAddress(), inKageWord);
- return "success";
+ log.info("淇敼璁惧鑱斿姩璇锋眰涓簕}锛�0绂荤嚎锛�1鑱斿姩", inKageWord);
+ S7object.getinstance().plccontrol.writeWord(plcParameterObject.getPlcParameter("InkageStatus").getAddress(), inKageWord);
+ //璇诲彇plc鐨勫��
+ return plcParameterObject.getPlcParameter("InkageStatus").getValue();
}
}
\ No newline at end of file
--
Gitblit v1.8.0