diff --git a/Admin.NET/Admin.NET.Application/Entity/Distributor.cs b/Admin.NET/Admin.NET.Application/Entity/Distributor.cs new file mode 100644 index 0000000..a3ead91 --- /dev/null +++ b/Admin.NET/Admin.NET.Application/Entity/Distributor.cs @@ -0,0 +1,76 @@ +using Admin.NET.Core; +namespace Admin.NET.Application.Entity; + +/// +/// 分销商 +/// +[SugarTable("Distributor","分销商")] +public class Distributor : EntityTenant +{ + /// + /// 名称 + /// + [SugarColumn(ColumnName = "Name", ColumnDescription = "名称", Length = 32)] + public string? Name { get; set; } + + /// + /// 编码 + /// + [SugarColumn(ColumnName = "CodeNum", ColumnDescription = "编码", Length = 32)] + public string? CodeNum { get; set; } + + /// + /// 简称 + /// + [SugarColumn(ColumnName = "SorName", ColumnDescription = "简称", Length = 32)] + public string? SorName { get; set; } + + /// + /// 状态 + /// + [SugarColumn(ColumnName = "Status", ColumnDescription = "状态")] + public int? Status { get; set; } + + /// + /// 联系人 + /// + [SugarColumn(ColumnName = "Contacts", ColumnDescription = "联系人", Length = 32)] + public string? Contacts { get; set; } + + /// + /// 电话 + /// + [SugarColumn(ColumnName = "Tel", ColumnDescription = "电话", Length = 32)] + public string? Tel { get; set; } + + /// + /// 所有者账号 + /// + [SugarColumn(ColumnName = "UserName", ColumnDescription = "所有者账号", Length = 32)] + public string? UserName { get; set; } + + /// + /// 品牌 + /// + [SugarColumn(ColumnName = "Brand", ColumnDescription = "品牌", Length = 32)] + public string? Brand { get; set; } + + /// + /// 上级分销商 + /// + [SugarColumn(ColumnName = "SuperiorDistributor", ColumnDescription = "上级分销商", Length = 32)] + public string? SuperiorDistributor { get; set; } + + /// + /// 地址 + /// + [SugarColumn(ColumnName = "Address", ColumnDescription = "地址", Length = 64)] + public string? Address { get; set; } + + /// + /// 备注 + /// + [SugarColumn(ColumnName = "Remarks", ColumnDescription = "备注", Length = 64)] + public string? Remarks { get; set; } + +} diff --git a/Admin.NET/Admin.NET.Application/Entity/Supplier.cs b/Admin.NET/Admin.NET.Application/Entity/Supplier.cs new file mode 100644 index 0000000..2edc8db --- /dev/null +++ b/Admin.NET/Admin.NET.Application/Entity/Supplier.cs @@ -0,0 +1,52 @@ +using Admin.NET.Core; +namespace Admin.NET.Application.Entity; + +/// +/// 供应商 +/// +[SugarTable("Supplier","供应商")] +public class Supplier : EntityTenant +{ + /// + /// 供应商名称 + /// + [SugarColumn(ColumnName = "Name", ColumnDescription = "供应商名称", Length = 64)] + public string? Name { get; set; } + + /// + /// 联系人 + /// + [SugarColumn(ColumnName = "Contacts", ColumnDescription = "联系人", Length = 32)] + public string? Contacts { get; set; } + + /// + /// 电话 + /// + [SugarColumn(ColumnName = "Tel", ColumnDescription = "电话", Length = 32)] + public string? Tel { get; set; } + + /// + /// 企业类型 + /// + [SugarColumn(ColumnName = "CompanyType", ColumnDescription = "企业类型", Length = 32)] + public string? CompanyType { get; set; } + + /// + /// 职务 + /// + [SugarColumn(ColumnName = "Duties", ColumnDescription = "职务", Length = 32)] + public string? Duties { get; set; } + + /// + /// 地址 + /// + [SugarColumn(ColumnName = "Address", ColumnDescription = "地址", Length = 64)] + public string? Address { get; set; } + + /// + /// 备注 + /// + [SugarColumn(ColumnName = "Remarks", ColumnDescription = "备注", Length = 32)] + public string? Remarks { get; set; } + +} diff --git a/Admin.NET/Admin.NET.Application/Service/Brand/BrandService.cs b/Admin.NET/Admin.NET.Application/Service/Brand/BrandService.cs index 4eea8d0..b84f821 100644 --- a/Admin.NET/Admin.NET.Application/Service/Brand/BrandService.cs +++ b/Admin.NET/Admin.NET.Application/Service/Brand/BrandService.cs @@ -24,7 +24,7 @@ public class BrandService : IDynamicApiController, ITransient [ApiDescriptionSettings(Name = "Page")] public async Task> Page(BrandInput input) { - var query = _rep.AsQueryable() + var query = _rep.AsQueryable().Where(a => !a.IsDelete) .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u => u.Name.Contains(input.SearchKey.Trim()) || u.CodeNum.Contains(input.SearchKey.Trim()) diff --git a/Admin.NET/Admin.NET.Application/Service/CodePakageConfiguration/CodePakageConfigurationService.cs b/Admin.NET/Admin.NET.Application/Service/CodePakageConfiguration/CodePakageConfigurationService.cs index 76ed76b..8c30864 100644 --- a/Admin.NET/Admin.NET.Application/Service/CodePakageConfiguration/CodePakageConfigurationService.cs +++ b/Admin.NET/Admin.NET.Application/Service/CodePakageConfiguration/CodePakageConfigurationService.cs @@ -24,7 +24,7 @@ public class CodePakageConfigurationService : IDynamicApiController, ITransient [ApiDescriptionSettings(Name = "Page")] public async Task> Page(CodePakageConfigurationInput input) { - var query = _rep.AsQueryable() + var query = _rep.AsQueryable().Where(a => !a.IsDelete) .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u => u.Name.Contains(input.SearchKey.Trim()) ) diff --git a/Admin.NET/Admin.NET.Application/Service/CodeRuleByInfomation/CodeRuleByInfomationService.cs b/Admin.NET/Admin.NET.Application/Service/CodeRuleByInfomation/CodeRuleByInfomationService.cs index a084ece..9faefa2 100644 --- a/Admin.NET/Admin.NET.Application/Service/CodeRuleByInfomation/CodeRuleByInfomationService.cs +++ b/Admin.NET/Admin.NET.Application/Service/CodeRuleByInfomation/CodeRuleByInfomationService.cs @@ -24,7 +24,7 @@ public class CodeRuleByInfomationService : IDynamicApiController, ITransient [ApiDescriptionSettings(Name = "Page")] public async Task> Page(CodeRuleByInfomationInput input) { - var query = _rep.AsQueryable() + var query = _rep.AsQueryable().Where(a => !a.IsDelete) .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u => u.Name.Contains(input.SearchKey.Trim()) || u.CodeNum.Contains(input.SearchKey.Trim()) diff --git a/Admin.NET/Admin.NET.Application/Service/CodeRuleByReceipt/CodeRuleByReceiptService.cs b/Admin.NET/Admin.NET.Application/Service/CodeRuleByReceipt/CodeRuleByReceiptService.cs index 97229ab..46b6c8a 100644 --- a/Admin.NET/Admin.NET.Application/Service/CodeRuleByReceipt/CodeRuleByReceiptService.cs +++ b/Admin.NET/Admin.NET.Application/Service/CodeRuleByReceipt/CodeRuleByReceiptService.cs @@ -24,7 +24,7 @@ public class CodeRuleByReceiptService : IDynamicApiController, ITransient [ApiDescriptionSettings(Name = "Page")] public async Task> Page(CodeRuleByReceiptInput input) { - var query = _rep.AsQueryable() + var query = _rep.AsQueryable().Where(a => !a.IsDelete) .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u => u.CodeNum.Contains(input.SearchKey.Trim()) || u.Name.Contains(input.SearchKey.Trim()) diff --git a/Admin.NET/Admin.NET.Application/Service/Custom/CustomService.cs b/Admin.NET/Admin.NET.Application/Service/Custom/CustomService.cs index 9089a36..0dd34c6 100644 --- a/Admin.NET/Admin.NET.Application/Service/Custom/CustomService.cs +++ b/Admin.NET/Admin.NET.Application/Service/Custom/CustomService.cs @@ -24,7 +24,7 @@ public class CustomService : IDynamicApiController, ITransient [ApiDescriptionSettings(Name = "Page")] public async Task> Page(CustomInput input) { - var query = _rep.AsQueryable() + var query = _rep.AsQueryable().Where(a => !a.IsDelete) .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u => u.Name.Contains(input.SearchKey.Trim()) || u.CodeNum.Contains(input.SearchKey.Trim()) diff --git a/Admin.NET/Admin.NET.Application/Service/Custom/CustonClassifyService.cs b/Admin.NET/Admin.NET.Application/Service/Custom/CustonClassifyService.cs index 8959b6b..60123dc 100644 --- a/Admin.NET/Admin.NET.Application/Service/Custom/CustonClassifyService.cs +++ b/Admin.NET/Admin.NET.Application/Service/Custom/CustonClassifyService.cs @@ -24,7 +24,7 @@ public class CustonClassifyService : IDynamicApiController, ITransient [ApiDescriptionSettings(Name = "Page")] public async Task> Page(CustonClassifyInput input) { - var query = _rep.AsQueryable() + var query = _rep.AsQueryable().Where(a => !a.IsDelete) .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u => u.Name.Contains(input.SearchKey.Trim()) ) diff --git a/Admin.NET/Admin.NET.Application/Service/Distributor/DistributorService.cs b/Admin.NET/Admin.NET.Application/Service/Distributor/DistributorService.cs new file mode 100644 index 0000000..be541ba --- /dev/null +++ b/Admin.NET/Admin.NET.Application/Service/Distributor/DistributorService.cs @@ -0,0 +1,123 @@ +using Admin.NET.Core.Service; +using Admin.NET.Application.Const; +using Admin.NET.Application.Entity; +using Microsoft.AspNetCore.Http; +namespace Admin.NET.Application; +/// +/// 分销商服务 +/// +[ApiDescriptionSettings(ApplicationConst.GroupName, Order = 100)] +public class DistributorService : IDynamicApiController, ITransient +{ + private readonly SqlSugarRepository _rep; + public DistributorService(SqlSugarRepository rep) + { + _rep = rep; + } + + /// + /// 分页查询分销商 + /// + /// + /// + [HttpPost] + [ApiDescriptionSettings(Name = "Page")] + public async Task> Page(DistributorInput input) + { + var query = _rep.AsQueryable().Where(a => !a.IsDelete) + .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u => + u.Name.Contains(input.SearchKey.Trim()) + || u.CodeNum.Contains(input.SearchKey.Trim()) + || u.SorName.Contains(input.SearchKey.Trim()) + || u.Contacts.Contains(input.SearchKey.Trim()) + || u.Tel.Contains(input.SearchKey.Trim()) + || u.UserName.Contains(input.SearchKey.Trim()) + || u.Brand.Contains(input.SearchKey.Trim()) + || u.SuperiorDistributor.Contains(input.SearchKey.Trim()) + || u.Address.Contains(input.SearchKey.Trim()) + || u.Remarks.Contains(input.SearchKey.Trim()) + ) + .WhereIF(!string.IsNullOrWhiteSpace(input.Name), u => u.Name.Contains(input.Name.Trim())) + .WhereIF(!string.IsNullOrWhiteSpace(input.CodeNum), u => u.CodeNum.Contains(input.CodeNum.Trim())) + .WhereIF(!string.IsNullOrWhiteSpace(input.SorName), u => u.SorName.Contains(input.SorName.Trim())) + .WhereIF(input.Status>0, u => u.Status == input.Status) + .WhereIF(!string.IsNullOrWhiteSpace(input.Contacts), u => u.Contacts.Contains(input.Contacts.Trim())) + .WhereIF(!string.IsNullOrWhiteSpace(input.Tel), u => u.Tel.Contains(input.Tel.Trim())) + .WhereIF(!string.IsNullOrWhiteSpace(input.UserName), u => u.UserName.Contains(input.UserName.Trim())) + .WhereIF(!string.IsNullOrWhiteSpace(input.Brand), u => u.Brand.Contains(input.Brand.Trim())) + .WhereIF(!string.IsNullOrWhiteSpace(input.SuperiorDistributor), u => u.SuperiorDistributor.Contains(input.SuperiorDistributor.Trim())) + .WhereIF(!string.IsNullOrWhiteSpace(input.Address), u => u.Address.Contains(input.Address.Trim())) + .WhereIF(!string.IsNullOrWhiteSpace(input.Remarks), u => u.Remarks.Contains(input.Remarks.Trim())) + .Select(); + return await query.OrderBuilder(input).ToPagedListAsync(input.Page, input.PageSize); + } + + /// + /// 增加分销商 + /// + /// + /// + [HttpPost] + [ApiDescriptionSettings(Name = "Add")] + public async Task Add(AddDistributorInput input) + { + var entity = input.Adapt(); + await _rep.InsertAsync(entity); + return entity.Id; + } + + /// + /// 删除分销商 + /// + /// + /// + [HttpPost] + [ApiDescriptionSettings(Name = "Delete")] + public async Task Delete(DeleteDistributorInput input) + { + var entity = await _rep.GetFirstAsync(u => u.Id == input.Id) ?? throw Oops.Oh(ErrorCodeEnum.D1002); + await _rep.FakeDeleteAsync(entity); //假删除 + //await _rep.DeleteAsync(entity); //真删除 + } + + /// + /// 更新分销商 + /// + /// + /// + [HttpPost] + [ApiDescriptionSettings(Name = "Update")] + public async Task Update(UpdateDistributorInput input) + { + var entity = input.Adapt(); + await _rep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); + } + + /// + /// 获取分销商 + /// + /// + /// + [HttpGet] + [ApiDescriptionSettings(Name = "Detail")] + public async Task Detail([FromQuery] QueryByIdDistributorInput input) + { + return await _rep.GetFirstAsync(u => u.Id == input.Id); + } + + /// + /// 获取分销商列表 + /// + /// + /// + [HttpGet] + [ApiDescriptionSettings(Name = "List")] + public async Task> List() + { + return await _rep.AsQueryable().Select().ToListAsync(); + } + + + +} + diff --git a/Admin.NET/Admin.NET.Application/Service/Distributor/Dto/DistributorDto.cs b/Admin.NET/Admin.NET.Application/Service/Distributor/Dto/DistributorDto.cs new file mode 100644 index 0000000..8b85477 --- /dev/null +++ b/Admin.NET/Admin.NET.Application/Service/Distributor/Dto/DistributorDto.cs @@ -0,0 +1,108 @@ +namespace Admin.NET.Application; + + /// + /// 分销商输出参数 + /// + public class DistributorDto + { + /// + /// 主键Id + /// + public long Id { get; set; } + + /// + /// 名称 + /// + public string? Name { get; set; } + + /// + /// 编码 + /// + public string? CodeNum { get; set; } + + /// + /// 简称 + /// + public string? SorName { get; set; } + + /// + /// 状态 + /// + public int? Status { get; set; } + + /// + /// 联系人 + /// + public string? Contacts { get; set; } + + /// + /// 电话 + /// + public string? Tel { get; set; } + + /// + /// 所有者账号 + /// + public string? UserName { get; set; } + + /// + /// 品牌 + /// + public string? Brand { get; set; } + + /// + /// 上级分销商 + /// + public string? SuperiorDistributor { get; set; } + + /// + /// 地址 + /// + public string? Address { get; set; } + + /// + /// 备注 + /// + public string? Remarks { get; set; } + + /// + /// 租户Id + /// + public long? TenantId { get; set; } + + /// + /// 创建时间 + /// + public DateTime? CreateTime { get; set; } + + /// + /// 更新时间 + /// + public DateTime? UpdateTime { get; set; } + + /// + /// 创建者Id + /// + public long? CreateUserId { get; set; } + + /// + /// 创建者姓名 + /// + public string? CreateUserName { get; set; } + + /// + /// 修改者Id + /// + public long? UpdateUserId { get; set; } + + /// + /// 修改者姓名 + /// + public string? UpdateUserName { get; set; } + + /// + /// 软删除 + /// + public bool IsDelete { get; set; } + + } diff --git a/Admin.NET/Admin.NET.Application/Service/Distributor/Dto/DistributorInput.cs b/Admin.NET/Admin.NET.Application/Service/Distributor/Dto/DistributorInput.cs new file mode 100644 index 0000000..2980ce4 --- /dev/null +++ b/Admin.NET/Admin.NET.Application/Service/Distributor/Dto/DistributorInput.cs @@ -0,0 +1,214 @@ +using Admin.NET.Core; +using System.ComponentModel.DataAnnotations; + +namespace Admin.NET.Application; + + /// + /// 分销商基础输入参数 + /// + public class DistributorBaseInput + { + /// + /// 名称 + /// + public virtual string? Name { get; set; } + + /// + /// 编码 + /// + public virtual string? CodeNum { get; set; } + + /// + /// 简称 + /// + public virtual string? SorName { get; set; } + + /// + /// 状态 + /// + public virtual int? Status { get; set; } + + /// + /// 联系人 + /// + public virtual string? Contacts { get; set; } + + /// + /// 电话 + /// + public virtual string? Tel { get; set; } + + /// + /// 所有者账号 + /// + public virtual string? UserName { get; set; } + + /// + /// 品牌 + /// + public virtual string? Brand { get; set; } + + /// + /// 上级分销商 + /// + public virtual string? SuperiorDistributor { get; set; } + + /// + /// 地址 + /// + public virtual string? Address { get; set; } + + /// + /// 备注 + /// + public virtual string? Remarks { get; set; } + + /// + /// 租户Id + /// + public virtual long? TenantId { get; set; } + + /// + /// 创建时间 + /// + public virtual DateTime? CreateTime { get; set; } + + /// + /// 更新时间 + /// + public virtual DateTime? UpdateTime { get; set; } + + /// + /// 创建者Id + /// + public virtual long? CreateUserId { get; set; } + + /// + /// 创建者姓名 + /// + public virtual string? CreateUserName { get; set; } + + /// + /// 修改者Id + /// + public virtual long? UpdateUserId { get; set; } + + /// + /// 修改者姓名 + /// + public virtual string? UpdateUserName { get; set; } + + /// + /// 软删除 + /// + public virtual bool IsDelete { get; set; } + + } + + /// + /// 分销商分页查询输入参数 + /// + public class DistributorInput : BasePageInput + { + /// + /// 关键字查询 + /// + public string? SearchKey { get; set; } + + /// + /// 名称 + /// + public string? Name { get; set; } + + /// + /// 编码 + /// + public string? CodeNum { get; set; } + + /// + /// 简称 + /// + public string? SorName { get; set; } + + /// + /// 状态 + /// + public int? Status { get; set; } + + /// + /// 联系人 + /// + public string? Contacts { get; set; } + + /// + /// 电话 + /// + public string? Tel { get; set; } + + /// + /// 所有者账号 + /// + public string? UserName { get; set; } + + /// + /// 品牌 + /// + public string? Brand { get; set; } + + /// + /// 上级分销商 + /// + public string? SuperiorDistributor { get; set; } + + /// + /// 地址 + /// + public string? Address { get; set; } + + /// + /// 备注 + /// + public string? Remarks { get; set; } + + } + + /// + /// 分销商增加输入参数 + /// + public class AddDistributorInput : DistributorBaseInput + { + /// + /// 软删除 + /// + [Required(ErrorMessage = "软删除不能为空")] + public override bool IsDelete { get; set; } + + } + + /// + /// 分销商删除输入参数 + /// + public class DeleteDistributorInput : BaseIdInput + { + } + + /// + /// 分销商更新输入参数 + /// + public class UpdateDistributorInput : DistributorBaseInput + { + /// + /// 主键Id + /// + [Required(ErrorMessage = "主键Id不能为空")] + public long Id { get; set; } + + } + + /// + /// 分销商主键查询输入参数 + /// + public class QueryByIdDistributorInput : DeleteDistributorInput + { + + } diff --git a/Admin.NET/Admin.NET.Application/Service/Distributor/Dto/DistributorOutput.cs b/Admin.NET/Admin.NET.Application/Service/Distributor/Dto/DistributorOutput.cs new file mode 100644 index 0000000..3409ec7 --- /dev/null +++ b/Admin.NET/Admin.NET.Application/Service/Distributor/Dto/DistributorOutput.cs @@ -0,0 +1,110 @@ +namespace Admin.NET.Application; + +/// +/// 分销商输出参数 +/// +public class DistributorOutput +{ + /// + /// 主键Id + /// + public long Id { get; set; } + + /// + /// 名称 + /// + public string? Name { get; set; } + + /// + /// 编码 + /// + public string? CodeNum { get; set; } + + /// + /// 简称 + /// + public string? SorName { get; set; } + + /// + /// 状态 + /// + public int? Status { get; set; } + + /// + /// 联系人 + /// + public string? Contacts { get; set; } + + /// + /// 电话 + /// + public string? Tel { get; set; } + + /// + /// 所有者账号 + /// + public string? UserName { get; set; } + + /// + /// 品牌 + /// + public string? Brand { get; set; } + + /// + /// 上级分销商 + /// + public string? SuperiorDistributor { get; set; } + + /// + /// 地址 + /// + public string? Address { get; set; } + + /// + /// 备注 + /// + public string? Remarks { get; set; } + + /// + /// 租户Id + /// + public long? TenantId { get; set; } + + /// + /// 创建时间 + /// + public DateTime? CreateTime { get; set; } + + /// + /// 更新时间 + /// + public DateTime? UpdateTime { get; set; } + + /// + /// 创建者Id + /// + public long? CreateUserId { get; set; } + + /// + /// 创建者姓名 + /// + public string? CreateUserName { get; set; } + + /// + /// 修改者Id + /// + public long? UpdateUserId { get; set; } + + /// + /// 修改者姓名 + /// + public string? UpdateUserName { get; set; } + + /// + /// 软删除 + /// + public bool IsDelete { get; set; } + + } + + diff --git a/Admin.NET/Admin.NET.Application/Service/Invoice/InvoiceService.cs b/Admin.NET/Admin.NET.Application/Service/Invoice/InvoiceService.cs index 2214655..15c0606 100644 --- a/Admin.NET/Admin.NET.Application/Service/Invoice/InvoiceService.cs +++ b/Admin.NET/Admin.NET.Application/Service/Invoice/InvoiceService.cs @@ -24,7 +24,7 @@ public class InvoiceService : IDynamicApiController, ITransient [ApiDescriptionSettings(Name = "Page")] public async Task> Page(InvoiceInput input) { - var query = _rep.AsQueryable() + var query = _rep.AsQueryable().Where(a => !a.IsDelete) .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u => u.CodeNum.Contains(input.SearchKey.Trim()) || u.BusinessType.Contains(input.SearchKey.Trim()) diff --git a/Admin.NET/Admin.NET.Application/Service/Materials/MaterialClassifyService.cs b/Admin.NET/Admin.NET.Application/Service/Materials/MaterialClassifyService.cs index 130a347..5e5d96b 100644 --- a/Admin.NET/Admin.NET.Application/Service/Materials/MaterialClassifyService.cs +++ b/Admin.NET/Admin.NET.Application/Service/Materials/MaterialClassifyService.cs @@ -24,7 +24,7 @@ public class MaterialClassifyService : IDynamicApiController, ITransient [ApiDescriptionSettings(Name = "Page")] public async Task> Page(MaterialClassifyInput input) { - var query = _rep.AsQueryable() + var query = _rep.AsQueryable().Where(a => !a.IsDelete) .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u => u.Name.Contains(input.SearchKey.Trim()) ) diff --git a/Admin.NET/Admin.NET.Application/Service/Outbound/OutboundService.cs b/Admin.NET/Admin.NET.Application/Service/Outbound/OutboundService.cs index 97ec12d..fd8dbb7 100644 --- a/Admin.NET/Admin.NET.Application/Service/Outbound/OutboundService.cs +++ b/Admin.NET/Admin.NET.Application/Service/Outbound/OutboundService.cs @@ -24,7 +24,7 @@ public class OutboundService : IDynamicApiController, ITransient [ApiDescriptionSettings(Name = "Page")] public async Task> Page(OutboundInput input) { - var query = _rep.AsQueryable() + var query = _rep.AsQueryable().Where(a => !a.IsDelete) .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u => u.CodeNum.Contains(input.SearchKey.Trim()) || u.SourceCodeNum.Contains(input.SearchKey.Trim()) diff --git a/Admin.NET/Admin.NET.Application/Service/PackageInfo/PackageInfoService.cs b/Admin.NET/Admin.NET.Application/Service/PackageInfo/PackageInfoService.cs index f6ba6a5..1bd8ac4 100644 --- a/Admin.NET/Admin.NET.Application/Service/PackageInfo/PackageInfoService.cs +++ b/Admin.NET/Admin.NET.Application/Service/PackageInfo/PackageInfoService.cs @@ -26,7 +26,7 @@ public class PackageInfoService : IDynamicApiController, ITransient [ApiDescriptionSettings(Name = "Page")] public async Task> Page(PackageInfoInput input) { - var query = _rep.AsQueryable() + var query = _rep.AsQueryable().Where(a => !a.IsDelete) .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u => u.CodeTypeNum.Contains(input.SearchKey.Trim()) || u.CodeType.Contains(input.SearchKey.Trim()) diff --git a/Admin.NET/Admin.NET.Application/Service/PrintLabel/PrintLabelService.cs b/Admin.NET/Admin.NET.Application/Service/PrintLabel/PrintLabelService.cs index 31845d1..76e807f 100644 --- a/Admin.NET/Admin.NET.Application/Service/PrintLabel/PrintLabelService.cs +++ b/Admin.NET/Admin.NET.Application/Service/PrintLabel/PrintLabelService.cs @@ -24,7 +24,7 @@ public class PrintLabelService : IDynamicApiController, ITransient [ApiDescriptionSettings(Name = "Page")] public async Task> Page(PrintLabelInput input) { - var query = _rep.AsQueryable() + var query = _rep.AsQueryable().Where(a => !a.IsDelete) .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u => u.Unit.Contains(input.SearchKey.Trim()) || u.PackageUnit.Contains(input.SearchKey.Trim()) diff --git a/Admin.NET/Admin.NET.Application/Service/ProductBarCode/ProductBarCodeService.cs b/Admin.NET/Admin.NET.Application/Service/ProductBarCode/ProductBarCodeService.cs index 04687d5..6eb39a9 100644 --- a/Admin.NET/Admin.NET.Application/Service/ProductBarCode/ProductBarCodeService.cs +++ b/Admin.NET/Admin.NET.Application/Service/ProductBarCode/ProductBarCodeService.cs @@ -24,7 +24,7 @@ public class ProductBarCodeService : IDynamicApiController, ITransient [ApiDescriptionSettings(Name = "Page")] public async Task> Page(ProductBarCodeInput input) { - var query = _rep.AsQueryable() + var query = _rep.AsQueryable().Where(a => !a.IsDelete) .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u => u.BarCode.Contains(input.SearchKey.Trim()) || u.ParentCode.Contains(input.SearchKey.Trim()) diff --git a/Admin.NET/Admin.NET.Application/Service/ProductCodeConfiguration/ProductCodeConfigurationService.cs b/Admin.NET/Admin.NET.Application/Service/ProductCodeConfiguration/ProductCodeConfigurationService.cs index a0e346e..c03bbdd 100644 --- a/Admin.NET/Admin.NET.Application/Service/ProductCodeConfiguration/ProductCodeConfigurationService.cs +++ b/Admin.NET/Admin.NET.Application/Service/ProductCodeConfiguration/ProductCodeConfigurationService.cs @@ -24,7 +24,7 @@ public class ProductCodeConfigurationService : IDynamicApiController, ITransient [ApiDescriptionSettings(Name = "Page")] public async Task> Page(ProductCodeConfigurationInput input) { - var query = _rep.AsQueryable() + var query = _rep.AsQueryable().Where(a => !a.IsDelete) .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u => u.CodeType.Contains(input.SearchKey.Trim()) ) diff --git a/Admin.NET/Admin.NET.Application/Service/Production/ProductionService.cs b/Admin.NET/Admin.NET.Application/Service/Production/ProductionService.cs index a1b50d4..f5c636c 100644 --- a/Admin.NET/Admin.NET.Application/Service/Production/ProductionService.cs +++ b/Admin.NET/Admin.NET.Application/Service/Production/ProductionService.cs @@ -24,7 +24,7 @@ public class ProductionService : IDynamicApiController, ITransient [ApiDescriptionSettings(Name = "Page")] public async Task> Page(ProductionInput input) { - var query = _rep.AsQueryable() + var query = _rep.AsQueryable().Where(a => !a.IsDelete) .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u => u.Name.Contains(input.SearchKey.Trim()) || u.CodeNum.Contains(input.SearchKey.Trim()) diff --git a/Admin.NET/Admin.NET.Application/Service/ProductionTasks/ProductionTasksService.cs b/Admin.NET/Admin.NET.Application/Service/ProductionTasks/ProductionTasksService.cs index 34377b0..554ae82 100644 --- a/Admin.NET/Admin.NET.Application/Service/ProductionTasks/ProductionTasksService.cs +++ b/Admin.NET/Admin.NET.Application/Service/ProductionTasks/ProductionTasksService.cs @@ -24,7 +24,7 @@ public class ProductionTasksService : IDynamicApiController, ITransient [ApiDescriptionSettings(Name = "Page")] public async Task> Page(ProductionTasksInput input) { - var query = _rep.AsQueryable() + var query = _rep.AsQueryable().Where(a => !a.IsDelete) .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u => u.OddNumber.Contains(input.SearchKey.Trim()) || u.ProductType.Contains(input.SearchKey.Trim()) diff --git a/Admin.NET/Admin.NET.Application/Service/ReportTable/ReportTableService.cs b/Admin.NET/Admin.NET.Application/Service/ReportTable/ReportTableService.cs index 3a4896e..4de6913 100644 --- a/Admin.NET/Admin.NET.Application/Service/ReportTable/ReportTableService.cs +++ b/Admin.NET/Admin.NET.Application/Service/ReportTable/ReportTableService.cs @@ -24,7 +24,7 @@ public class ReportTableService : IDynamicApiController, ITransient [ApiDescriptionSettings(Name = "Page")] public async Task> Page(ReportTableInput input) { - var query = _rep.AsQueryable() + var query = _rep.AsQueryable().Where(a => !a.IsDelete) .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u => u.OddNumber.Contains(input.SearchKey.Trim()) || u.ProductType.Contains(input.SearchKey.Trim()) diff --git a/Admin.NET/Admin.NET.Application/Service/SuppleInformation/SuppleInformationService.cs b/Admin.NET/Admin.NET.Application/Service/SuppleInformation/SuppleInformationService.cs index aa01f0a..eaca056 100644 --- a/Admin.NET/Admin.NET.Application/Service/SuppleInformation/SuppleInformationService.cs +++ b/Admin.NET/Admin.NET.Application/Service/SuppleInformation/SuppleInformationService.cs @@ -24,7 +24,7 @@ public class SuppleInformationService : IDynamicApiController, ITransient [ApiDescriptionSettings(Name = "Page")] public async Task> Page(SuppleInformationInput input) { - var query = _rep.AsQueryable() + var query = _rep.AsQueryable().Where(a => !a.IsDelete) .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u => u.Name.Contains(input.SearchKey.Trim()) || u.CodeNum.Contains(input.SearchKey.Trim()) diff --git a/Admin.NET/Admin.NET.Application/Service/SuppleType/SuppleTypeService.cs b/Admin.NET/Admin.NET.Application/Service/SuppleType/SuppleTypeService.cs index 86d289a..aeee0d0 100644 --- a/Admin.NET/Admin.NET.Application/Service/SuppleType/SuppleTypeService.cs +++ b/Admin.NET/Admin.NET.Application/Service/SuppleType/SuppleTypeService.cs @@ -24,7 +24,7 @@ public class SuppleTypeService : IDynamicApiController, ITransient [ApiDescriptionSettings(Name = "Page")] public async Task> Page(SuppleTypeInput input) { - var query = _rep.AsQueryable() + var query = _rep.AsQueryable().Where(a => !a.IsDelete) .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u => u.Name.Contains(input.SearchKey.Trim()) ) diff --git a/Admin.NET/Admin.NET.Application/Service/Supplier/Dto/SupplierDto.cs b/Admin.NET/Admin.NET.Application/Service/Supplier/Dto/SupplierDto.cs new file mode 100644 index 0000000..a83a23b --- /dev/null +++ b/Admin.NET/Admin.NET.Application/Service/Supplier/Dto/SupplierDto.cs @@ -0,0 +1,88 @@ +namespace Admin.NET.Application; + + /// + /// 供应商输出参数 + /// + public class SupplierDto + { + /// + /// 主键Id + /// + public long Id { get; set; } + + /// + /// 供应商名称 + /// + public string? Name { get; set; } + + /// + /// 联系人 + /// + public string? Contacts { get; set; } + + /// + /// 电话 + /// + public string? Tel { get; set; } + + /// + /// 企业类型 + /// + public string? CompanyType { get; set; } + + /// + /// 职务 + /// + public string? Duties { get; set; } + + /// + /// 地址 + /// + public string? Address { get; set; } + + /// + /// 备注 + /// + public string? Remarks { get; set; } + + /// + /// 租户Id + /// + public long? TenantId { get; set; } + + /// + /// 创建时间 + /// + public DateTime? CreateTime { get; set; } + + /// + /// 更新时间 + /// + public DateTime? UpdateTime { get; set; } + + /// + /// 创建者Id + /// + public long? CreateUserId { get; set; } + + /// + /// 创建者姓名 + /// + public string? CreateUserName { get; set; } + + /// + /// 修改者Id + /// + public long? UpdateUserId { get; set; } + + /// + /// 修改者姓名 + /// + public string? UpdateUserName { get; set; } + + /// + /// 软删除 + /// + public bool IsDelete { get; set; } + + } diff --git a/Admin.NET/Admin.NET.Application/Service/Supplier/Dto/SupplierInput.cs b/Admin.NET/Admin.NET.Application/Service/Supplier/Dto/SupplierInput.cs new file mode 100644 index 0000000..b9e1f04 --- /dev/null +++ b/Admin.NET/Admin.NET.Application/Service/Supplier/Dto/SupplierInput.cs @@ -0,0 +1,174 @@ +using Admin.NET.Core; +using System.ComponentModel.DataAnnotations; + +namespace Admin.NET.Application; + + /// + /// 供应商基础输入参数 + /// + public class SupplierBaseInput + { + /// + /// 供应商名称 + /// + public virtual string? Name { get; set; } + + /// + /// 联系人 + /// + public virtual string? Contacts { get; set; } + + /// + /// 电话 + /// + public virtual string? Tel { get; set; } + + /// + /// 企业类型 + /// + public virtual string? CompanyType { get; set; } + + /// + /// 职务 + /// + public virtual string? Duties { get; set; } + + /// + /// 地址 + /// + public virtual string? Address { get; set; } + + /// + /// 备注 + /// + public virtual string? Remarks { get; set; } + + /// + /// 租户Id + /// + public virtual long? TenantId { get; set; } + + /// + /// 创建时间 + /// + public virtual DateTime? CreateTime { get; set; } + + /// + /// 更新时间 + /// + public virtual DateTime? UpdateTime { get; set; } + + /// + /// 创建者Id + /// + public virtual long? CreateUserId { get; set; } + + /// + /// 创建者姓名 + /// + public virtual string? CreateUserName { get; set; } + + /// + /// 修改者Id + /// + public virtual long? UpdateUserId { get; set; } + + /// + /// 修改者姓名 + /// + public virtual string? UpdateUserName { get; set; } + + /// + /// 软删除 + /// + public virtual bool IsDelete { get; set; } + + } + + /// + /// 供应商分页查询输入参数 + /// + public class SupplierInput : BasePageInput + { + /// + /// 关键字查询 + /// + public string? SearchKey { get; set; } + + /// + /// 供应商名称 + /// + public string? Name { get; set; } + + /// + /// 联系人 + /// + public string? Contacts { get; set; } + + /// + /// 电话 + /// + public string? Tel { get; set; } + + /// + /// 企业类型 + /// + public string? CompanyType { get; set; } + + /// + /// 职务 + /// + public string? Duties { get; set; } + + /// + /// 地址 + /// + public string? Address { get; set; } + + /// + /// 备注 + /// + public string? Remarks { get; set; } + + } + + /// + /// 供应商增加输入参数 + /// + public class AddSupplierInput : SupplierBaseInput + { + /// + /// 软删除 + /// + [Required(ErrorMessage = "软删除不能为空")] + public override bool IsDelete { get; set; } + + } + + /// + /// 供应商删除输入参数 + /// + public class DeleteSupplierInput : BaseIdInput + { + } + + /// + /// 供应商更新输入参数 + /// + public class UpdateSupplierInput : SupplierBaseInput + { + /// + /// 主键Id + /// + [Required(ErrorMessage = "主键Id不能为空")] + public long Id { get; set; } + + } + + /// + /// 供应商主键查询输入参数 + /// + public class QueryByIdSupplierInput : DeleteSupplierInput + { + + } diff --git a/Admin.NET/Admin.NET.Application/Service/Supplier/Dto/SupplierOutput.cs b/Admin.NET/Admin.NET.Application/Service/Supplier/Dto/SupplierOutput.cs new file mode 100644 index 0000000..e2c3a90 --- /dev/null +++ b/Admin.NET/Admin.NET.Application/Service/Supplier/Dto/SupplierOutput.cs @@ -0,0 +1,90 @@ +namespace Admin.NET.Application; + +/// +/// 供应商输出参数 +/// +public class SupplierOutput +{ + /// + /// 主键Id + /// + public long Id { get; set; } + + /// + /// 供应商名称 + /// + public string? Name { get; set; } + + /// + /// 联系人 + /// + public string? Contacts { get; set; } + + /// + /// 电话 + /// + public string? Tel { get; set; } + + /// + /// 企业类型 + /// + public string? CompanyType { get; set; } + + /// + /// 职务 + /// + public string? Duties { get; set; } + + /// + /// 地址 + /// + public string? Address { get; set; } + + /// + /// 备注 + /// + public string? Remarks { get; set; } + + /// + /// 租户Id + /// + public long? TenantId { get; set; } + + /// + /// 创建时间 + /// + public DateTime? CreateTime { get; set; } + + /// + /// 更新时间 + /// + public DateTime? UpdateTime { get; set; } + + /// + /// 创建者Id + /// + public long? CreateUserId { get; set; } + + /// + /// 创建者姓名 + /// + public string? CreateUserName { get; set; } + + /// + /// 修改者Id + /// + public long? UpdateUserId { get; set; } + + /// + /// 修改者姓名 + /// + public string? UpdateUserName { get; set; } + + /// + /// 软删除 + /// + public bool IsDelete { get; set; } + + } + + diff --git a/Admin.NET/Admin.NET.Application/Service/Supplier/SupplierService.cs b/Admin.NET/Admin.NET.Application/Service/Supplier/SupplierService.cs new file mode 100644 index 0000000..bb4f2bc --- /dev/null +++ b/Admin.NET/Admin.NET.Application/Service/Supplier/SupplierService.cs @@ -0,0 +1,118 @@ +using Admin.NET.Core.Service; +using Admin.NET.Application.Const; +using Admin.NET.Application.Entity; +using Microsoft.AspNetCore.Http; +namespace Admin.NET.Application; +/// +/// 供应商服务 +/// +[ApiDescriptionSettings(ApplicationConst.GroupName, Order = 100)] +public class SupplierService : IDynamicApiController, ITransient +{ + private readonly SqlSugarRepository _rep; + public SupplierService(SqlSugarRepository rep) + { + _rep = rep; + } + + /// + /// 分页查询供应商 + /// + /// + /// + [HttpPost] + [ApiDescriptionSettings(Name = "Page")] + public async Task> Page(SupplierInput input) + { + var query = _rep.AsQueryable() + .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u => + u.Name.Contains(input.SearchKey.Trim()) + || u.Contacts.Contains(input.SearchKey.Trim()) + || u.Tel.Contains(input.SearchKey.Trim()) + || u.CompanyType.Contains(input.SearchKey.Trim()) + || u.Duties.Contains(input.SearchKey.Trim()) + || u.Address.Contains(input.SearchKey.Trim()) + || u.Remarks.Contains(input.SearchKey.Trim()) + ) + .WhereIF(!string.IsNullOrWhiteSpace(input.Name), u => u.Name.Contains(input.Name.Trim())) + .WhereIF(!string.IsNullOrWhiteSpace(input.Contacts), u => u.Contacts.Contains(input.Contacts.Trim())) + .WhereIF(!string.IsNullOrWhiteSpace(input.Tel), u => u.Tel.Contains(input.Tel.Trim())) + .WhereIF(!string.IsNullOrWhiteSpace(input.CompanyType), u => u.CompanyType.Contains(input.CompanyType.Trim())) + .WhereIF(!string.IsNullOrWhiteSpace(input.Duties), u => u.Duties.Contains(input.Duties.Trim())) + .WhereIF(!string.IsNullOrWhiteSpace(input.Address), u => u.Address.Contains(input.Address.Trim())) + .WhereIF(!string.IsNullOrWhiteSpace(input.Remarks), u => u.Remarks.Contains(input.Remarks.Trim())) + .Select(); + return await query.OrderBuilder(input).ToPagedListAsync(input.Page, input.PageSize); + } + + /// + /// 增加供应商 + /// + /// + /// + [HttpPost] + [ApiDescriptionSettings(Name = "Add")] + public async Task Add(AddSupplierInput input) + { + var entity = input.Adapt(); + await _rep.InsertAsync(entity); + return entity.Id; + } + + /// + /// 删除供应商 + /// + /// + /// + [HttpPost] + [ApiDescriptionSettings(Name = "Delete")] + public async Task Delete(DeleteSupplierInput input) + { + var entity = await _rep.GetFirstAsync(u => u.Id == input.Id) ?? throw Oops.Oh(ErrorCodeEnum.D1002); + await _rep.FakeDeleteAsync(entity); //假删除 + //await _rep.DeleteAsync(entity); //真删除 + } + + /// + /// 更新供应商 + /// + /// + /// + [HttpPost] + [ApiDescriptionSettings(Name = "Update")] + public async Task Update(UpdateSupplierInput input) + { + var entity = input.Adapt(); + await _rep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); + } + + /// + /// 获取供应商 + /// + /// + /// + [HttpGet] + [ApiDescriptionSettings(Name = "Detail")] + public async Task Detail([FromQuery] QueryByIdSupplierInput input) + { + return await _rep.GetFirstAsync(u => u.Id == input.Id); + } + + /// + /// 获取供应商列表 + /// + /// + /// + [HttpGet] + [ApiDescriptionSettings(Name = "List")] + public async Task> List([FromQuery] SupplierInput input) + { + return await _rep.AsQueryable().Select().ToListAsync(); + } + + + + + +} + diff --git a/Admin.NET/Admin.NET.Application/Service/SysUnit/SysUnitGroupService.cs b/Admin.NET/Admin.NET.Application/Service/SysUnit/SysUnitGroupService.cs index c3014c7..34fb38f 100644 --- a/Admin.NET/Admin.NET.Application/Service/SysUnit/SysUnitGroupService.cs +++ b/Admin.NET/Admin.NET.Application/Service/SysUnit/SysUnitGroupService.cs @@ -25,7 +25,7 @@ public class SysUnitGroupService : IDynamicApiController, ITransient [ApiDescriptionSettings(Name = "Page")] public async Task> Page(SysUnitGroupInput input) { - var query = _rep.AsQueryable() + var query = _rep.AsQueryable().Where(a => !a.IsDelete) .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u => u.CreateOrgName.Contains(input.SearchKey.Trim()) || u.Name.Contains(input.SearchKey.Trim()) diff --git a/Admin.NET/Admin.NET.Application/Service/SysUnit/SysUnitService.cs b/Admin.NET/Admin.NET.Application/Service/SysUnit/SysUnitService.cs index 7e50efe..2209f20 100644 --- a/Admin.NET/Admin.NET.Application/Service/SysUnit/SysUnitService.cs +++ b/Admin.NET/Admin.NET.Application/Service/SysUnit/SysUnitService.cs @@ -24,7 +24,7 @@ public class SysUnitService : IDynamicApiController, ITransient [ApiDescriptionSettings(Name = "Page")] public async Task> Page(SysUnitInput input) { - var query = _rep.AsQueryable() + var query = _rep.AsQueryable().Where(a => !a.IsDelete) .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u => u.CreateOrgName.Contains(input.SearchKey.Trim()) || u.Name.Contains(input.SearchKey.Trim()) diff --git a/Admin.NET/Admin.NET.Application/Service/UrlInfo/UrlInfoService.cs b/Admin.NET/Admin.NET.Application/Service/UrlInfo/UrlInfoService.cs index 2edb204..9d6c0fa 100644 --- a/Admin.NET/Admin.NET.Application/Service/UrlInfo/UrlInfoService.cs +++ b/Admin.NET/Admin.NET.Application/Service/UrlInfo/UrlInfoService.cs @@ -25,7 +25,7 @@ public class UrlInfoService : IDynamicApiController, ITransient [ApiDescriptionSettings(Name = "Page")] public async Task> Page(UrlInfoInput input) { - var query = _rep.AsQueryable() + var query = _rep.AsQueryable().Where(a => !a.IsDelete) .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u => u.Name.Contains(input.SearchKey.Trim()) || u.Url.Contains(input.SearchKey.Trim()) diff --git a/Admin.NET/Admin.NET.Application/Service/UrlType/UrlTypeService.cs b/Admin.NET/Admin.NET.Application/Service/UrlType/UrlTypeService.cs index 7626b4c..5a4a581 100644 --- a/Admin.NET/Admin.NET.Application/Service/UrlType/UrlTypeService.cs +++ b/Admin.NET/Admin.NET.Application/Service/UrlType/UrlTypeService.cs @@ -25,7 +25,7 @@ public class UrlTypeService : IDynamicApiController, ITransient [ApiDescriptionSettings(Name = "Page")] public async Task> Page(UrlTypeInput input) { - var query = _rep.AsQueryable() + var query = _rep.AsQueryable().Where(a => !a.IsDelete) .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u => u.Name.Contains(input.SearchKey.Trim()) || u.Remarks.Contains(input.SearchKey.Trim()) diff --git a/Admin.NET/Admin.NET.Application/Service/Warehouse/WarehouseService.cs b/Admin.NET/Admin.NET.Application/Service/Warehouse/WarehouseService.cs index c675452..cbad842 100644 --- a/Admin.NET/Admin.NET.Application/Service/Warehouse/WarehouseService.cs +++ b/Admin.NET/Admin.NET.Application/Service/Warehouse/WarehouseService.cs @@ -24,7 +24,7 @@ public class WarehouseService : IDynamicApiController, ITransient [ApiDescriptionSettings(Name = "Page")] public async Task> Page(WarehouseInput input) { - var query = _rep.AsQueryable() + var query = _rep.AsQueryable().Where(a => !a.IsDelete) .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u => u.Name.Contains(input.SearchKey.Trim()) || u.CodeNum.Contains(input.SearchKey.Trim()) diff --git a/Admin.NET/Admin.NET.Application/Service/Warehousing/WarehousingService.cs b/Admin.NET/Admin.NET.Application/Service/Warehousing/WarehousingService.cs index d4cf668..9059a71 100644 --- a/Admin.NET/Admin.NET.Application/Service/Warehousing/WarehousingService.cs +++ b/Admin.NET/Admin.NET.Application/Service/Warehousing/WarehousingService.cs @@ -24,7 +24,7 @@ public class WarehousingService : IDynamicApiController, ITransient [ApiDescriptionSettings(Name = "Page")] public async Task> Page(WarehousingInput input) { - var query = _rep.AsQueryable() + var query = _rep.AsQueryable().Where(a => !a.IsDelete) .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u => u.CodeNum.Contains(input.SearchKey.Trim()) || u.BusinessType.Contains(input.SearchKey.Trim()) diff --git a/Admin.NET/Admin.NET.Web.Entry/Program.cs b/Admin.NET/Admin.NET.Web.Entry/Program.cs index 255d073..c3aaf44 100644 --- a/Admin.NET/Admin.NET.Web.Entry/Program.cs +++ b/Admin.NET/Admin.NET.Web.Entry/Program.cs @@ -13,7 +13,6 @@ public class WebComponent : IWebComponent { return !new[] { "Microsoft.Hosting", "Microsoft.AspNetCore" }.Any(u => category.StartsWith(u)) && logLevel >= LogLevel.Information; }); - // 设置接口超时时间和上传大小 builder.Configuration.Get().ConfigureKestrel(u => { diff --git a/Admin.NET/Admin.NET.Web.Entry/wwwroot/CodeGen/Warehousing.zip b/Admin.NET/Admin.NET.Web.Entry/wwwroot/CodeGen/Warehousing.zip new file mode 100644 index 0000000..299b5a5 Binary files /dev/null and b/Admin.NET/Admin.NET.Web.Entry/wwwroot/CodeGen/Warehousing.zip differ diff --git a/Admin.NET/Admin.NET.Web.Entry/wwwroot/CodeGen/Warehousing/Web/src/api/main/warehousing.ts b/Admin.NET/Admin.NET.Web.Entry/wwwroot/CodeGen/Warehousing/Web/src/api/main/warehousing.ts new file mode 100644 index 0000000..980e767 --- /dev/null +++ b/Admin.NET/Admin.NET.Web.Entry/wwwroot/CodeGen/Warehousing/Web/src/api/main/warehousing.ts @@ -0,0 +1,50 @@ +import request from '/@/utils/request'; +enum Api { + AddWarehousing = '/api/warehousing/add', + DeleteWarehousing = '/api/warehousing/delete', + UpdateWarehousing = '/api/warehousing/update', + PageWarehousing = '/api/warehousing/page', + DetailWarehousing = '/api/warehousing/detail', +} + +// 增加入库单 +export const addWarehousing = (params?: any) => + request({ + url: Api.AddWarehousing, + method: 'post', + data: params, + }); + +// 删除入库单 +export const deleteWarehousing = (params?: any) => + request({ + url: Api.DeleteWarehousing, + method: 'post', + data: params, + }); + +// 编辑入库单 +export const updateWarehousing = (params?: any) => + request({ + url: Api.UpdateWarehousing, + method: 'post', + data: params, + }); + +// 分页查询入库单 +export const pageWarehousing = (params?: any) => + request({ + url: Api.PageWarehousing, + method: 'post', + data: params, + }); + +// 详情入库单 +export const detailWarehousing = (id: any) => + request({ + url: Api.DetailWarehousing, + method: 'get', + data: { id }, + }); + + diff --git a/Admin.NET/Admin.NET.Web.Entry/wwwroot/CodeGen/Warehousing/Web/src/views/main/warehousing/component/editDialog.vue b/Admin.NET/Admin.NET.Web.Entry/wwwroot/CodeGen/Warehousing/Web/src/views/main/warehousing/component/editDialog.vue new file mode 100644 index 0000000..d52e6f1 --- /dev/null +++ b/Admin.NET/Admin.NET.Web.Entry/wwwroot/CodeGen/Warehousing/Web/src/views/main/warehousing/component/editDialog.vue @@ -0,0 +1,163 @@ + + + + + + + diff --git a/Admin.NET/Admin.NET.Web.Entry/wwwroot/CodeGen/Warehousing/Web/src/views/main/warehousing/index.vue b/Admin.NET/Admin.NET.Web.Entry/wwwroot/CodeGen/Warehousing/Web/src/views/main/warehousing/index.vue new file mode 100644 index 0000000..42017db --- /dev/null +++ b/Admin.NET/Admin.NET.Web.Entry/wwwroot/CodeGen/Warehousing/Web/src/views/main/warehousing/index.vue @@ -0,0 +1,221 @@ + + + + + diff --git a/Web/.env.development b/Web/.env.development index d854af8..78ced16 100644 --- a/Web/.env.development +++ b/Web/.env.development @@ -2,4 +2,4 @@ ENV = development # 本地环境接口地址http://localhost:5005 http://139.199.191.197:9005 -VITE_API_URL = http://139.199.191.197:9005 \ No newline at end of file +VITE_API_URL = http://localhost:5005 \ No newline at end of file diff --git a/Web/src.zip b/Web/src.zip new file mode 100644 index 0000000..3f11788 Binary files /dev/null and b/Web/src.zip differ diff --git a/Web/src/api-services/models/add-sys-unit-input.ts b/Web/src/api-services/models/add-sys-unit-input.ts index f79fc56..c56ab34 100644 --- a/Web/src/api-services/models/add-sys-unit-input.ts +++ b/Web/src/api-services/models/add-sys-unit-input.ts @@ -179,4 +179,5 @@ export interface AddSysUnitInput { * @memberof AddSysUnitInput */ isEnable: boolean; + } diff --git a/Web/src/api/main/brand.ts b/Web/src/api/main/brand.ts new file mode 100644 index 0000000..13bfa63 --- /dev/null +++ b/Web/src/api/main/brand.ts @@ -0,0 +1,50 @@ +import request from '/@/utils/request'; +enum Api { + AddBrand = '/api/brand/add', + DeleteBrand = '/api/brand/delete', + UpdateBrand = '/api/brand/update', + PageBrand = '/api/brand/page', + DetailBrand = '/api/brand/detail', +} + +// 增加品牌 +export const addBrand = (params?: any) => + request({ + url: Api.AddBrand, + method: 'post', + data: params, + }); + +// 删除品牌 +export const deleteBrand = (params?: any) => + request({ + url: Api.DeleteBrand, + method: 'post', + data: params, + }); + +// 编辑品牌 +export const updateBrand = (params?: any) => + request({ + url: Api.UpdateBrand, + method: 'post', + data: params, + }); + +// 分页查询品牌 +export const pageBrand = (params?: any) => + request({ + url: Api.PageBrand, + method: 'post', + data: params, + }); + +// 详情品牌 +export const detailBrand = (id: any) => + request({ + url: Api.DetailBrand, + method: 'get', + data: { id }, + }); + + diff --git a/Web/src/api/main/custom.ts b/Web/src/api/main/custom.ts new file mode 100644 index 0000000..8ab3c3a --- /dev/null +++ b/Web/src/api/main/custom.ts @@ -0,0 +1,102 @@ +import request from '/@/utils/request'; +enum Api { + AddCustom = '/api/custom/add', + DeleteCustom = '/api/custom/delete', + UpdateCustom = '/api/custom/update', + PageCustom = '/api/custom/page', + DetailCustom = '/api/custom/detail', +} +enum ClassifyApi { + AddCustom = '/api/custonClassify/add', + DeleteCustom = '/api/custonClassify/delete', + UpdateCustom = '/api/custonClassify/update', + PageCustom = '/api/custonClassify/page', + DetailCustom = '/api/custonClassify/detail', + List = '/api/custonClassify/list', + } + +// 增加客户 +export const addCustom = (params?: any) => + request({ + url: Api.AddCustom, + method: 'post', + data: params, + }); + +// 删除客户 +export const deleteCustom = (params?: any) => + request({ + url: Api.DeleteCustom, + method: 'post', + data: params, + }); + +// 编辑客户 +export const updateCustom = (params?: any) => + request({ + url: Api.UpdateCustom, + method: 'post', + data: params, + }); + +// 分页查询客户 +export const pageCustom = (params?: any) => + request({ + url: Api.PageCustom, + method: 'post', + data: params, + }); + +// 详情客户 +export const detailCustom = (id: any) => + request({ + url: Api.DetailCustom, + method: 'get', + data: { id }, + }); + +// 增加客户类型 +export const addCustomClassify = (params?: any) => + request({ + url: ClassifyApi.AddCustom, + method: 'post', + data: params, + }); + +// 删除客户类型 +export const deleteCustomClassify = (params?: any) => + request({ + url: ClassifyApi.DeleteCustom, + method: 'post', + data: params, + }); +// 编辑客户类型 +export const updateCustomClassify = (params?: any) => + request({ + url: ClassifyApi.UpdateCustom, + method: 'post', + data: params, + }); +// 分页查询客户类型 +export const pageCustomClassify = (params?: any) => + request({ + url: ClassifyApi.PageCustom, + method: 'post', + data: params, + }); +// 详情客户类型 +export const detailCustomClassify = (id: any) => + request({ + url: ClassifyApi.DetailCustom, + method: 'get', + data: { id }, + }); + +// 客户类型列表 +export const listCustomClassify = (params?: any) => + request({ + url: ClassifyApi.List, + method: 'post', + data: params, + }); + diff --git a/Web/src/api/main/distributor.ts b/Web/src/api/main/distributor.ts new file mode 100644 index 0000000..495413e --- /dev/null +++ b/Web/src/api/main/distributor.ts @@ -0,0 +1,50 @@ +import request from '/@/utils/request'; +enum Api { + AddDistributor = '/api/distributor/add', + DeleteDistributor = '/api/distributor/delete', + UpdateDistributor = '/api/distributor/update', + PageDistributor = '/api/distributor/page', + DetailDistributor = '/api/distributor/detail', +} + +// 增加分销商 +export const addDistributor = (params?: any) => + request({ + url: Api.AddDistributor, + method: 'post', + data: params, + }); + +// 删除分销商 +export const deleteDistributor = (params?: any) => + request({ + url: Api.DeleteDistributor, + method: 'post', + data: params, + }); + +// 编辑分销商 +export const updateDistributor = (params?: any) => + request({ + url: Api.UpdateDistributor, + method: 'post', + data: params, + }); + +// 分页查询分销商 +export const pageDistributor = (params?: any) => + request({ + url: Api.PageDistributor, + method: 'post', + data: params, + }); + +// 详情分销商 +export const detailDistributor = (id: any) => + request({ + url: Api.DetailDistributor, + method: 'get', + data: { id }, + }); + + diff --git a/Web/src/api/main/production.ts b/Web/src/api/main/production.ts new file mode 100644 index 0000000..783bb18 --- /dev/null +++ b/Web/src/api/main/production.ts @@ -0,0 +1,50 @@ +import request from '/@/utils/request'; +enum Api { + AddProduction = '/api/production/add', + DeleteProduction = '/api/production/delete', + UpdateProduction = '/api/production/update', + PageProduction = '/api/production/page', + DetailProduction = '/api/production/detail', +} + +// 增加生产组织 +export const addProduction = (params?: any) => + request({ + url: Api.AddProduction, + method: 'post', + data: params, + }); + +// 删除生产组织 +export const deleteProduction = (params?: any) => + request({ + url: Api.DeleteProduction, + method: 'post', + data: params, + }); + +// 编辑生产组织 +export const updateProduction = (params?: any) => + request({ + url: Api.UpdateProduction, + method: 'post', + data: params, + }); + +// 分页查询生产组织 +export const pageProduction = (params?: any) => + request({ + url: Api.PageProduction, + method: 'post', + data: params, + }); + +// 详情生产组织 +export const detailProduction = (id: any) => + request({ + url: Api.DetailProduction, + method: 'get', + data: { id }, + }); + + diff --git a/Web/src/api/main/productionTasks.ts b/Web/src/api/main/productionTasks.ts new file mode 100644 index 0000000..c7ebbb5 --- /dev/null +++ b/Web/src/api/main/productionTasks.ts @@ -0,0 +1,50 @@ +import request from '/@/utils/request'; +enum Api { + AddProductionTasks = '/api/productionTasks/add', + DeleteProductionTasks = '/api/productionTasks/delete', + UpdateProductionTasks = '/api/productionTasks/update', + PageProductionTasks = '/api/productionTasks/page', + DetailProductionTasks = '/api/productionTasks/detail', +} + +// 增加生产任务单 +export const addProductionTasks = (params?: any) => + request({ + url: Api.AddProductionTasks, + method: 'post', + data: params, + }); + +// 删除生产任务单 +export const deleteProductionTasks = (params?: any) => + request({ + url: Api.DeleteProductionTasks, + method: 'post', + data: params, + }); + +// 编辑生产任务单 +export const updateProductionTasks = (params?: any) => + request({ + url: Api.UpdateProductionTasks, + method: 'post', + data: params, + }); + +// 分页查询生产任务单 +export const pageProductionTasks = (params?: any) => + request({ + url: Api.PageProductionTasks, + method: 'post', + data: params, + }); + +// 详情生产任务单 +export const detailProductionTasks = (id: any) => + request({ + url: Api.DetailProductionTasks, + method: 'get', + data: { id }, + }); + + diff --git a/Web/src/api/main/reportTable.ts b/Web/src/api/main/reportTable.ts new file mode 100644 index 0000000..9dd43b6 --- /dev/null +++ b/Web/src/api/main/reportTable.ts @@ -0,0 +1,50 @@ +import request from '/@/utils/request'; +enum Api { + AddReportTable = '/api/reportTable/add', + DeleteReportTable = '/api/reportTable/delete', + UpdateReportTable = '/api/reportTable/update', + PageReportTable = '/api/reportTable/page', + DetailReportTable = '/api/reportTable/detail', +} + +// 增加汇报单 +export const addReportTable = (params?: any) => + request({ + url: Api.AddReportTable, + method: 'post', + data: params, + }); + +// 删除汇报单 +export const deleteReportTable = (params?: any) => + request({ + url: Api.DeleteReportTable, + method: 'post', + data: params, + }); + +// 编辑汇报单 +export const updateReportTable = (params?: any) => + request({ + url: Api.UpdateReportTable, + method: 'post', + data: params, + }); + +// 分页查询汇报单 +export const pageReportTable = (params?: any) => + request({ + url: Api.PageReportTable, + method: 'post', + data: params, + }); + +// 详情汇报单 +export const detailReportTable = (id: any) => + request({ + url: Api.DetailReportTable, + method: 'get', + data: { id }, + }); + + diff --git a/Web/src/api/main/suppleInformation.ts b/Web/src/api/main/suppleInformation.ts new file mode 100644 index 0000000..5230ca5 --- /dev/null +++ b/Web/src/api/main/suppleInformation.ts @@ -0,0 +1,50 @@ +import request from '/@/utils/request'; +enum Api { + AddSuppleInformation = '/api/suppleInformation/add', + DeleteSuppleInformation = '/api/suppleInformation/delete', + UpdateSuppleInformation = '/api/suppleInformation/update', + PageSuppleInformation = '/api/suppleInformation/page', + DetailSuppleInformation = '/api/suppleInformation/detail', +} + +// 增加辅助资料 +export const addSuppleInformation = (params?: any) => + request({ + url: Api.AddSuppleInformation, + method: 'post', + data: params, + }); + +// 删除辅助资料 +export const deleteSuppleInformation = (params?: any) => + request({ + url: Api.DeleteSuppleInformation, + method: 'post', + data: params, + }); + +// 编辑辅助资料 +export const updateSuppleInformation = (params?: any) => + request({ + url: Api.UpdateSuppleInformation, + method: 'post', + data: params, + }); + +// 分页查询辅助资料 +export const pageSuppleInformation = (params?: any) => + request({ + url: Api.PageSuppleInformation, + method: 'post', + data: params, + }); + +// 详情辅助资料 +export const detailSuppleInformation = (id: any) => + request({ + url: Api.DetailSuppleInformation, + method: 'get', + data: { id }, + }); + + diff --git a/Web/src/api/main/supplier.ts b/Web/src/api/main/supplier.ts new file mode 100644 index 0000000..888d6b9 --- /dev/null +++ b/Web/src/api/main/supplier.ts @@ -0,0 +1,50 @@ +import request from '/@/utils/request'; +enum Api { + AddSupplier = '/api/supplier/add', + DeleteSupplier = '/api/supplier/delete', + UpdateSupplier = '/api/supplier/update', + PageSupplier = '/api/supplier/page', + DetailSupplier = '/api/supplier/detail', +} + +// 增加供应商 +export const addSupplier = (params?: any) => + request({ + url: Api.AddSupplier, + method: 'post', + data: params, + }); + +// 删除供应商 +export const deleteSupplier = (params?: any) => + request({ + url: Api.DeleteSupplier, + method: 'post', + data: params, + }); + +// 编辑供应商 +export const updateSupplier = (params?: any) => + request({ + url: Api.UpdateSupplier, + method: 'post', + data: params, + }); + +// 分页查询供应商 +export const pageSupplier = (params?: any) => + request({ + url: Api.PageSupplier, + method: 'post', + data: params, + }); + +// 详情供应商 +export const detailSupplier = (id: any) => + request({ + url: Api.DetailSupplier, + method: 'get', + data: { id }, + }); + + diff --git a/Web/src/api/main/warehouse.ts b/Web/src/api/main/warehouse.ts new file mode 100644 index 0000000..e9057e0 --- /dev/null +++ b/Web/src/api/main/warehouse.ts @@ -0,0 +1,50 @@ +import request from '/@/utils/request'; +enum Api { + AddWarehouse = '/api/warehouse/add', + DeleteWarehouse = '/api/warehouse/delete', + UpdateWarehouse = '/api/warehouse/update', + PageWarehouse = '/api/warehouse/page', + DetailWarehouse = '/api/warehouse/detail', +} + +// 增加仓库 +export const addWarehouse = (params?: any) => + request({ + url: Api.AddWarehouse, + method: 'post', + data: params, + }); + +// 删除仓库 +export const deleteWarehouse = (params?: any) => + request({ + url: Api.DeleteWarehouse, + method: 'post', + data: params, + }); + +// 编辑仓库 +export const updateWarehouse = (params?: any) => + request({ + url: Api.UpdateWarehouse, + method: 'post', + data: params, + }); + +// 分页查询仓库 +export const pageWarehouse = (params?: any) => + request({ + url: Api.PageWarehouse, + method: 'post', + data: params, + }); + +// 详情仓库 +export const detailWarehouse = (id: any) => + request({ + url: Api.DetailWarehouse, + method: 'get', + data: { id }, + }); + + diff --git a/Web/src/api/main/warehousing.ts b/Web/src/api/main/warehousing.ts new file mode 100644 index 0000000..980e767 --- /dev/null +++ b/Web/src/api/main/warehousing.ts @@ -0,0 +1,50 @@ +import request from '/@/utils/request'; +enum Api { + AddWarehousing = '/api/warehousing/add', + DeleteWarehousing = '/api/warehousing/delete', + UpdateWarehousing = '/api/warehousing/update', + PageWarehousing = '/api/warehousing/page', + DetailWarehousing = '/api/warehousing/detail', +} + +// 增加入库单 +export const addWarehousing = (params?: any) => + request({ + url: Api.AddWarehousing, + method: 'post', + data: params, + }); + +// 删除入库单 +export const deleteWarehousing = (params?: any) => + request({ + url: Api.DeleteWarehousing, + method: 'post', + data: params, + }); + +// 编辑入库单 +export const updateWarehousing = (params?: any) => + request({ + url: Api.UpdateWarehousing, + method: 'post', + data: params, + }); + +// 分页查询入库单 +export const pageWarehousing = (params?: any) => + request({ + url: Api.PageWarehousing, + method: 'post', + data: params, + }); + +// 详情入库单 +export const detailWarehousing = (id: any) => + request({ + url: Api.DetailWarehousing, + method: 'get', + data: { id }, + }); + + diff --git a/Web/src/views/basics-date/brand/component/editDialog.vue b/Web/src/views/basics-date/brand/component/editDialog.vue new file mode 100644 index 0000000..f33f24d --- /dev/null +++ b/Web/src/views/basics-date/brand/component/editDialog.vue @@ -0,0 +1,152 @@ + + + + + + + diff --git a/Web/src/views/basics-date/brand/index.vue b/Web/src/views/basics-date/brand/index.vue index b7034df..af9db2b 100644 --- a/Web/src/views/basics-date/brand/index.vue +++ b/Web/src/views/basics-date/brand/index.vue @@ -1,145 +1,201 @@ - - + + + + diff --git a/Web/src/views/basics-date/warehouse/index.vue b/Web/src/views/basics-date/warehouse/index.vue new file mode 100644 index 0000000..8d7fd95 --- /dev/null +++ b/Web/src/views/basics-date/warehouse/index.vue @@ -0,0 +1,208 @@ + + + + + diff --git a/Web/src/views/login/component/account.vue b/Web/src/views/login/component/account.vue index 7210528..9b2c0b8 100644 --- a/Web/src/views/login/component/account.vue +++ b/Web/src/views/login/component/account.vue @@ -103,7 +103,7 @@ const dragRef: any = ref(null); const state = reactive({ isShowPassword: false, ruleForm: { - account: 'superadmin', + account: 'test', password: '123456', code: '', codeId: 0, diff --git a/Web/src/views/main/warehousing/component/editDialog.vue b/Web/src/views/main/warehousing/component/editDialog.vue new file mode 100644 index 0000000..d52e6f1 --- /dev/null +++ b/Web/src/views/main/warehousing/component/editDialog.vue @@ -0,0 +1,163 @@ + + + + + + + diff --git a/Web/src/views/main/warehousing/index.vue b/Web/src/views/main/warehousing/index.vue new file mode 100644 index 0000000..af570fe --- /dev/null +++ b/Web/src/views/main/warehousing/index.vue @@ -0,0 +1,216 @@ + + + + + diff --git a/Web/src/views/productionCenter/production/component/editDialog.vue b/Web/src/views/productionCenter/production/component/editDialog.vue new file mode 100644 index 0000000..689f04c --- /dev/null +++ b/Web/src/views/productionCenter/production/component/editDialog.vue @@ -0,0 +1,163 @@ + + + + + + + diff --git a/Web/src/views/productionCenter/production/index.vue b/Web/src/views/productionCenter/production/index.vue new file mode 100644 index 0000000..affba62 --- /dev/null +++ b/Web/src/views/productionCenter/production/index.vue @@ -0,0 +1,211 @@ + + + + + diff --git a/Web/src/views/productionCenter/productionTasks/component/editDialog.vue b/Web/src/views/productionCenter/productionTasks/component/editDialog.vue new file mode 100644 index 0000000..79c0523 --- /dev/null +++ b/Web/src/views/productionCenter/productionTasks/component/editDialog.vue @@ -0,0 +1,198 @@ + + + + + + + diff --git a/Web/src/views/productionCenter/productionTasks/index.vue b/Web/src/views/productionCenter/productionTasks/index.vue new file mode 100644 index 0000000..6b75e63 --- /dev/null +++ b/Web/src/views/productionCenter/productionTasks/index.vue @@ -0,0 +1,247 @@ + + + + + diff --git a/Web/src/views/productionCenter/reportTable/component/editDialog.vue b/Web/src/views/productionCenter/reportTable/component/editDialog.vue new file mode 100644 index 0000000..8f158c9 --- /dev/null +++ b/Web/src/views/productionCenter/reportTable/component/editDialog.vue @@ -0,0 +1,170 @@ + + + + + + + diff --git a/Web/src/views/productionCenter/reportTable/index.vue b/Web/src/views/productionCenter/reportTable/index.vue new file mode 100644 index 0000000..4154124 --- /dev/null +++ b/Web/src/views/productionCenter/reportTable/index.vue @@ -0,0 +1,217 @@ + + + + +