From d1ee3f0300368709a246c37bf5e525f69eb1dbf7 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期二, 03 十二月 2024 09:21:28 +0800
Subject: [PATCH] job漏提交文件
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCScanQRVerify.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCScanQRVerify.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCScanQRVerify.java
index 85a7953..b8849cf 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCScanQRVerify.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCScanQRVerify.java
@@ -3,6 +3,7 @@
import cn.hutool.json.JSONObject;
import com.mes.common.S7object;
import com.mes.device.PlcParameterObject;
+import com.mes.md.entity.Tasking;
import com.mes.md.service.TaskingService;
import com.mes.tools.WebSocketServer;
import lombok.extern.slf4j.Slf4j;
@@ -21,28 +22,31 @@
@Slf4j
public class PLCScanQRVerify {
- PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
+ PlcParameterObject plcParameterObject =null;
@Autowired
TaskingService taskingService;
- @Scheduled(fixedDelay = 500)
+ //@Scheduled(fixedDelay = 500)
public void plcScanQrVerify() {
//鑾峰彇褰撳墠浠诲姟琛ㄦ渶鏂扮殑涓�鍧椾换鍔＄姸鎬�
//鎵爜纭绾跨▼
- //鐢垫皵鍘绘牴鎹笂涓�涓换鍔′紶閫掍笅鏉ョ殑鐘舵�佽嚜宸卞垽鏂渶涓嶉渶瑕佹壂鐮�,濡傛灉闇�瑕佹壂鐮佺洿鎺ヤ紶杈撴壂鐮乮d
String scanId = plcParameterObject.getPlcParameter("scanId").getValue();
+ Tasking tasking =new Tasking();
+ tasking.setScanId(scanId);
if(!Objects.equals(scanId, "")){
- boolean result = taskingService.updateTasking(scanId);
+ //鏇存柊浠诲姟琛ㄧ姸鎬�
+ boolean result = taskingService.updateTaskingState(tasking);
if (result){
//娣诲姞鎴愬姛鏃跺彂閫佽繃鐗囦俊鍙�
S7object.getinstance().plccontrol.writeWord(plcParameterObject.getPlcParameter("scan").getAddress(), Integer.parseInt("1"));
}
- log.info("鎵弿瀹氬埗浜岀淮鐮侊細"+scanId);
}else {
+ //鎵爜澶辫触鏃跺彂閫佽鍛婏紝浜岀淮鐮佹秷澶�
+ S7object.getinstance().plccontrol.writeWord(plcParameterObject.getPlcParameter("deficiency").getAddress(), Integer.parseInt("1"));
log.info("鏍囧噯妯″紡鎵弿浜岀淮鐮侊細鏃�");
}
}
- @Scheduled(fixedDelay = 1000)
+ //@Scheduled(fixedDelay = 1000)
public void scanQrCode() {
//鑾峰彇褰撳墠浠诲姟琛ㄦ渶鏂扮殑涓�鍧椾换鍔＄姸鎬�
//鑾峰彇鎶ヨ鐘舵��
--
Gitblit v1.8.0