zhusenlin/Yi.Admin
1
0
Fork 0
mirror of https://gitee.com/ccnetcore/Yi synced 2026-03-03 00:00:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

重新生成getlistinput模板，联调接口

Browse Source
This commit is contained in:
陈淳
2023-01-06 12:02:48 +08:00
parent 1ed37897d5
commit f4280298af
22 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml
View File

@@ -181,7 +181,7 @@
</summary>
<returns></returns>
</member>
<member name="M:Yi.Framework.ApiMicroservice.Controllers.ERP.MaterialController.PageList(Yi.Framework.DtoModel.ERP.Material.MaterialCreateUpdateInput,Yi.Framework.Common.Models.PageParModel)">
<member name="M:Yi.Framework.ApiMicroservice.Controllers.ERP.MaterialController.PageList(Yi.Framework.DtoModel.ERP.Material.MaterialGetListInput,Yi.Framework.Common.Models.PageParModel)">
<summary>
分页查
</summary>
@@ -249,7 +249,7 @@
<param name="ids"></param>
<returns></returns>
</member>
<member name="M:Yi.Framework.ApiMicroservice.Controllers.ERP.PurchaseDetailsController.PageList(Yi.Framework.DtoModel.ERP.PurchaseDetails.PurchaseDetailsCreateUpdateInput,Yi.Framework.Common.Models.PageParModel)">
<member name="M:Yi.Framework.ApiMicroservice.Controllers.ERP.PurchaseDetailsController.PageList(Yi.Framework.DtoModel.ERP.PurchaseDetails.PurchaseDetailsGetListInput,Yi.Framework.Common.Models.PageParModel)">
<summary>
分页查
</summary>
@@ -283,7 +283,7 @@
<param name="ids"></param>
<returns></returns>
</member>
<member name="M:Yi.Framework.ApiMicroservice.Controllers.ERP.SupplierController.PageList(Yi.Framework.DtoModel.ERP.Supplier.SupplierCreateUpdateInput,Yi.Framework.Common.Models.PageParModel)">
<member name="M:Yi.Framework.ApiMicroservice.Controllers.ERP.SupplierController.PageList(Yi.Framework.DtoModel.ERP.Supplier.SupplierGetListInput,Yi.Framework.Common.Models.PageParModel)">
<summary>
分页查
</summary>
@@ -317,7 +317,7 @@
<param name="ids"></param>
<returns></returns>
</member>
<member name="M:Yi.Framework.ApiMicroservice.Controllers.ERP.UnitController.PageList(Yi.Framework.DtoModel.ERP.Unit.UnitCreateUpdateInput,Yi.Framework.Common.Models.PageParModel)">
<member name="M:Yi.Framework.ApiMicroservice.Controllers.ERP.UnitController.PageList(Yi.Framework.DtoModel.ERP.Unit.UnitGetListInput,Yi.Framework.Common.Models.PageParModel)">
<summary>
分页查
</summary>
@@ -357,7 +357,7 @@
<param name="ids"></param>
<returns></returns>
</member>
<member name="M:Yi.Framework.ApiMicroservice.Controllers.ERP.WarehouseController.PageList(Yi.Framework.DtoModel.ERP.Warehouse.WarehouseCreateUpdateInput,Yi.Framework.Common.Models.PageParModel)">
<member name="M:Yi.Framework.ApiMicroservice.Controllers.ERP.WarehouseController.PageList(Yi.Framework.DtoModel.ERP.Warehouse.WarehouseGetListInput,Yi.Framework.Common.Models.PageParModel)">
<summary>
分页查
</summary>

2
Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/MaterialController.cs
View File

