diff --git a/DOAN.Admin.WebApi/Controllers/JobKanban/LoginOrSetController.cs b/DOAN.Admin.WebApi/Controllers/JobKanban/LoginOrSetController.cs new file mode 100644 index 0000000..bd664ca --- /dev/null +++ b/DOAN.Admin.WebApi/Controllers/JobKanban/LoginOrSetController.cs @@ -0,0 +1,45 @@ +using Microsoft.AspNetCore.Mvc; + +using DOAN.Admin.WebApi.Filters; +using DOAN.Service.JobKanban; +using DOAN.Service.JobKanban.IService; +using Aliyun.OSS; + +//创建时间:2024-07-08 +namespace DOAN.Admin.WebApi.Controllers.JobKanban +{ + /// + /// 客户信息 + /// + [Verify] + [Route("kanban/loginOrsetting")] + public class LoginOrSetController : BaseController + { + /// + /// 客户信息接口 + /// + private readonly ILoginOrSetService _LoginOrSetService; + + public LoginOrSetController(ILoginOrSetService LoginOrSetService) + { + _LoginOrSetService = LoginOrSetService; + } + + + + /// + /// 获取组 + /// + /// + public IActionResult GetGroupList() + { + + var response = _LoginOrSetService.GetGroupList(); + return SUCCESS(response); + } + + + + + } +} \ No newline at end of file diff --git a/DOAN.Admin.WebApi/Controllers/MES/base/BaseCustomController.cs b/DOAN.Admin.WebApi/Controllers/MES/base/BaseCustomController.cs index 802f867..f793d29 100644 --- a/DOAN.Admin.WebApi/Controllers/MES/base/BaseCustomController.cs +++ b/DOAN.Admin.WebApi/Controllers/MES/base/BaseCustomController.cs @@ -12,7 +12,7 @@ namespace DOAN.Admin.WebApi.Controllers /// 客户信息 /// [Verify] - [Route("baseManagement/BaseCustom")] + [Route("mes/baseManagement/BaseCustom")] public class BaseCustomController : BaseController { /// diff --git a/DOAN.Admin.WebApi/DOAN.WebApi.csproj b/DOAN.Admin.WebApi/DOAN.WebApi.csproj index 36c8b6d..633b814 100644 --- a/DOAN.Admin.WebApi/DOAN.WebApi.csproj +++ b/DOAN.Admin.WebApi/DOAN.WebApi.csproj @@ -38,7 +38,6 @@ - diff --git a/DOAN.Service/DOAN.Service.csproj b/DOAN.Service/DOAN.Service.csproj index 1dc82a8..5e77230 100644 --- a/DOAN.Service/DOAN.Service.csproj +++ b/DOAN.Service/DOAN.Service.csproj @@ -29,8 +29,5 @@ Always - - - diff --git a/DOAN.Service/JobKanban/IService/ILoginOrSetService.cs b/DOAN.Service/JobKanban/IService/ILoginOrSetService.cs new file mode 100644 index 0000000..f6f8d73 --- /dev/null +++ b/DOAN.Service/JobKanban/IService/ILoginOrSetService.cs @@ -0,0 +1,15 @@ +using DOAN.Model.MES.base_; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DOAN.Service.JobKanban.IService +{ + public interface ILoginOrSetService + { + + List GetGroupList(); + } +} diff --git a/DOAN.Service/JobKanban/LoginOrSetService.cs b/DOAN.Service/JobKanban/LoginOrSetService.cs new file mode 100644 index 0000000..9ad65c2 --- /dev/null +++ b/DOAN.Service/JobKanban/LoginOrSetService.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using DOAN.Model.MES.andon; +using DOAN.Model.MES.base_; +using DOAN.Service.JobKanban.IService; +using DOAN.Service.MES.andon.IService; +using Infrastructure.Attribute; + +namespace DOAN.Service.JobKanban +{ + + [AppService(ServiceType = typeof(ILoginOrSetService), ServiceLifetime = LifeTime.Transient)] + public class LoginOrSetService : BaseService, ILoginOrSetService + { + + public List GetGroupList() + { + return Context.Queryable().Where(it=>it.Status==1).ToList(); + } + + } + +}