From 626531858d84f013c2485aae11d847d75fcd469e Mon Sep 17 00:00:00 2001
From: Tom Li <chinalishuo@gmail.com>
Date: Fri, 9 Jan 2026 11:07:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=BF=87[=E4=BD=9C=E4=B8=9A=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83]id=20=E6=9F=A5=E8=AF=A2=20=E4=BD=9C=E4=B8=9A=E6=A7=BD?=
 =?UTF-8?q?List?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desk/basic/service/IWorkTankService.java  |  7 ++++
 .../service/impl/WorkTankServiceImpl.java     | 40 +++++++++++++------
 2 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IWorkTankService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IWorkTankService.java
index 068c8710..5501deb6 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IWorkTankService.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IWorkTankService.java
@@ -35,4 +35,11 @@ public interface IWorkTankService extends BaseService<WorkTank> {
 	 * @return List<WorkTankExcel>
 	 */
 	List<WorkTankExcel> exportWorkTank(Wrapper<WorkTank> queryWrapper);
+
+    /**
+     * 通过[作业中心]id 查询 作业槽List
+     * @param wcId
+     * @return
+     */
+    List<WorkTank> getListByWcId(Long wcId);
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/WorkTankServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/WorkTankServiceImpl.java
index b5695424..8b4cdb59 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/WorkTankServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/WorkTankServiceImpl.java
@@ -4,16 +4,21 @@
 package org.springblade.desk.basic.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springblade.common.constant.CommonConstant;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.mp.support.Condition;
 import org.springblade.desk.basic.excel.WorkTankExcel;
 import org.springblade.desk.basic.mapper.WorkTankMapper;
 import org.springblade.desk.basic.pojo.entity.WorkTank;
 import org.springblade.desk.basic.pojo.vo.WorkTankVO;
 import org.springblade.desk.basic.service.IWorkTankService;
+import org.springblade.desk.order.pojo.entity.YieldOrderCraft;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -28,19 +33,28 @@ import java.util.List;
 @Data
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)
-public class WorkTankServiceImpl extends BaseServiceImpl<WorkTankMapper, WorkTank> implements IWorkTankService {
+public class WorkTankServiceImpl extends BaseServiceImpl<WorkTankMapper, WorkTank>
+        implements IWorkTankService {
 
-	@Override
-	public IPage<WorkTankVO> selectWorkTankPage(IPage<WorkTankVO> page, WorkTankVO workTank) {
-		return page.setRecords(baseMapper.selectWorkTankPage(page, workTank));
-	}
+    @Override
+    public IPage<WorkTankVO> selectWorkTankPage(IPage<WorkTankVO> page, WorkTankVO workTank) {
+        return page.setRecords(baseMapper.selectWorkTankPage(page, workTank));
+    }
 
-	@Override
-	public List<WorkTankExcel> exportWorkTank(Wrapper<WorkTank> queryWrapper) {
-		List<WorkTankExcel> workTankList = baseMapper.exportWorkTank(queryWrapper);
-		//workTankList.forEach(workTank -> {
-		//	workTank.setTypeName(DictCache.getValue(DictEnum.YES_NO, WorkTank.getType()));
-		//});
-		return workTankList;
-	}
+    @Override
+    public List<WorkTankExcel> exportWorkTank(Wrapper<WorkTank> queryWrapper) {
+        List<WorkTankExcel> workTankList = baseMapper.exportWorkTank(queryWrapper);
+        //workTankList.forEach(workTank -> {
+        //	workTank.setTypeName(DictCache.getValue(DictEnum.YES_NO, WorkTank.getType()));
+        //});
+        return workTankList;
+    }
+
+    @Override
+    public List<WorkTank> getListByWcId(Long wcId) {
+        LambdaQueryWrapper<WorkTank> qw = Wrappers.lambdaQuery(WorkTank.class)
+                .eq(WorkTank::getWorkstationId, wcId)
+                .eq(WorkTank::getIsDeleted, CommonConstant.DELETE_FALSE);
+        return baseMapper.selectList(qw);
+    }
 }