From 9973bb6887f668cd91f1c4a0b8a7d05f9bd229ad Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期六, 12 十月 2024 14:57:21 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/JiuMuMES
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCEdging.java | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCEdging.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCEdging.java
index 646d6c8..5c3f5a7 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCEdging.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCEdging.java
@@ -3,7 +3,9 @@
import cn.hutool.json.JSONObject;
import com.mes.common.S7object;
import com.mes.device.PlcParameterObject;
+import com.mes.md.entity.Machine;
import com.mes.md.entity.Tasking;
+import com.mes.md.mapper.MachineMapper;
import com.mes.md.service.TaskingService;
import com.mes.tools.WebSocketServer;
import lombok.extern.slf4j.Slf4j;
@@ -25,16 +27,19 @@
PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
@Autowired
TaskingService taskingService;
- @Scheduled(fixedDelay = 500)
+ @Autowired
+ MachineMapper machineMapper;
+ //@Scheduled(fixedDelay = 500)
public void PLCEdging() {
//纾ㄨ竟杩涚墖璇锋眰淇″彿
String edgingSign = plcParameterObject.getPlcParameter("edgingSign").getValue();
if (!Objects.equals(edgingSign, "")){
Tasking glass = new Tasking();
glass.setWorkState("宸ヤ綔");
- glass.setCurrentCraft("纾ㄨ竟");
+ //glass.setCurrentCraft("纾ㄨ竟");
glass.setState("绾夸笂");
- Tasking tasking =taskingService.selectTasking(glass);
+ Tasking tasking =new Tasking();
+ //Tasking tasking =taskingService.selectTasking(glass);
//鍙戦�侀暱瀹藉帤灏哄
S7object.getinstance().plccontrol.writeWord(plcParameterObject.getPlcParameter("length").getAddress(), Integer.parseInt(tasking.getLength().toString()));
S7object.getinstance().plccontrol.writeWord(plcParameterObject.getPlcParameter("width").getAddress(), Integer.parseInt(tasking.getWidth().toString()));
@@ -52,13 +57,21 @@
public void edgingWeb() {
//鑾峰彇褰撳墠浠诲姟琛ㄦ渶鏂扮殑涓�鍧椾换鍔＄姸鎬�
//鑾峰彇鎶ヨ鐘舵��
- String warning = plcParameterObject.getPlcParameter("warning").getValue();
JSONObject jsonObject = new JSONObject();
- if (!Objects.equals(warning, "0")) {
- //log.info("鎶ヨ淇℃伅锛�"+warning);
- jsonObject.append("warning", warning);
- }
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("scanQrCode");
+// String warning = plcParameterObject.getPlcParameter("warning").getValue();
+// if (!Objects.equals(warning, "0")) {
+// //log.info("鎶ヨ淇℃伅锛�"+warning);
+// jsonObject.append("warning", warning);
+// }
+ Machine machine=machineMapper.selectById(5L);
+ List<Tasking> taskingList=taskingService.findMachineTask(machine);
+ jsonObject.append("taskingList", taskingList);
+ jsonObject.append("machine", machine);
+ Machine machineQr=machineMapper.selectById(3L);
+ List<Tasking> taskingListQr=taskingService.findMachineTask(machineQr);
+ jsonObject.append("taskingListQr",taskingListQr );
+ jsonObject.append("machineQR",machineQr );
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("edging");
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
if (webserver != null) {
--
Gitblit v1.8.0