From b53fbc09a1b78c179089c764a5afecfd202bad48 Mon Sep 17 00:00:00 2001 From: yuyubo <1870149533@qq.com> Date: Sat, 23 Aug 2025 17:09:49 +0800 Subject: [PATCH] 1 --- .../Response/LxmZHMDReport/SalOrderResp.cs | 31 ++++++++++ .../MyCode.Project.Domain.csproj | 1 + .../Repositories/IJackOrdersRepository.cs | 6 +- .../JackOrdersRepository.cs | 21 ++++++- .../IServices/IYuyuboService.cs | 11 +++- .../Implementation/YuyuboService.cs | 13 +++- .../Admin/Controllers/DataChartController.cs | 61 +++++++++++++++++++ .../Controllers/LxmZHMDReportController.cs | 2 +- .../MyCode.Project.WebApi.csproj | 1 + 9 files changed, 138 insertions(+), 9 deletions(-) create mode 100644 Reportapi/MyCode.Project.Domain/Message/Response/LxmZHMDReport/SalOrderResp.cs create mode 100644 Reportapi/MyCode.Project.WebApi/Areas/Admin/Controllers/DataChartController.cs diff --git a/Reportapi/MyCode.Project.Domain/Message/Response/LxmZHMDReport/SalOrderResp.cs b/Reportapi/MyCode.Project.Domain/Message/Response/LxmZHMDReport/SalOrderResp.cs new file mode 100644 index 0000000..874695c --- /dev/null +++ b/Reportapi/MyCode.Project.Domain/Message/Response/LxmZHMDReport/SalOrderResp.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MyCode.Project.Domain.Message.Response.LxmZHMDReport +{ + public class SalOrderResp + { + + + public int Fid { get; set; } + + /// + /// 客户名称 + /// + public string CustomerName { get; set; } + + /// + /// 订单编号 + /// + public string FBILLNO { get; set; } + + + /// + /// 总数量 + /// + public decimal Qty { get; set; } + } +} diff --git a/Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj b/Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj index 72d2153..08b5a27 100644 --- a/Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj +++ b/Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj @@ -69,6 +69,7 @@ + diff --git a/Reportapi/MyCode.Project.Domain/Repositories/IJackOrdersRepository.cs b/Reportapi/MyCode.Project.Domain/Repositories/IJackOrdersRepository.cs index 4dad171..1a74353 100644 --- a/Reportapi/MyCode.Project.Domain/Repositories/IJackOrdersRepository.cs +++ b/Reportapi/MyCode.Project.Domain/Repositories/IJackOrdersRepository.cs @@ -8,11 +8,13 @@ using MyCode.Project.Domain; using MyCode.Project.Domain.Model; using MyCode.Project.Infrastructure.Common; using MyCode.Project.Domain.Message; +using MyCode.Project.Domain.Message.Response.LxmZHMDReport; namespace MyCode.Project.Domain.Repositories { public interface IJackOrdersRepository : IRepository { - - } + PageResult GetPageList(PagedSearch search); + + } } diff --git a/Reportapi/MyCode.Project.Repositories/JackOrdersRepository.cs b/Reportapi/MyCode.Project.Repositories/JackOrdersRepository.cs index 621a990..5613904 100644 --- a/Reportapi/MyCode.Project.Repositories/JackOrdersRepository.cs +++ b/Reportapi/MyCode.Project.Repositories/JackOrdersRepository.cs @@ -9,6 +9,7 @@ using MyCode.Project.Domain.Model; using MyCode.Project.Domain.Repositories; using MyCode.Project.Infrastructure.Common; using MyCode.Project.Infrastructure.Search; +using MyCode.Project.Domain.Message.Response.LxmZHMDReport; namespace MyCode.Project.Repositories { @@ -17,10 +18,24 @@ namespace MyCode.Project.Repositories public JackOrdersRepository(MyCodeSqlSugarClient context) : base(context) { } - + + public PageResult GetPageList(PagedSearch search) + { + + SearchCondition where = new SearchCondition(); + + where.AddSqlCondition("a.FDOCUMENTSTATUS='C' ", true); + + string sql = $@" SELECT C.FNAME AS CustomerName,a.FBILLNO,a.FDATE,a.FID FROM T_SAL_ORDER A WITH(NOLOCK) + LEFT JOIN T_BD_CUSTOMER Cccc WITH(NOLOCK) ON Cccc.FCUSTID= A.FCUSTID + LEFT JOIN T_BD_CUSTOMER_L C WITH(NOLOCK) ON C.FCUSTID= A.FCUSTID AND C.FLOCALEID= 2052 "; + + + var list = this.SelectListPage(sql, where, search.Page, search.PageSize, $@"FDATE desc "); + return list; + } - - } + } } \ No newline at end of file diff --git a/Reportapi/MyCode.Project.Services/IServices/IYuyuboService.cs b/Reportapi/MyCode.Project.Services/IServices/IYuyuboService.cs index 5f68dad..7d31e6a 100644 --- a/Reportapi/MyCode.Project.Services/IServices/IYuyuboService.cs +++ b/Reportapi/MyCode.Project.Services/IServices/IYuyuboService.cs @@ -1,10 +1,17 @@ -using MyCode.Project.Infrastructure.JackYun; +using MyCode.Project.Domain.Message.Response.LxmZHMDReport; +using MyCode.Project.Infrastructure.Common; +using MyCode.Project.Infrastructure.JackYun; namespace MyCode.Project.Services { public interface IYuyuboService { - + /// + /// 销售订单列表 + /// + /// + /// + PageResult GetPageList(PagedSearch search); } } diff --git a/Reportapi/MyCode.Project.Services/Implementation/YuyuboService.cs b/Reportapi/MyCode.Project.Services/Implementation/YuyuboService.cs index c56fcf9..5414637 100644 --- a/Reportapi/MyCode.Project.Services/Implementation/YuyuboService.cs +++ b/Reportapi/MyCode.Project.Services/Implementation/YuyuboService.cs @@ -1,4 +1,5 @@ using MyCode.Project.Domain.Message.Request.JackYun; +using MyCode.Project.Domain.Message.Response.LxmZHMDReport; using MyCode.Project.Domain.Repositories; using MyCode.Project.Infrastructure.Common; using MyCode.Project.Infrastructure.JackYun; @@ -6,7 +7,7 @@ using System; namespace MyCode.Project.Services.Implementation { - public class YuyuboService : ServiceBase //,// IJackYunService + public class YuyuboService : ServiceBase , IYuyuboService { private IJackOrdersRepository _jackOrdersRepository; @@ -16,5 +17,15 @@ namespace MyCode.Project.Services.Implementation _jackOrdersRepository = jackOrdersRepository; } + /// + /// 销售订单列表 + /// + /// + /// + public PageResult GetPageList(PagedSearch search) + { + return _jackOrdersRepository.GetPageList(search); + } + } } diff --git a/Reportapi/MyCode.Project.WebApi/Areas/Admin/Controllers/DataChartController.cs b/Reportapi/MyCode.Project.WebApi/Areas/Admin/Controllers/DataChartController.cs new file mode 100644 index 0000000..479a430 --- /dev/null +++ b/Reportapi/MyCode.Project.WebApi/Areas/Admin/Controllers/DataChartController.cs @@ -0,0 +1,61 @@ +using MyCode.Project.Domain.Message.Act.Common; +using MyCode.Project.Domain.Message.Response.LxmZHMDReport; +using MyCode.Project.Infrastructure.Cache; +using MyCode.Project.Infrastructure.Common; +using MyCode.Project.Infrastructure.Constant; +using MyCode.Project.Infrastructure.Enumeration; +using MyCode.Project.Infrastructure.Exceptions; +using MyCode.Project.Services; +using MyCode.Project.WebApi.App_Filter; +using System; +using System.IO; +using System.Web.Http; + +namespace MyCode.Project.WebApi.Areas.Admin.Controllers +{ + /// + /// 报表 + /// + public class DataChartController : BaseAdminController + { + #region 初始化 + private IYuyuboService _yuyuboService; + + public DataChartController(IYuyuboService yuyuboService) + { + _yuyuboService = yuyuboService; + + + } + #endregion + + #region Test(测试方法) + /// + /// 测试方法 + /// + [AllowAnonymous] + [HttpGet] + public string Test() + { + + return "test"; + + } + #endregion + + + /// + /// 销售订单列表 + /// + /// + /// + [HttpPost] + [AllowAnonymous] + public PageResult GetPageList(PagedSearch search) + { + return _yuyuboService.GetPageList(search); + } + + + } +} diff --git a/Reportapi/MyCode.Project.WebApi/Areas/Admin/Controllers/LxmZHMDReportController.cs b/Reportapi/MyCode.Project.WebApi/Areas/Admin/Controllers/LxmZHMDReportController.cs index eb78834..c05e19a 100644 --- a/Reportapi/MyCode.Project.WebApi/Areas/Admin/Controllers/LxmZHMDReportController.cs +++ b/Reportapi/MyCode.Project.WebApi/Areas/Admin/Controllers/LxmZHMDReportController.cs @@ -13,7 +13,7 @@ using System.Web.Http; namespace MyCode.Project.WebApi.Areas.Admin.Controllers { /// - /// 流行美智慧门店报表 + /// 导出功能 /// public class LxmZHMDReportController : BaseAdminController { diff --git a/Reportapi/MyCode.Project.WebApi/MyCode.Project.WebApi.csproj b/Reportapi/MyCode.Project.WebApi/MyCode.Project.WebApi.csproj index 7e0b55c..14e5972 100644 --- a/Reportapi/MyCode.Project.WebApi/MyCode.Project.WebApi.csproj +++ b/Reportapi/MyCode.Project.WebApi/MyCode.Project.WebApi.csproj @@ -203,6 +203,7 @@ +