Develop/YunTongJackYunTask
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'YanShi' of http://8.130.121.29:3000/Develop/YunTongJackYunTask into YanShi

Browse Source
This commit is contained in:
liqionghai 2025-08-23 17:14:45 +08:00
commit 9e4214fdd9
9 changed files with 138 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Reportapi/MyCode.Project.Domain/Message/Response/LxmZHMDReport/SalOrderResp.cs Normal file
View File

@ -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; }
/// <summary>
/// 客户名称
/// </summary>
public string CustomerName { get; set; }
/// <summary>
/// 订单编号
/// </summary>
public string FBILLNO { get; set; }
/// <summary>
/// 总数量
/// </summary>
public decimal Qty { get; set; }
}
}

1
Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj
View File

@ -69,6 +69,7 @@
<Compile Include="Message\Response\Common\ItemResult.cs" />
<Compile Include="Message\Response\Common\ListHeadFieldData.cs" />
<Compile Include="Message\Response\LxmZHMDReport\ReportCalRateResp.cs" />
<Compile Include="Message\Response\LxmZHMDReport\SalOrderResp.cs" />
<Compile Include="Message\Response\Queue\QueueProcess.cs" />
<Compile Include="Message\Response\User\AdminLoginInfo.cs" />
<Compile Include="Message\Response\User\LoginInfo.cs" />

6
Reportapi/MyCode.Project.Domain/Repositories/IJackOrdersRepository.cs
View File

@ -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<JackOrders>
{
}
PageResult<SalOrderResp> GetPageList(PagedSearch search);
}
}

21
Reportapi/MyCode.Project.Repositories/JackOrdersRepository.cs
View File

@ -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<SalOrderResp> 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<SalOrderResp>(sql, where, search.Page, search.PageSize, $@"FDATE desc ");
return list;
}
}
}
}

11
Reportapi/MyCode.Project.Services/IServices/IYuyuboService.cs
View File

@ -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
{
/// <summary>
/// 销售订单列表
/// </summary>
/// <param name="search"></param>
/// <returns></returns>
PageResult<SalOrderResp> GetPageList(PagedSearch search);
}
}

13
Reportapi/MyCode.Project.Services/Implementation/YuyuboService.cs
View File

@ -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;
}
/// <summary>
/// 销售订单列表
/// </summary>
/// <param name="search"></param>
/// <returns></returns>
public PageResult<SalOrderResp> GetPageList(PagedSearch search)
{
return _jackOrdersRepository.GetPageList(search);
}
}
}

61
Reportapi/MyCode.Project.WebApi/Areas/Admin/Controllers/DataChartController.cs Normal file
View File

@ -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
{
/// <summary>
/// 报表
/// </summary>
public class DataChartController : BaseAdminController
{
#region 初始化
private IYuyuboService _yuyuboService;
public DataChartController(IYuyuboService yuyuboService)
{
_yuyuboService = yuyuboService;
}
#endregion
#region Test(测试方法)
/// <summary>
/// 测试方法
/// </summary>
[AllowAnonymous]
[HttpGet]
public string Test()
{
return "test";
}
#endregion
/// <summary>
/// 销售订单列表
/// </summary>
/// <param name="search"></param>
/// <returns></returns>
[HttpPost]
[AllowAnonymous]
public PageResult<SalOrderResp> GetPageList(PagedSearch search)
{
return _yuyuboService.GetPageList(search);
}
}
}

2
Reportapi/MyCode.Project.WebApi/Areas/Admin/Controllers/LxmZHMDReportController.cs
View File

@ -13,7 +13,7 @@ using System.Web.Http;
namespace MyCode.Project.WebApi.Areas.Admin.Controllers
{
/// <summary>
/// 流行美智慧门店报表
/// 导出功能
/// </summary>
public class LxmZHMDReportController : BaseAdminController
{

1
Reportapi/MyCode.Project.WebApi/MyCode.Project.WebApi.csproj
View File

@ -203,6 +203,7 @@
<Compile Include="App_Start\UnityWebApiActivator.cs" />
<Compile Include="App_Start\WebApiConfig.cs" />
<Compile Include="Areas\Admin\Controllers\BaseAdminController.cs" />
<Compile Include="Areas\Admin\Controllers\DataChartController.cs" />
<Compile Include="Areas\Admin\Controllers\LxmZHMDReportController.cs" />
<Compile Include="Areas\Extensions.cs" />
<Compile Include="Areas\Wechat\Controllers\BaseWechatController.cs" />