@@ -22,7 +22,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers.ERP
/// </summary>
/// <returns></returns>
[HttpGet]
public async Task<Result> PageList([FromQuery] MaterialCreateUpdateInput input, [FromQuery] PageParModel page)
public async Task<Result> PageList([FromQuery] MaterialGetListInput input, [FromQuery] PageParModel page)
{
var result = await _materialService.PageListAsync(input, page);
return Result.Success().SetData(result);

2
Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/PurchaseDetailsController.cs
View File

@@ -22,7 +22,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers.ERP
/// </summary>
/// <returns></returns>
[HttpGet]
public async Task<Result> PageList([FromQuery] PurchaseDetailsCreateUpdateInput input, [FromQuery] PageParModel page)
public async Task<Result> PageList([FromQuery] PurchaseDetailsGetListInput input, [FromQuery] PageParModel page)
{
var result = await _purchaseDetailsService.PageListAsync(input, page);
return Result.Success().SetData(result);

4
Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/SupplierController.cs
View File

@@ -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
/// </summary>
/// <returns></returns>
[HttpGet]
public async Task<Result> PageList([FromQuery] SupplierCreateUpdateInput input, [FromQuery] PageParModel page)
public async Task<Result> PageList([FromQuery] SupplierGetListInput input, [FromQuery] PageParModel page)
{
var result = await _supplierService.PageListAsync(input, page);
return Result.Success().SetData(result);

2
Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/UnitController.cs
View File

@@ -22,7 +22,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers.ERP
/// </summary>
/// <returns></returns>
[HttpGet]
public async Task<Result> PageList([FromQuery] UnitCreateUpdateInput input, [FromQuery] PageParModel page)
public async Task<Result> PageList([FromQuery] UnitGetListInput input, [FromQuery] PageParModel page)
{
var result = await _unitService.PageListAsync(input, page);
return Result.Success().SetData(result);

2
Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/WarehouseController.cs
View File

@@ -22,7 +22,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers.ERP
/// </summary>
/// <returns></returns>
[HttpGet]
public async Task<Result> PageList([FromQuery] WarehouseCreateUpdateInput input, [FromQuery] PageParModel page)
public async Task<Result> PageList([FromQuery] WarehouseGetListInput input, [FromQuery] PageParModel page)
{
var result = await _warehouseService.PageListAsync(input, page);
return Result.Success().SetData(result);

BIN
Yi.Framework.Net6/Yi.Framework.ApiMicroservice/wwwroot/Temp/202301061154333382T_DataExport.xlsx Normal file
View File

Binary file not shown.

BIN
Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db
View File

Binary file not shown.

2
Yi.Framework.Net6/Yi.Framework.Interface/ERP/IMaterialService.cs
View File

@@ -11,6 +11,6 @@ namespace Yi.Framework.Interface.ERP
{
public interface IMaterialService : ICrudAppService<MaterialGetListOutput, long, MaterialCreateUpdateInput>
{
Task<PageModel<List<MaterialGetListOutput>>> PageListAsync(MaterialCreateUpdateInput input, PageParModel page);
Task<PageModel<List<MaterialGetListOutput>>> PageListAsync(MaterialGetListInput input, PageParModel page);
}
}

2
Yi.Framework.Net6/Yi.Framework.Interface/ERP/IPurchaseDetailsService.cs
View File

@@ -11,6 +11,6 @@ namespace Yi.Framework.Interface.ERP
{
public interface IPurchaseDetailsService : ICrudAppService<PurchaseDetailsGetListOutput, long, PurchaseDetailsCreateUpdateInput>
{
Task<PageModel<List<PurchaseDetailsGetListOutput>>> PageListAsync(PurchaseDetailsCreateUpdateInput input, PageParModel page);
Task<PageModel<List<PurchaseDetailsGetListOutput>>> PageListAsync(PurchaseDetailsGetListInput input, PageParModel page);
}
}

4
Yi.Framework.Net6/Yi.Framework.Interface/ERP/ISupplierService.cs
View File

@@ -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<SupplierGetListOutput, long, SupplierCreateUpdateInput>
{
Task<PageModel<List<SupplierGetListOutput>>> PageListAsync(SupplierCreateUpdateInput input, PageParModel page);
Task<PageModel<List<SupplierGetListOutput>>> PageListAsync(SupplierGetListInput input, PageParModel page);
}
}

2
Yi.Framework.Net6/Yi.Framework.Interface/ERP/IUnitService.cs
View File

@@ -11,6 +11,6 @@ namespace Yi.Framework.Interface.ERP
{
public interface IUnitService : ICrudAppService<UnitGetListOutput, long, UnitCreateUpdateInput>
{
Task<PageModel<List<UnitGetListOutput>>> PageListAsync(UnitCreateUpdateInput input, PageParModel page);
Task<PageModel<List<UnitGetListOutput>>> PageListAsync(UnitGetListInput input, PageParModel page);
}
}

2
Yi.Framework.Net6/Yi.Framework.Interface/ERP/IWarehouseService.cs
View File

@@ -11,6 +11,6 @@ namespace Yi.Framework.Interface.ERP
{
public interface IWarehouseService : ICrudAppService<WarehouseGetListOutput, long, WarehouseCreateUpdateInput>
{
Task<PageModel<List<WarehouseGetListOutput>>> PageListAsync(WarehouseCreateUpdateInput input, PageParModel page);
Task<PageModel<List<WarehouseGetListOutput>>> PageListAsync(WarehouseGetListInput input, PageParModel page);
}
}

2
Yi.Framework.Net6/Yi.Framework.Service/ERP/MaterialService.cs
View File

@@ -16,7 +16,7 @@ namespace Yi.Framework.Service.ERP
{
public class MaterialService : CrudAppService<MaterialEntity, MaterialGetListOutput, long, MaterialCreateUpdateInput>, IMaterialService
{
public async Task<PageModel<List<MaterialGetListOutput>>> PageListAsync(MaterialCreateUpdateInput input, PageParModel page)
public async Task<PageModel<List<MaterialGetListOutput>>> PageListAsync(MaterialGetListInput input, PageParModel page)
{
RefAsync<int> totalNumber = 0;
var data = await Repository._DbQueryable

5
Yi.Framework.Net6/Yi.Framework.Service/ERP/PurchaseDetailsService.cs
View File

@@ -16,12 +16,11 @@ namespace Yi.Framework.Service.ERP
{
public class PurchaseDetailsService : CrudAppService<PurchaseDetailsEntity, PurchaseDetailsGetListOutput, long, PurchaseDetailsCreateUpdateInput>, IPurchaseDetailsService
{
public async Task<PageModel<List<PurchaseDetailsGetListOutput>>> PageListAsync(PurchaseDetailsCreateUpdateInput input, PageParModel page)
public async Task<PageModel<List<PurchaseDetailsGetListOutput>>> PageListAsync(PurchaseDetailsGetListInput input, PageParModel page)
{
RefAsync<int> 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<List<PurchaseDetailsGetListOutput>> { Total = totalNumber.Value, Data = await MapToGetListOutputDtosAsync(data) };
}

4
Yi.Framework.Net6/Yi.Framework.Service/ERP/SupplierService.cs
View File

@@ -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<SupplierEntity, SupplierGetListOutput, long, SupplierCreateUpdateInput>, ISupplierService
{
public async Task<PageModel<List<SupplierGetListOutput>>> PageListAsync(SupplierCreateUpdateInput input, PageParModel page)
public async Task<PageModel<List<SupplierGetListOutput>>> PageListAsync(SupplierGetListInput input, PageParModel page)
{
RefAsync<int> totalNumber = 0;
var data = await Repository._DbQueryable

2
Yi.Framework.Net6/Yi.Framework.Service/ERP/UnitService.cs
View File

@@ -16,7 +16,7 @@ namespace Yi.Framework.Service.ERP
{
public class UnitService : CrudAppService<UnitEntity, UnitGetListOutput, long, UnitCreateUpdateInput>, IUnitService
{
public async Task<PageModel<List<UnitGetListOutput>>> PageListAsync(UnitCreateUpdateInput input, PageParModel page)
public async Task<PageModel<List<UnitGetListOutput>>> PageListAsync(UnitGetListInput input, PageParModel page)
{
RefAsync<int> totalNumber = 0;
var data = await Repository._DbQueryable

2
Yi.Framework.Net6/Yi.Framework.Service/ERP/WarehouseService.cs
View File

@@ -16,7 +16,7 @@ namespace Yi.Framework.Service.ERP
{
public class WarehouseService : CrudAppService<WarehouseEntity, WarehouseGetListOutput, long, WarehouseCreateUpdateInput>, IWarehouseService
{
public async Task<PageModel<List<WarehouseGetListOutput>>> PageListAsync(WarehouseCreateUpdateInput input, PageParModel page)
public async Task<PageModel<List<WarehouseGetListOutput>>> PageListAsync(WarehouseGetListInput input, PageParModel page)
{
RefAsync<int> totalNumber = 0;
var data = await Repository._DbQueryable

16
Yi.Framework.Net6/Yi.Framework.Template/Program.cs
View File

@@ -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();

2
Yi.Framework.Net6/Yi.Framework.Template/Template/Server/ControllerTemplate.txt
View File

@@ -22,7 +22,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers.#ModelName#
/// </summary>
/// <returns></returns>
[HttpGet]
public async Task<Result> PageList([FromQuery] #EntityName#CreateUpdateInput input, [FromQuery] PageParModel page)
public async Task<Result> PageList([FromQuery] #EntityName#GetListInput input, [FromQuery] PageParModel page)
{
var result = await _#LowerEntityName#Service.PageListAsync(input, page);
return Result.Success().SetData(result);

2
Yi.Framework.Net6/Yi.Framework.Template/Template/Server/IServiceTemplate.txt
View File

@@ -11,6 +11,6 @@ namespace Yi.Framework.Interface.#ModelName#
{
public interface I#EntityName#Service : ICrudAppService<#EntityName#GetListOutput, long, #EntityName#CreateUpdateInput>
{
Task<PageModel<List<#EntityName#GetListOutput>>> PageListAsync(#EntityName#CreateUpdateInput input, PageParModel page);
Task<PageModel<List<#EntityName#GetListOutput>>> PageListAsync(#EntityName#GetListInput input, PageParModel page);
}
}

2
Yi.Framework.Net6/Yi.Framework.Template/Template/Server/ServiceTemplate.txt
View File

@@ -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<PageModel<List<#EntityName#GetListOutput>>> PageListAsync(#EntityName#CreateUpdateInput input, PageParModel page)
public async Task<PageModel<List<#EntityName#GetListOutput>>> PageListAsync(#EntityName#GetListInput input, PageParModel page)
{
RefAsync<int> totalNumber = 0;
var data = await Repository._DbQueryable