From 3dc6d082751ed4e6c1b3d9d05add984cd3d77e7f Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Thu, 25 Jan 2024 16:40:04 +0800
Subject: [PATCH] =?UTF-8?q?2024-1-25-1=20=E5=9F=BA=E7=A1=80=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=A8=A1=E5=9D=97-=E5=B1=95=E7=A4=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=B8=8D=E5=85=A8=E9=97=AE=E9=A2=98-=E4=B8=B4?=
 =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/op/wms/controller/SysFactoryController.java | 7 ++-----
 .../main/java/com/op/wms/service/ISysFactoryService.java | 6 ++++--
 .../com/op/wms/service/impl/SysFactoryServiceImpl.java   | 9 ++++++---
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/SysFactoryController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/SysFactoryController.java
index 69b6ff5a..fa635b09 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/controller/SysFactoryController.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/SysFactoryController.java
@@ -102,11 +102,8 @@ public class SysFactoryController extends BaseController {
 	}
 
 	// 查询工作中心
-//	@RequiresPermissions("wms:factory:getWorkCenterList")
 	@GetMapping("/getWorkCenterList")
-	public TableDataInfo getWorkCenterList(SysFactory sysFactory) {
-		startPage();
-		List<SysFactory> list = sysFactoryService.getWorkCenterList(sysFactory);
-		return getDataTable(list);
+	public AjaxResult getWorkCenterList(SysFactory sysFactory) {
+		return sysFactoryService.getWorkCenterList(sysFactory);
 	}
 }
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/ISysFactoryService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/ISysFactoryService.java
index ce4f9743..331fb7f7 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/ISysFactoryService.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/ISysFactoryService.java
@@ -1,6 +1,8 @@
 package com.op.wms.service;
 
 import java.util.List;
+
+import com.op.common.core.web.domain.AjaxResult;
 import com.op.wms.domain.SysFactory;
 
 /**
@@ -58,8 +60,8 @@ public interface ISysFactoryService {
 	 */
 	public int deleteSysFactoryByFactoryId(Long factoryId);
 
-    //好
-	List<SysFactory> getWorkCenterList(SysFactory sysFactory);
+    //查询工作中心
+	AjaxResult getWorkCenterList(SysFactory sysFactory);
 
 	//新增 判断逻辑
 	boolean checkFactoryCodeUnique(SysFactory sysFactory);
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/SysFactoryServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/SysFactoryServiceImpl.java
index edfec7c2..442ccb4a 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/SysFactoryServiceImpl.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/SysFactoryServiceImpl.java
@@ -4,12 +4,14 @@ import java.util.List;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.op.common.core.utils.DateUtils;
+import com.op.common.core.web.domain.AjaxResult;
 import com.op.common.security.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.op.wms.mapper.SysFactoryMapper;
 import com.op.wms.domain.SysFactory;
 import com.op.wms.service.ISysFactoryService;
+import static com.op.common.core.web.domain.AjaxResult.success;
 
 /**
  * 工厂模型Service业务层处理
@@ -99,15 +101,16 @@ public class SysFactoryServiceImpl implements ISysFactoryService {
 	}
 
 	/**
-	 * 查询工厂模型列表
+	 * 查询工作中心
 	 *
 	 * @param sysFactory 工厂模型
 	 * @return 工厂模型
 	 */
 	@Override
 	@DS("#header.poolName")
-	public List<SysFactory> getWorkCenterList(SysFactory sysFactory) {
-		return sysFactoryMapper.getWorkCenterList(sysFactory);
+	public AjaxResult getWorkCenterList(SysFactory sysFactory) {
+		List<SysFactory> list=  sysFactoryMapper.getWorkCenterList(sysFactory);
+		return success(list);
 	}
 
 	/**