From 044c32c15ee9ccac6f3b60eb6745025e2f4480f2 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期三, 11 十二月 2024 16:59:54 +0800
Subject: [PATCH] 报工回传+库位显示
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCScanQrCodesReport.java | 10 ++--------
1 files changed, 2 insertions(+), 8 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 8977be5..d82f4a8 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
@@ -24,7 +24,7 @@
@Slf4j
public class PLCScanQrCodesReport {
- PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
+ PlcParameterObject plcParameterObject =null;
@Autowired
TaskingService taskingService;
@Autowired
@@ -48,17 +48,11 @@
}
}
- @Scheduled(fixedDelay = 1000)
+ //@Scheduled(fixedDelay = 1000)
public void scanQrCode() {
//鑾峰彇褰撳墠浠诲姟琛ㄦ渶鏂扮殑涓�鍧椾换鍔＄姸鎬�
JSONObject jsonObject = new JSONObject();
//鑾峰彇鎶ヨ鐘舵��
-// 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);
--
Gitblit v1.8.0