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/impl/TaskingServiceImpl.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

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