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 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 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 getWorkCenterList(SysFactory sysFactory) { - return sysFactoryMapper.getWorkCenterList(sysFactory); + public AjaxResult getWorkCenterList(SysFactory sysFactory) { + List list= sysFactoryMapper.getWorkCenterList(sysFactory); + return success(list); } /**