diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml index 7024d905..5dcfb119 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml @@ -181,7 +181,7 @@ - + 分页查 @@ -249,7 +249,7 @@ - + 分页查 @@ -283,7 +283,7 @@ - + 分页查 @@ -317,7 +317,7 @@ - + 分页查 @@ -357,7 +357,7 @@ - + 分页查 diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/MaterialController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/MaterialController.cs index c1ca9d68..28b59a1f 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/MaterialController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/MaterialController.cs @@ -22,7 +22,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers.ERP /// /// [HttpGet] - public async Task PageList([FromQuery] MaterialCreateUpdateInput input, [FromQuery] PageParModel page) + public async Task PageList([FromQuery] MaterialGetListInput input, [FromQuery] PageParModel page) { var result = await _materialService.PageListAsync(input, page); return Result.Success().SetData(result); diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/PurchaseDetailsController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/PurchaseDetailsController.cs index b1b5dd45..f8c9dafd 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/PurchaseDetailsController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/PurchaseDetailsController.cs @@ -22,7 +22,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers.ERP /// /// [HttpGet] - public async Task PageList([FromQuery] PurchaseDetailsCreateUpdateInput input, [FromQuery] PageParModel page) + public async Task PageList([FromQuery] PurchaseDetailsGetListInput input, [FromQuery] PageParModel page) { var result = await _purchaseDetailsService.PageListAsync(input, page); return Result.Success().SetData(result); diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/SupplierController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/SupplierController.cs index 1a10baf5..a0a9481f 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/SupplierController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/SupplierController.cs @@ -1,4 +1,4 @@ -using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc; using Yi.Framework.Common.Models; using Yi.Framework.DtoModel.ERP.Supplier; using Yi.Framework.Interface.ERP; @@ -22,7 +22,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers.ERP /// /// [HttpGet] - public async Task PageList([FromQuery] SupplierCreateUpdateInput input, [FromQuery] PageParModel page) + public async Task PageList([FromQuery] SupplierGetListInput input, [FromQuery] PageParModel page) { var result = await _supplierService.PageListAsync(input, page); return Result.Success().SetData(result); diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/UnitController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/UnitController.cs index c8180bab..adae2cda 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/UnitController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/UnitController.cs @@ -22,7 +22,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers.ERP /// /// [HttpGet] - public async Task PageList([FromQuery] UnitCreateUpdateInput input, [FromQuery] PageParModel page) + public async Task PageList([FromQuery] UnitGetListInput input, [FromQuery] PageParModel page) { var result = await _unitService.PageListAsync(input, page); return Result.Success().SetData(result); diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/WarehouseController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/WarehouseController.cs index 56cd4964..ff3d630e 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/WarehouseController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/WarehouseController.cs @@ -22,7 +22,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers.ERP /// /// [HttpGet] - public async Task PageList([FromQuery] WarehouseCreateUpdateInput input, [FromQuery] PageParModel page) + public async Task PageList([FromQuery] WarehouseGetListInput input, [FromQuery] PageParModel page) { var result = await _warehouseService.PageListAsync(input, page); return Result.Success().SetData(result); diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/wwwroot/Temp/202301061154333382T_DataExport.xlsx b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/wwwroot/Temp/202301061154333382T_DataExport.xlsx new file mode 100644 index 00000000..58d4293f Binary files /dev/null and b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/wwwroot/Temp/202301061154333382T_DataExport.xlsx differ diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db index 548aad63..2256c927 100644 Binary files a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db and b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db differ diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/ERP/IMaterialService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/ERP/IMaterialService.cs index db55544e..44d8a0b9 100644 --- a/Yi.Framework.Net6/Yi.Framework.Interface/ERP/IMaterialService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Interface/ERP/IMaterialService.cs @@ -11,6 +11,6 @@ namespace Yi.Framework.Interface.ERP { public interface IMaterialService : ICrudAppService { - Task>> PageListAsync(MaterialCreateUpdateInput input, PageParModel page); + Task>> PageListAsync(MaterialGetListInput input, PageParModel page); } } diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/ERP/IPurchaseDetailsService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/ERP/IPurchaseDetailsService.cs index d0ef37a7..981fddfc 100644 --- a/Yi.Framework.Net6/Yi.Framework.Interface/ERP/IPurchaseDetailsService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Interface/ERP/IPurchaseDetailsService.cs @@ -11,6 +11,6 @@ namespace Yi.Framework.Interface.ERP { public interface IPurchaseDetailsService : ICrudAppService { - Task>> PageListAsync(PurchaseDetailsCreateUpdateInput input, PageParModel page); + Task>> PageListAsync(PurchaseDetailsGetListInput input, PageParModel page); } } diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/ERP/ISupplierService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/ERP/ISupplierService.cs index a9a62ebd..e1b02e0d 100644 --- a/Yi.Framework.Net6/Yi.Framework.Interface/ERP/ISupplierService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Interface/ERP/ISupplierService.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -11,6 +11,6 @@ namespace Yi.Framework.Interface.ERP { public interface ISupplierService : ICrudAppService { - Task>> PageListAsync(SupplierCreateUpdateInput input, PageParModel page); + Task>> PageListAsync(SupplierGetListInput input, PageParModel page); } } diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/ERP/IUnitService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/ERP/IUnitService.cs index 5293cef4..3d001d42 100644 --- a/Yi.Framework.Net6/Yi.Framework.Interface/ERP/IUnitService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Interface/ERP/IUnitService.cs @@ -11,6 +11,6 @@ namespace Yi.Framework.Interface.ERP { public interface IUnitService : ICrudAppService { - Task>> PageListAsync(UnitCreateUpdateInput input, PageParModel page); + Task>> PageListAsync(UnitGetListInput input, PageParModel page); } } diff --git a/Yi.Framework.Net6/Yi.Framework.Interface/ERP/IWarehouseService.cs b/Yi.Framework.Net6/Yi.Framework.Interface/ERP/IWarehouseService.cs index 95365e6b..d2a51284 100644 --- a/Yi.Framework.Net6/Yi.Framework.Interface/ERP/IWarehouseService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Interface/ERP/IWarehouseService.cs @@ -11,6 +11,6 @@ namespace Yi.Framework.Interface.ERP { public interface IWarehouseService : ICrudAppService { - Task>> PageListAsync(WarehouseCreateUpdateInput input, PageParModel page); + Task>> PageListAsync(WarehouseGetListInput input, PageParModel page); } } diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ERP/MaterialService.cs b/Yi.Framework.Net6/Yi.Framework.Service/ERP/MaterialService.cs index b98b8dad..22a40fc2 100644 --- a/Yi.Framework.Net6/Yi.Framework.Service/ERP/MaterialService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Service/ERP/MaterialService.cs @@ -16,7 +16,7 @@ namespace Yi.Framework.Service.ERP { public class MaterialService : CrudAppService, IMaterialService { - public async Task>> PageListAsync(MaterialCreateUpdateInput input, PageParModel page) + public async Task>> PageListAsync(MaterialGetListInput input, PageParModel page) { RefAsync totalNumber = 0; var data = await Repository._DbQueryable diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ERP/PurchaseDetailsService.cs b/Yi.Framework.Net6/Yi.Framework.Service/ERP/PurchaseDetailsService.cs index ee51382b..3cd9d361 100644 --- a/Yi.Framework.Net6/Yi.Framework.Service/ERP/PurchaseDetailsService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Service/ERP/PurchaseDetailsService.cs @@ -16,12 +16,11 @@ namespace Yi.Framework.Service.ERP { public class PurchaseDetailsService : CrudAppService, IPurchaseDetailsService { - public async Task>> PageListAsync(PurchaseDetailsCreateUpdateInput input, PageParModel page) + public async Task>> PageListAsync(PurchaseDetailsGetListInput input, PageParModel page) { RefAsync totalNumber = 0; var data = await Repository._DbQueryable - //.WhereIF(input.Code is not null,u=>u.Code.Contains(input.Code)) - //.WhereIF(input.Name is not null, u => u.Name.Contains(input.Name)) + .ToPageListAsync(page.PageNum, page.PageSize, totalNumber); return new PageModel> { Total = totalNumber.Value, Data = await MapToGetListOutputDtosAsync(data) }; } diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ERP/SupplierService.cs b/Yi.Framework.Net6/Yi.Framework.Service/ERP/SupplierService.cs index d39a73cc..d746c9cb 100644 --- a/Yi.Framework.Net6/Yi.Framework.Service/ERP/SupplierService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Service/ERP/SupplierService.cs @@ -1,4 +1,4 @@ -using AutoMapper; +using AutoMapper; using SqlSugar; using System; using System.Collections.Generic; @@ -16,7 +16,7 @@ namespace Yi.Framework.Service.ERP { public class SupplierService : CrudAppService, ISupplierService { - public async Task>> PageListAsync(SupplierCreateUpdateInput input, PageParModel page) + public async Task>> PageListAsync(SupplierGetListInput input, PageParModel page) { RefAsync totalNumber = 0; var data = await Repository._DbQueryable diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ERP/UnitService.cs b/Yi.Framework.Net6/Yi.Framework.Service/ERP/UnitService.cs index 188d0e9d..01ff04ee 100644 --- a/Yi.Framework.Net6/Yi.Framework.Service/ERP/UnitService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Service/ERP/UnitService.cs @@ -16,7 +16,7 @@ namespace Yi.Framework.Service.ERP { public class UnitService : CrudAppService, IUnitService { - public async Task>> PageListAsync(UnitCreateUpdateInput input, PageParModel page) + public async Task>> PageListAsync(UnitGetListInput input, PageParModel page) { RefAsync totalNumber = 0; var data = await Repository._DbQueryable diff --git a/Yi.Framework.Net6/Yi.Framework.Service/ERP/WarehouseService.cs b/Yi.Framework.Net6/Yi.Framework.Service/ERP/WarehouseService.cs index 75486731..5092258e 100644 --- a/Yi.Framework.Net6/Yi.Framework.Service/ERP/WarehouseService.cs +++ b/Yi.Framework.Net6/Yi.Framework.Service/ERP/WarehouseService.cs @@ -16,7 +16,7 @@ namespace Yi.Framework.Service.ERP { public class WarehouseService : CrudAppService, IWarehouseService { - public async Task>> PageListAsync(WarehouseCreateUpdateInput input, PageParModel page) + public async Task>> PageListAsync(WarehouseGetListInput input, PageParModel page) { RefAsync totalNumber = 0; var data = await Repository._DbQueryable diff --git a/Yi.Framework.Net6/Yi.Framework.Template/Program.cs b/Yi.Framework.Net6/Yi.Framework.Template/Program.cs index 156ae451..0006e0ca 100644 --- a/Yi.Framework.Net6/Yi.Framework.Template/Program.cs +++ b/Yi.Framework.Net6/Yi.Framework.Template/Program.cs @@ -13,15 +13,15 @@ foreach (var entityName in entityNames) { templateFactory.CreateTemplateProviders((option) => { - option.Add(new ServceTemplateProvider(modelName, entityName)); - option.Add(new IServceTemplateProvider(modelName, entityName)); - option.Add(new CreateUpdateInputTemplateProvider(modelName, entityName)); - option.Add(new GetListOutputTemplateProvider(modelName, entityName)); - option.Add(new GetListInputTemplateProvider(modelName, entityName)); - option.Add(new ConstTemplateProvider(modelName, entityName)); - option.Add(new ProfileTemplateProvider(modelName, entityName)); + //option.Add(new ServceTemplateProvider(modelName, entityName)); + //option.Add(new IServceTemplateProvider(modelName, entityName)); + //option.Add(new CreateUpdateInputTemplateProvider(modelName, entityName)); + //option.Add(new GetListOutputTemplateProvider(modelName, entityName)); + //option.Add(new GetListInputTemplateProvider(modelName, entityName)); + //option.Add(new ConstTemplateProvider(modelName, entityName)); + //option.Add(new ProfileTemplateProvider(modelName, entityName)); option.Add(new ControllerTemplateProvider(modelName, entityName)); - option.Add(new ApiTemplateProvider(modelName, entityName)); + //option.Add(new ApiTemplateProvider(modelName, entityName)); }); //开始构建模板 templateFactory.BuildTemplate(); diff --git a/Yi.Framework.Net6/Yi.Framework.Template/Template/Server/ControllerTemplate.txt b/Yi.Framework.Net6/Yi.Framework.Template/Template/Server/ControllerTemplate.txt index 2951131e..b68e30c7 100644 --- a/Yi.Framework.Net6/Yi.Framework.Template/Template/Server/ControllerTemplate.txt +++ b/Yi.Framework.Net6/Yi.Framework.Template/Template/Server/ControllerTemplate.txt @@ -22,7 +22,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers.#ModelName# /// /// [HttpGet] - public async Task PageList([FromQuery] #EntityName#CreateUpdateInput input, [FromQuery] PageParModel page) + public async Task PageList([FromQuery] #EntityName#GetListInput input, [FromQuery] PageParModel page) { var result = await _#LowerEntityName#Service.PageListAsync(input, page); return Result.Success().SetData(result); diff --git a/Yi.Framework.Net6/Yi.Framework.Template/Template/Server/IServiceTemplate.txt b/Yi.Framework.Net6/Yi.Framework.Template/Template/Server/IServiceTemplate.txt index b1f20b7a..0e73fa41 100644 --- a/Yi.Framework.Net6/Yi.Framework.Template/Template/Server/IServiceTemplate.txt +++ b/Yi.Framework.Net6/Yi.Framework.Template/Template/Server/IServiceTemplate.txt @@ -11,6 +11,6 @@ namespace Yi.Framework.Interface.#ModelName# { public interface I#EntityName#Service : ICrudAppService<#EntityName#GetListOutput, long, #EntityName#CreateUpdateInput> { - Task>> PageListAsync(#EntityName#CreateUpdateInput input, PageParModel page); + Task>> PageListAsync(#EntityName#GetListInput input, PageParModel page); } } diff --git a/Yi.Framework.Net6/Yi.Framework.Template/Template/Server/ServiceTemplate.txt b/Yi.Framework.Net6/Yi.Framework.Template/Template/Server/ServiceTemplate.txt index 1a669210..078f4fcf 100644 --- a/Yi.Framework.Net6/Yi.Framework.Template/Template/Server/ServiceTemplate.txt +++ b/Yi.Framework.Net6/Yi.Framework.Template/Template/Server/ServiceTemplate.txt @@ -16,7 +16,7 @@ namespace Yi.Framework.Service.#ModelName# { public class #EntityName#Service : CrudAppService<#EntityName#Entity, #EntityName#GetListOutput, long, #EntityName#CreateUpdateInput>, I#EntityName#Service { - public async Task>> PageListAsync(#EntityName#CreateUpdateInput input, PageParModel page) + public async Task>> PageListAsync(#EntityName#GetListInput input, PageParModel page) { RefAsync totalNumber = 0; var data = await Repository._DbQueryable