diff --git a/DOAN.Admin.WebApi/Controllers/MES/base/BaseWorkProcessesController.cs b/DOAN.Admin.WebApi/Controllers/MES/base/BaseWorkProcessesController.cs index 8d1010d..d46101a 100644 --- a/DOAN.Admin.WebApi/Controllers/MES/base/BaseWorkProcessesController.cs +++ b/DOAN.Admin.WebApi/Controllers/MES/base/BaseWorkProcessesController.cs @@ -38,7 +38,17 @@ namespace DOAN.Admin.WebApi.Controllers return SUCCESS(response); } - + /// + /// 获取未绑定的工工序 + /// + /// + /// + [HttpPost("list_no_bind")] + public IActionResult QueryBaseWorkRoute_No_bind([FromBody] BaseWorkRouteQueryDto parm) + { + var response = _BaseWorkProcessesService.GetList_No_bind(parm); + return SUCCESS(response); + } /// /// 查询生产工序详情 /// diff --git a/DOAN.Admin.WebApi/Controllers/MES/base/BaseWorkRouteController.cs b/DOAN.Admin.WebApi/Controllers/MES/base/BaseWorkRouteController.cs index 1b99ebd..dbeb4b7 100644 --- a/DOAN.Admin.WebApi/Controllers/MES/base/BaseWorkRouteController.cs +++ b/DOAN.Admin.WebApi/Controllers/MES/base/BaseWorkRouteController.cs @@ -37,8 +37,9 @@ namespace DOAN.Admin.WebApi.Controllers return SUCCESS(response); } + /// - /// 查询工艺路线详情 + /// 查询工艺路线详情s /// /// /// diff --git a/DOAN.Model/MES/base/BaseRelWorkRouteProcesses.cs b/DOAN.Model/MES/base/BaseRelWorkRouteProcesses.cs new file mode 100644 index 0000000..f18cf01 --- /dev/null +++ b/DOAN.Model/MES/base/BaseRelWorkRouteProcesses.cs @@ -0,0 +1,57 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DOAN.Model.MES.base_ +{ + /// + /// 工艺路线与工序绑定表 + /// + [SugarTable("base_rel_work_route_processes")] + public class BaseRelWorkRouteProcesses + { + /// + /// 工艺路线主键 + /// + [SugarColumn(ColumnName = "fk_work_route")] + public int FkWorkRoute { get; set; } + + /// + /// 生产工序主键 + /// + [SugarColumn(ColumnName = "fk_work_processes")] + public int FkWorkProcesses { get; set; } + + /// + /// 排序 + /// + public int Sort { get; set; } + + /// + /// 创建人 + /// + [SugarColumn(ColumnName = "cREATED_BY")] + public string CreatedBy { get; set; } + + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "cREATED_TIME")] + public DateTime? CreatedTime { get; set; } + + /// + /// 更新人 + /// + [SugarColumn(ColumnName = "uPDATED_BY")] + public string UpdatedBy { get; set; } + + /// + /// 更新时间 + /// + [SugarColumn(ColumnName = "uPDATED_TIME")] + public DateTime? UpdatedTime { get; set; } + + } +} \ No newline at end of file diff --git a/DOAN.Service/MES/base/BaseWorkProcessesService.cs b/DOAN.Service/MES/base/BaseWorkProcessesService.cs index ae6d94a..ed5aa66 100644 --- a/DOAN.Service/MES/base/BaseWorkProcessesService.cs +++ b/DOAN.Service/MES/base/BaseWorkProcessesService.cs @@ -38,8 +38,27 @@ namespace DOAN.Service.Business return response; } + /// + /// 查询未绑定工序 + /// + /// + /// + List GetList_No_bind(BaseWorkProcessesQueryDto parm) + { + var predicate = Expressionable.Create() + .AndIF(!string.IsNullOrEmpty(parm.Name), (w, r) => w.Name.Contains(parm.Name)) + .AndIF(!string.IsNullOrEmpty(parm.DictWorkType), (w, r) => w.DictWorkType.Contains(parm.DictWorkType)) + .And((w, r) => r.FkWorkProcesses == null); + + return Context.Queryable() + .InnerJoin((w,r)=>w.Id==r.FkWorkProcesses) + .Where(predicate.ToExpression()) + .Distinct() + .Select((w,r)=>w).ToList().Adapt>(); + } + /// /// 获取详情 /// diff --git a/DOAN.Service/MES/base/IService/IBaseWorkProcessesService.cs b/DOAN.Service/MES/base/IService/IBaseWorkProcessesService.cs index 98616f7..2564dc2 100644 --- a/DOAN.Service/MES/base/IService/IBaseWorkProcessesService.cs +++ b/DOAN.Service/MES/base/IService/IBaseWorkProcessesService.cs @@ -13,7 +13,9 @@ namespace DOAN.Service.MES.base_.IService { PagedInfo GetList(BaseWorkProcessesQueryDto parm); - + + List GetList_No_bind(BaseWorkProcessesQueryDto parm); + BaseWorkProcesses GetInfo(int Id); diff --git a/DOAN.Service/MES/base/IService/IBaseWorkRouteService.cs b/DOAN.Service/MES/base/IService/IBaseWorkRouteService.cs index f4d0ce0..c136d6f 100644 --- a/DOAN.Service/MES/base/IService/IBaseWorkRouteService.cs +++ b/DOAN.Service/MES/base/IService/IBaseWorkRouteService.cs @@ -13,6 +13,9 @@ namespace DOAN.Service.Business.IBusinessService { PagedInfo GetList(BaseWorkRouteQueryDto parm); + List GetList_No_bind(BaseWorkProcessesQueryDto parm); + + BaseWorkRoute GetInfo(int Id); BaseWorkRoute AddBaseWorkRoute(BaseWorkRoute parm);