From 865e425cdf7395fece0a53a6def75e2c84d6dbf0 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 15 十月 2024 09:56:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCScanQrCodesReport.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCScanQrCodesReport.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCScanQrCodesReport.java
index ed2e439..8977be5 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCScanQrCodesReport.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCScanQrCodesReport.java
@@ -4,10 +4,12 @@
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;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import com.mes.device.PlcParameterObject;
@@ -27,14 +29,15 @@
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"));
@@ -45,7 +48,7 @@
}
}
-// @Scheduled(fixedDelay = 1000)
+ @Scheduled(fixedDelay = 1000)
public void scanQrCode() {
//鑾峰彇褰撳墠浠诲姟琛ㄦ渶鏂扮殑涓�鍧椾换鍔＄姸鎬�
JSONObject jsonObject = new JSONObject();
@@ -56,7 +59,7 @@
// //log.info("鎶ヨ淇℃伅锛�"+warning);
// jsonObject.append("warning", warning);
// }
- Machine machine=machineMapper.selectById(25L);
+ Machine machine=machineMapper.selectById(23L);
List<Tasking> taskingList=taskingService.findMachineTask(machine);
jsonObject.append("taskingList", taskingList);
jsonObject.append("machine", machine);
--
Gitblit v1.8.0