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/PLCScanQrCodesReport.java | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCScanQR.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCScanQrCodesReport.java
similarity index 70%
rename from JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCScanQR.java
rename to JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCScanQrCodesReport.java
index 431f056..8977be5 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCScanQR.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCScanQrCodesReport.java
@@ -1,7 +1,10 @@
package com.mes.job;
import cn.hutool.json.JSONObject;
import com.mes.common.S7object;
+import com.mes.md.entity.Machine;
import com.mes.md.entity.Tasking;
+import com.mes.md.mapper.MachineMapper;
+import com.mes.md.service.PrimitiveTaskService;
import com.mes.md.service.TaskingService;
import com.mes.tools.WebSocketServer;
import lombok.extern.slf4j.Slf4j;
@@ -19,19 +22,22 @@
*/
@Component
@Slf4j
-public class PLCScanQR {
+public class PLCScanQrCodesReport {
PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
@Autowired
TaskingService taskingService;
+ @Autowired
+ MachineMapper machineMapper;
+ @Autowired
+ PrimitiveTaskService primitiveTaskService;
//@Scheduled(fixedDelay = 500)
public void pLCScanQR() {
//鑾峰彇褰撳墠浠诲姟琛ㄦ渶鏂扮殑涓�鍧椾换鍔＄姸鎬�
//鎵爜绾跨▼
- //鐢垫皵鍘绘牴鎹笂涓�涓换鍔′紶閫掍笅鏉ョ殑鐘舵�佽嚜宸卞垽鏂渶涓嶉渶瑕佹壂鐮�,濡傛灉闇�瑕佹壂鐮佺洿鎺ヤ紶杈撴壂鐮乮d
String scanId = plcParameterObject.getPlcParameter("scanId").getValue();
if(!Objects.equals(scanId, "")){
- boolean result = taskingService.insertTaskingPro(scanId);
+ boolean result = primitiveTaskService.updateReportCount(scanId);
if (result){
//娣诲姞鎴愬姛鏃跺彂閫佽繃鐗囦俊鍙�
S7object.getinstance().plccontrol.writeWord(plcParameterObject.getPlcParameter("scan").getAddress(), Integer.parseInt("1"));
@@ -42,17 +48,22 @@
}
}
- //@Scheduled(fixedDelay = 1000)
+ @Scheduled(fixedDelay = 1000)
public void scanQrCode() {
//鑾峰彇褰撳墠浠诲姟琛ㄦ渶鏂扮殑涓�鍧椾换鍔＄姸鎬�
- //鑾峰彇鎶ヨ鐘舵��
- 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(23L);
+ List<Tasking> taskingList=taskingService.findMachineTask(machine);
+ jsonObject.append("taskingList", taskingList);
+ jsonObject.append("machine", machine);
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("scanQrCodesReport");
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
if (webserver != null) {
--
Gitblit v1.8.0