diff --git a/Reportapi/MyCode.Project.Domain/Message/Response/LxmZHMDReport/PrdMoOrderResp.cs b/Reportapi/MyCode.Project.Domain/Message/Response/LxmZHMDReport/PrdMoOrderResp.cs new file mode 100644 index 0000000..e25a04f --- /dev/null +++ b/Reportapi/MyCode.Project.Domain/Message/Response/LxmZHMDReport/PrdMoOrderResp.cs @@ -0,0 +1,39 @@ +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 PrdMoOrderResp + { + /// + /// 生产订单Id + /// + public int Fid { get; set; } + + /// + /// 订单编号 + /// + public string FBILLNO { get; set; } + + /// + /// 订单编号 + /// + public DateTime FDate { get; set; } + + /// + /// 总数量 + /// + public decimal Qty { get; set; } + + /// + /// 入库总数量 + /// + public decimal InStockQty { get; set; } + } +} diff --git a/Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj b/Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj index b5820b3..16af0de 100644 --- a/Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj +++ b/Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj @@ -68,6 +68,7 @@ + @@ -95,6 +96,7 @@ + diff --git a/Reportapi/MyCode.Project.Domain/Repositories/IMOOrdersRepository.cs b/Reportapi/MyCode.Project.Domain/Repositories/IMOOrdersRepository.cs new file mode 100644 index 0000000..c49fd09 --- /dev/null +++ b/Reportapi/MyCode.Project.Domain/Repositories/IMOOrdersRepository.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using MyCode.Project.Infrastructure; +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 IMOOrdersRepository : IRepository + { + + + /// + /// 获取生产数据 + /// + /// + /// + PageResult GetPrdMoPageList(PagedSearch search); + + } +} diff --git a/Reportapi/MyCode.Project.Repositories/MOOrdersRepository.cs b/Reportapi/MyCode.Project.Repositories/MOOrdersRepository.cs new file mode 100644 index 0000000..bbf66bb --- /dev/null +++ b/Reportapi/MyCode.Project.Repositories/MOOrdersRepository.cs @@ -0,0 +1,64 @@ +using MyCode.Project.Repositories.Common; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using MyCode.Project.Domain.Message; +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 +{ + public class MOOrdersRepository : Repository, IMOOrdersRepository + { + public MOOrdersRepository(MyCodeSqlSugarClient context) : base(context) + { } + + + + + public PageResult GetPrdMoPageList(PagedSearch search) + { + SearchCondition where = new SearchCondition(); + where.AddSqlCondition("1=1 ", true); + + string sql = $@" +SELECT + * +FROM + ( + SELECT + t1.FID Fid, + t1.FBILLNO FBillNo, + t1.FDATE FDate, + SUM(t1e.FQTY) Qty, + SUM( + t1e_a.FSTOCKINFAILAUXQTY + t1e_a.FSTOCKINQUAAUXQTY + ) InStockQty + FROM + T_PRD_MO t1 + LEFT JOIN T_PRD_MOENTRY t1e ON t1.FID = t1e.FID + LEFT JOIN T_PRD_MOENTRY_A t1e_a ON t1e.FENTRYID = t1e_a.FENTRYID + WHERE + 1 = 1 + AND t1.FDOCUMENTSTATUS = 'C' + GROUP BY + t1.FID, + t1.FBILLNO, + t1.FDATE + ) t1Temp + +"; + + + 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.Repositories/MyCode.Project.Repositories.csproj b/Reportapi/MyCode.Project.Repositories/MyCode.Project.Repositories.csproj index 8156859..2f547e4 100644 --- a/Reportapi/MyCode.Project.Repositories/MyCode.Project.Repositories.csproj +++ b/Reportapi/MyCode.Project.Repositories/MyCode.Project.Repositories.csproj @@ -86,6 +86,7 @@ + diff --git a/Reportapi/MyCode.Project.Services/IServices/IPrdOrderService.cs b/Reportapi/MyCode.Project.Services/IServices/IPrdOrderService.cs index be53809..c2ead08 100644 --- a/Reportapi/MyCode.Project.Services/IServices/IPrdOrderService.cs +++ b/Reportapi/MyCode.Project.Services/IServices/IPrdOrderService.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 IPrdOrderService { - + /// + /// 获取生产订单列表数据 + /// + /// + /// + PageResult GetPrdMoPageList(PagedSearch search); } } diff --git a/Reportapi/MyCode.Project.Services/Implementation/PrdOrderService.cs b/Reportapi/MyCode.Project.Services/Implementation/PrdOrderService.cs index 8bfdb21..6e318af 100644 --- a/Reportapi/MyCode.Project.Services/Implementation/PrdOrderService.cs +++ b/Reportapi/MyCode.Project.Services/Implementation/PrdOrderService.cs @@ -1,7 +1,9 @@ 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; +using MyCode.Project.Repositories; using System; namespace MyCode.Project.Services.Implementation @@ -9,11 +11,21 @@ namespace MyCode.Project.Services.Implementation public class PrdOrderService : ServiceBase, IPrdOrderService { - private IYTKJTShopParameterRepository _yTKJTShopParameterRepository; + private IMOOrdersRepository _MOOrdersRepository; - public PrdOrderService(IYTKJTShopParameterRepository yTKJTShopParameterRepository) + public PrdOrderService(IMOOrdersRepository MOOrdersRepository) { - _yTKJTShopParameterRepository = yTKJTShopParameterRepository; + _MOOrdersRepository = MOOrdersRepository; + } + + /// + /// 生产订单列表 + /// + /// + /// + public PageResult GetPrdMoPageList(PagedSearch search) + { + return _MOOrdersRepository.GetPrdMoPageList(search); } }