From dd46c4f3c54ff837e4c20c8b344a7ca0f0956d2f Mon Sep 17 00:00:00 2001 From: Jimmy <584481786@qq.com> Date: Tue, 4 May 2021 22:59:04 +0800 Subject: [PATCH] =?UTF-8?q?Bom=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BOM_Manager/BOM_ManagerAppService.cs | 107 +++++++++++++++++- .../BOM_Manager/Dto/BOM_ManagerDto.cs | 86 ++++++++++++++ .../BOM_Manager/Dto/BOM_ManagerOutPut.cs | 10 ++ .../Dto/CreateUpdateBOM_ManagerDto.cs | 83 ++++++++++++++ .../BOM_Manager/Dto/GetAllBOM_Manager.cs | 13 +++ .../BOM_Manager/Dto/UpdateBOM_Manager.cs | 27 +++++ .../BOM_Manager/IBOM_ManagerAppService.cs | 16 ++- .../Dto/CreateUpdateFigureNumberDto.cs | 10 +- .../FigureNumber/Dto/FigureNumberDto.cs | 10 +- .../MineTec.ProManager.Application.csproj | 3 - .../ProManagerDbContext.cs | 4 +- 11 files changed, 347 insertions(+), 22 deletions(-) create mode 100644 Code/src/MineTec.ProManager.Application/BOM_Manager/Dto/BOM_ManagerDto.cs create mode 100644 Code/src/MineTec.ProManager.Application/BOM_Manager/Dto/BOM_ManagerOutPut.cs create mode 100644 Code/src/MineTec.ProManager.Application/BOM_Manager/Dto/CreateUpdateBOM_ManagerDto.cs create mode 100644 Code/src/MineTec.ProManager.Application/BOM_Manager/Dto/GetAllBOM_Manager.cs create mode 100644 Code/src/MineTec.ProManager.Application/BOM_Manager/Dto/UpdateBOM_Manager.cs diff --git a/Code/src/MineTec.ProManager.Application/BOM_Manager/BOM_ManagerAppService.cs b/Code/src/MineTec.ProManager.Application/BOM_Manager/BOM_ManagerAppService.cs index 64ea06d..7ccbbc9 100644 --- a/Code/src/MineTec.ProManager.Application/BOM_Manager/BOM_ManagerAppService.cs +++ b/Code/src/MineTec.ProManager.Application/BOM_Manager/BOM_ManagerAppService.cs @@ -1,10 +1,111 @@ -using System; +using Abp.Application.Services; +using Abp.Application.Services.Dto; +using Abp.Collections.Extensions; +using Abp.Domain.Repositories; +using MineTec.ProManager.BOM_Manager.Dto; +using MineTec.ProManager.Commd; +using System; using System.Collections.Generic; -using System.Text; +using System.Linq; namespace MineTec.ProManager.BOM_Manager { - class BOM_ManagerAppService + public class BOM_ManagerAppService : AsyncCrudAppService, IBOM_ManagerAppService + { + private readonly IRepository _BOM_ManagerRepository; + + public BOM_ManagerAppService(IRepository repository, IRepository BOM_ManagerRepository) + : base(repository) + { + _BOM_ManagerRepository = BOM_ManagerRepository; + } + + public OutputBase CreateBOM_Manager(CreateUpdateBOM_ManagerDto input) + { + var result = new OutputBase(); + try + { + var entity = _BOM_ManagerRepository.GetAll().FirstOrDefault(a => a.ProductProjectName == input.ProductProjectName && a.IsDelete == 0); + if (entity == null) + { + _BOM_ManagerRepository.InsertAndGetId(ObjectMapper.Map(input)); + //base.CreateAsync(input); + result.code = 1;//成功 + result.msg = "保存成功！"; + } + else + { + result.code = 2;//重复 + result.msg = "已经存在相同的产品项目名称，请修改！"; + } + } + catch (Exception e) + { + result.code = 0;//失败 + result.msg = e.Message; + } + return result; + } + + public BOM_ManagerOutPut GetAllBOM_Manager(GetAllBOM_Manager input) + { + + var result = new BOM_ManagerOutPut(); + try + { + var query = _BOM_ManagerRepository.GetAll().Where(t => t.IsDelete != 1).WhereIf(!string.IsNullOrEmpty(input.ProductProjectName), t => t.ProductProjectName.Contains(input.ProductProjectName)).WhereIf(!string.IsNullOrEmpty(input.BOMName), t => t.BOMName.Contains(input.BOMName)) + .WhereIf(!string.IsNullOrEmpty(input.BOM_ProductionName), t => t.BOM_ProductionName.Contains(input.BOM_ProductionName)); + var bomcount = query.Count(); + var bomlist = query.ToList(); + var list = ObjectMapper.Map>(bomlist); + result.code = 0; + result.count = bomcount; + result.data = list; + + } + catch (Exception ex) + { + result.msg = ex.Message; + } + + return result; + } + + public OutputBase UpdateBOM_Manager(UpdateBOM_Manager input) + { + + var result = new OutputBase(); + try + { + var query = _BOM_ManagerRepository.GetAll().FirstOrDefault(a => a.Id == input.id); + if (input.IsDelete == 1) + { + query.IsDelete = 1; + } + query.UpdateTime = DateTime.Now; + query.UpdateUserID = input.UpdateUserID; + query.UpdateUserName = input.UpdateUserName; + query.ProductProjectName = input.ProductProjectName; + query.BOMID = input.BOMID; + query.BOMName = input.BOMName; + query.BOM_ProductionID = input.BOM_ProductionID; + query.BOM_ProductionName = input.BOM_ProductionName; + if (!string.IsNullOrEmpty(input.Remark)) + { + query.Remark = input.Remark; + } + result.code = 1;//1成功0失败 + } + catch (Exception ex) + { + result.code = 0; + result.msg = ex.Message; + } + + return result; + } + } } diff --git a/Code/src/MineTec.ProManager.Application/BOM_Manager/Dto/BOM_ManagerDto.cs b/Code/src/MineTec.ProManager.Application/BOM_Manager/Dto/BOM_ManagerDto.cs new file mode 100644 index 0000000..b77f515 --- /dev/null +++ b/Code/src/MineTec.ProManager.Application/BOM_Manager/Dto/BOM_ManagerDto.cs @@ -0,0 +1,86 @@ +using Abp.Application.Services.Dto; +using Abp.AutoMapper; +using System; +using System.ComponentModel.DataAnnotations; + +namespace MineTec.ProManager.BOM_Manager.Dto +{ + [AutoMapFrom(typeof(Entitys.Order.BOM_Manager.BOM_Manager))] + + public class BOM_ManagerDto : EntityDto + { + /// + /// 创建日期 + /// + public DateTime? CreateTime { get; set; } + /// + /// 创建人ID + /// + [StringLength(50)] + public string CreateUserID { get; set; } + /// + /// 创建人姓名 + /// + [StringLength(50)] + public string CreateUserName { get; set; } + /// + /// 修改日期 + /// + public DateTime? UpdateTime { get; set; } + /// + /// 修改人ID + /// + [StringLength(50)] + public string UpdateUserID { get; set; } + /// + /// 修改人名称 + /// + [StringLength(50)] + public string UpdateUserName { get; set; } + /// + /// 产品项目ID + /// + [StringLength(50)] + public string ProductProjectID { get; set; } + /// + /// 产品项目名称 + /// + [StringLength(50)] + public string ProductProjectName { get; set; } + /// + /// 研发BOMID + /// + [StringLength(50)] + public string BOMID { get; set; } + /// + /// 研发BOM名称 + /// + [StringLength(50)] + public string BOMName { get; set; } + /// + /// 生产BOMID + /// + [StringLength(50)] + public string BOM_ProductionID { get; set; } + /// + /// 生产BOM名称 + /// + [StringLength(50)] + public string BOM_ProductionName { get; set; } + /// + /// 备注 + /// + [StringLength(300)] + public string Remark { get; set; } + /// + ///是否关联附件：0 否, 1 是 + /// + public int IsAnnex { get; set; } + /// + ///是否删除：0 否, 1 是 + /// + public int IsDelete { get; set; } + + public DateTime CreationTime { get; set; } + } +} diff --git a/Code/src/MineTec.ProManager.Application/BOM_Manager/Dto/BOM_ManagerOutPut.cs b/Code/src/MineTec.ProManager.Application/BOM_Manager/Dto/BOM_ManagerOutPut.cs new file mode 100644 index 0000000..de9a8d8 --- /dev/null +++ b/Code/src/MineTec.ProManager.Application/BOM_Manager/Dto/BOM_ManagerOutPut.cs @@ -0,0 +1,10 @@ +using MineTec.ProManager.Commd; +using System.Collections.Generic; + +namespace MineTec.ProManager.BOM_Manager.Dto +{ + public class BOM_ManagerOutPut : OutputBase + { + public List data { get; set; } + } +} diff --git a/Code/src/MineTec.ProManager.Application/BOM_Manager/Dto/CreateUpdateBOM_ManagerDto.cs b/Code/src/MineTec.ProManager.Application/BOM_Manager/Dto/CreateUpdateBOM_ManagerDto.cs new file mode 100644 index 0000000..1fb2dd2 --- /dev/null +++ b/Code/src/MineTec.ProManager.Application/BOM_Manager/Dto/CreateUpdateBOM_ManagerDto.cs @@ -0,0 +1,83 @@ +using Abp.Application.Services.Dto; +using System; +using System.ComponentModel.DataAnnotations; + +namespace MineTec.ProManager.BOM_Manager.Dto +{ + public class CreateUpdateBOM_ManagerDto : EntityDto + { + /// + /// 创建日期 + /// + public DateTime? CreateTime { get; set; } + /// + /// 创建人ID + /// + [StringLength(50)] + public string CreateUserID { get; set; } + /// + /// 创建人姓名 + /// + [StringLength(50)] + public string CreateUserName { get; set; } + /// + /// 修改日期 + /// + public DateTime? UpdateTime { get; set; } + /// + /// 修改人ID + /// + [StringLength(50)] + public string UpdateUserID { get; set; } + /// + /// 修改人名称 + /// + [StringLength(50)] + public string UpdateUserName { get; set; } + /// + /// 产品项目ID + /// + [StringLength(50)] + public string ProductProjectID { get; set; } + /// + /// 产品项目名称 + /// + [StringLength(50)] + public string ProductProjectName { get; set; } + /// + /// 研发BOMID + /// + [StringLength(50)] + public string BOMID { get; set; } + /// + /// 研发BOM名称 + /// + [StringLength(50)] + public string BOMName { get; set; } + /// + /// 生产BOMID + /// + [StringLength(50)] + public string BOM_ProductionID { get; set; } + /// + /// 生产BOM名称 + /// + [StringLength(50)] + public string BOM_ProductionName { get; set; } + /// + /// 备注 + /// + [StringLength(300)] + public string Remark { get; set; } + /// + ///是否关联附件：0 否, 1 是 + /// + public int IsAnnex { get; set; } + /// + ///是否删除：0 否, 1 是 + /// + public int IsDelete { get; set; } + + public DateTime CreationTime { get; set; } + } +} diff --git a/Code/src/MineTec.ProManager.Application/BOM_Manager/Dto/GetAllBOM_Manager.cs b/Code/src/MineTec.ProManager.Application/BOM_Manager/Dto/GetAllBOM_Manager.cs new file mode 100644 index 0000000..630e309 --- /dev/null +++ b/Code/src/MineTec.ProManager.Application/BOM_Manager/Dto/GetAllBOM_Manager.cs @@ -0,0 +1,13 @@ +using Abp.Application.Services.Dto; + +namespace MineTec.ProManager.BOM_Manager.Dto +{ + public class GetAllBOM_Manager : PagedResultRequestDto + { + public string ProductProjectName { get; set; } //用于产品名称 + + public string BOMName { get; set; } //用于研发BOM + + public string BOM_ProductionName { get; set; } //用于生产BOM + } +} diff --git a/Code/src/MineTec.ProManager.Application/BOM_Manager/Dto/UpdateBOM_Manager.cs b/Code/src/MineTec.ProManager.Application/BOM_Manager/Dto/UpdateBOM_Manager.cs new file mode 100644 index 0000000..18ae3ca --- /dev/null +++ b/Code/src/MineTec.ProManager.Application/BOM_Manager/Dto/UpdateBOM_Manager.cs @@ -0,0 +1,27 @@ +using System; + +namespace MineTec.ProManager.BOM_Manager.Dto +{ + public class UpdateBOM_Manager + { + public Guid id { get; set; } //主键 + + public string UpdateUserID { get; set; }//更新用户ID + + public string UpdateUserName { get; set; }//更新用户姓名 + + public string ProductProjectName { get; set; }//产品项目名称 + + public string BOMID { get; set; }//研发BOMID + + public string BOMName { get; set; }//研发BOM名称 + + public string BOM_ProductionID { get; set; }//生产BOMID + + public string BOM_ProductionName { get; set; }//生产BOM名称 + + public string Remark { get; set; } //备注 + + public int IsDelete { get; set; }//是否删除 + } +} diff --git a/Code/src/MineTec.ProManager.Application/BOM_Manager/IBOM_ManagerAppService.cs b/Code/src/MineTec.ProManager.Application/BOM_Manager/IBOM_ManagerAppService.cs index ed34790..11cd912 100644 --- a/Code/src/MineTec.ProManager.Application/BOM_Manager/IBOM_ManagerAppService.cs +++ b/Code/src/MineTec.ProManager.Application/BOM_Manager/IBOM_ManagerAppService.cs @@ -1,10 +1,18 @@ -using System; -using System.Collections.Generic; -using System.Text; +using Abp.Application.Services; +using Abp.Application.Services.Dto; +using MineTec.ProManager.BOM_Manager.Dto; +using System; namespace MineTec.ProManager.BOM_Manager { - class IBOM_ManagerAppService + public interface IBOM_ManagerAppService : IAsyncCrudAppService //用于更新BOM管理表单 { + + } } diff --git a/Code/src/MineTec.ProManager.Application/FigureNumber/Dto/CreateUpdateFigureNumberDto.cs b/Code/src/MineTec.ProManager.Application/FigureNumber/Dto/CreateUpdateFigureNumberDto.cs index 0ccdb13..421d800 100644 --- a/Code/src/MineTec.ProManager.Application/FigureNumber/Dto/CreateUpdateFigureNumberDto.cs +++ b/Code/src/MineTec.ProManager.Application/FigureNumber/Dto/CreateUpdateFigureNumberDto.cs @@ -16,12 +16,12 @@ namespace MineTec.ProManager.FigureNumber.Dto /// 创建人ID /// [StringLength(50)] - public string? CreateUserID { get; set; } + public string CreateUserID { get; set; } /// /// 创建人姓名 /// [StringLength(50)] - public string? CreateUserName { get; set; } + public string CreateUserName { get; set; } /// /// 修改日期 /// @@ -30,12 +30,12 @@ namespace MineTec.ProManager.FigureNumber.Dto /// 修改人ID /// [StringLength(50)] - public string? UpdateUserID { get; set; } + public string UpdateUserID { get; set; } /// /// 修改人名称 /// [StringLength(50)] - public string? UpdateUserName { get; set; } + public string UpdateUserName { get; set; } /// /// 图号编码 /// @@ -44,7 +44,7 @@ namespace MineTec.ProManager.FigureNumber.Dto /// 备注 /// [StringLength(300)] - public string? Remark { get; set; } + public string Remark { get; set; } /// ///是否删除：0 否, 1 是 /// diff --git a/Code/src/MineTec.ProManager.Application/FigureNumber/Dto/FigureNumberDto.cs b/Code/src/MineTec.ProManager.Application/FigureNumber/Dto/FigureNumberDto.cs index ef9db10..3e5d5d2 100644 --- a/Code/src/MineTec.ProManager.Application/FigureNumber/Dto/FigureNumberDto.cs +++ b/Code/src/MineTec.ProManager.Application/FigureNumber/Dto/FigureNumberDto.cs @@ -16,12 +16,12 @@ namespace MineTec.ProManager.FigureNumber.Dto /// 创建人ID /// [StringLength(50)] - public string? CreateUserID { get; set; } + public string CreateUserID { get; set; } /// /// 创建人姓名 /// [StringLength(50)] - public string? CreateUserName { get; set; } + public string CreateUserName { get; set; } /// /// 修改日期 /// @@ -30,12 +30,12 @@ namespace MineTec.ProManager.FigureNumber.Dto /// 修改人ID /// [StringLength(50)] - public string? UpdateUserID { get; set; } + public string UpdateUserID { get; set; } /// /// 修改人名称 /// [StringLength(50)] - public string? UpdateUserName { get; set; } + public string UpdateUserName { get; set; } /// /// 图号编码 /// @@ -44,7 +44,7 @@ namespace MineTec.ProManager.FigureNumber.Dto /// 备注 /// [StringLength(300)] - public string? Remark { get; set; } + public string Remark { get; set; } /// ///是否删除：0 否, 1 是 /// diff --git a/Code/src/MineTec.ProManager.Application/MineTec.ProManager.Application.csproj b/Code/src/MineTec.ProManager.Application/MineTec.ProManager.Application.csproj index f7c1002..c7c927a 100644 --- a/Code/src/MineTec.ProManager.Application/MineTec.ProManager.Application.csproj +++ b/Code/src/MineTec.ProManager.Application/MineTec.ProManager.Application.csproj @@ -13,7 +13,4 @@ - - - \ No newline at end of file diff --git a/Code/src/MineTec.ProManager.EntityFrameworkCore/EntityFrameworkCore/ProManagerDbContext.cs b/Code/src/MineTec.ProManager.EntityFrameworkCore/EntityFrameworkCore/ProManagerDbContext.cs index b75257d..9e344b4 100644 --- a/Code/src/MineTec.ProManager.EntityFrameworkCore/EntityFrameworkCore/ProManagerDbContext.cs +++ b/Code/src/MineTec.ProManager.EntityFrameworkCore/EntityFrameworkCore/ProManagerDbContext.cs @@ -38,8 +38,8 @@ namespace MineTec.ProManager.EntityFrameworkCore public DbSet BOMDetails_Production { get; set; } - - + public DbSet BOM_Manager { get; set; } + //视图：添加新表时，若需要更新数据库，需先注释下面的视图注册代码