From f68d3c71819feb59e7a227a5d992b059b900916c Mon Sep 17 00:00:00 2001 From: ZengTao <2773468879@qq.com> Date: 星期五, 28 三月 2025 08:28:26 +0800 Subject: [PATCH] 修改报表,界面添加查询流程卡个数,调整推送数据到前端的间隔 --- hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/impl/UpWorkstationServiceImpl.java | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 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 38aa703..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); + log.info("淇敼璁惧鑱斿姩璇锋眰涓簕}锛�0绂荤嚎锛�1鑱斿姩", inKageWord); S7object.getinstance().plccontrol.writeWord(plcParameterObject.getPlcParameter("InkageStatus").getAddress(), inKageWord); - return "success"; + //璇诲彇plc鐨勫�� + return plcParameterObject.getPlcParameter("InkageStatus").getValue(); } } \ No newline at end of file -- Gitblit v1.8.0