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/md/service/TaskingService.java | 2 +-
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/TaskingServiceImpl.java | 8 ++++++--
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCEdging.java | 2 +-
3 files changed, 8 insertions(+), 4 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()));
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/TaskingService.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/TaskingService.java
index 17381da..fae12ff 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/TaskingService.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/TaskingService.java
@@ -43,7 +43,7 @@
* 鏍规嵁涓嶅悓宸ヨ壓鏌ヨ鍗冲皢涓婄墖鐨勬暟鎹�
* @return List<Tasking>
*/
- Tasking selectTaskLoad(Tasking tasking);
+ Tasking selectTasking(Tasking tasking);
/**
* 鏍规嵁鏍囧噯妯″紡鐨勪换鍔￠『搴忚幏鍙栫幓鐠冩暟鎹�
* @return List<Tasking>
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/TaskingServiceImpl.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/TaskingServiceImpl.java
index 1df3131..0b83559 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/TaskingServiceImpl.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/TaskingServiceImpl.java
@@ -40,6 +40,10 @@
}
+ /**
+ * @param state
+ * @return
+ */
@Override
public boolean updateLoadState(Integer state) {
//鏇存敼鑱旀満鐘舵��
@@ -108,9 +112,9 @@
}
@Override
- public Tasking selectTaskLoad(Tasking tasking) {
+ public Tasking selectTasking(Tasking tasking) {
QueryWrapper<Tasking> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("current_craft",tasking.getGlassId())
+ queryWrapper.eq("current_craft",tasking.getCurrentCraft())
.eq("state",tasking.getState())
.eq("work_state",tasking.getWorkState())
.orderByAsc("glass_id");
--
Gitblit v1.8.0