From c136e33dd6aab00015d3e40fee00349eff2bf137 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期六, 14 九月 2024 09:20:47 +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 | 5 +++--
1 files changed, 3 insertions(+), 2 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..8ae22bb 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
@@ -32,9 +32,10 @@
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()));
--
Gitblit v1.8.0