From 134c3849c93a849863ae2a7b7013fe04fc554b27 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 27 五月 2024 14:30:53 +0800
Subject: [PATCH] 1、卧式理片笼线程改造：新增层数 总层数 详情表增加工程id 按照玻璃尺寸、膜系、层数、工程等交换玻璃信息 2、websocket漏提代码
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/impl/UpWorkstationServiceImpl.java | 14 ++++++++------
1 files changed, 8 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 2781919..a9d15bf 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
@@ -18,7 +18,7 @@
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author zhoush
@@ -36,10 +36,11 @@
//鍒ゆ柇浼樺厛鍚哥墖浣嶇疆鍚庡彂閫佸嚭鐗囦换鍔�
+ @Override
public UpPattenUsage selectPriority(Engineering engineering) {
- QueryWrapper<UpPattenUsage> wrapper=new QueryWrapper<>();
+ QueryWrapper<UpPattenUsage> wrapper = new QueryWrapper<>();
wrapper.eq("state", 0)
- .eq("engineering_id",engineering.getEngineerId())
+ .eq("engineering_id", engineering.getEngineerId())
.orderByAsc("layout_sequence")
.last("limit 1");
return upPattenUsageMapper.selectOne(wrapper);
@@ -65,7 +66,7 @@
wrapper.eq("id", upworkId)
.setSql("number = number - 1");
boolean updateResult = upWorkstationMapper.update(null, wrapper) > 0;
- log.info("鍑忓皯宸ヤ綅鏁伴噺{}",updateResult);
+ log.info("鍑忓皯宸ヤ綅鏁伴噺{}", updateResult);
}
@@ -84,12 +85,13 @@
int update = this.baseMapper.update(upwork, updateWrapper);
}
}
+ }
@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);
+ log.info("淇敼璁惧鑱斿姩璇锋眰涓簕}锛�0绂荤嚎锛�1鑱斿姩", inKageWord);
+ S7object.getinstance().plccontrol.writeWord(plcParameterObject.getPlcParameter("InkageStatus").getAddress(), inKageWord);
return "success";
}
--
Gitblit v1.8.0