From 916f102b39d6f2e1ce591fd5cdd4204ee6ec9ab0 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期三, 11 九月 2024 09:23:38 +0800
Subject: [PATCH] 冲突方法改名

---
 JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCEdging.java |    2 +-
 1 files changed, 1 insertions(+), 1 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 bda06d5..646d6c8 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
@@ -34,7 +34,7 @@
             glass.setWorkState("宸ヤ綔");
             glass.setCurrentCraft("纾ㄨ竟");
             glass.setState("绾夸笂");
-            Tasking tasking =taskingService.selectTaskLoad(glass);
+            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