From 7fd37a99f4bf0a3f2955e60436c63e59b58054f4 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期六, 10 八月 2024 09:10:11 +0800
Subject: [PATCH] 新增自动报工功能,磨边队列,下片队列增加查询条件

---
 hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/service/impl/WorkAssignmentServiceImpl.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/service/impl/WorkAssignmentServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/service/impl/WorkAssignmentServiceImpl.java
index e80cce6..1bef12b 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/service/impl/WorkAssignmentServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/work_assignment/service/impl/WorkAssignmentServiceImpl.java
@@ -7,6 +7,8 @@
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  *  鏈嶅姟瀹炵幇绫�
@@ -25,11 +27,11 @@
      * @return
      */
     @Override
-    public WorkAssignment selectWorkAssignment(int line, String workingProcedure){
+    public List<WorkAssignment> selectWorkAssignment(String line, String workingProcedure){
         LambdaQueryWrapper<WorkAssignment> workAssignmentSelectWrapper=new LambdaQueryWrapper<>();
         workAssignmentSelectWrapper
                 .eq(WorkAssignment::getLine,line)
                 .eq(WorkAssignment::getWorkProcesses,workingProcedure);
-        return baseMapper.selectOne(workAssignmentSelectWrapper);
+        return baseMapper.selectList(workAssignmentSelectWrapper);
     }
 }

--
Gitblit v1.8.0