From 160447703b0f34f8f40fc430b1df13060be5ad61 Mon Sep 17 00:00:00 2001 From: liqionghai <1> Date: Sun, 24 Aug 2025 02:51:25 +0800 Subject: [PATCH] 1 --- .../Response/PurOrder/PurOrderDetilResp.cs | 46 +++++++++++ .../Response/PurOrder/PurOrderMainResp.cs | 49 ++++++++++++ .../MyCode.Project.Domain.csproj | 5 +- .../Repositories/IPurOrderRepository.cs | 33 ++++++++ .../IPushKingDeeOrderRepository.cs | 30 -------- .../MyCode.Project.Repositories.csproj | 2 +- .../PurOrderRepository.cs | 76 +++++++++++++++++++ .../PushKingDeeOrderRepository.cs | 26 ------- .../IServices/ILiQiongHaiService.cs | 10 --- .../IServices/IPurOrderService.cs | 15 ++++ .../Implementation/LiQiongHaiService.cs | 21 ----- .../Implementation/PurOrderService.cs | 31 ++++++++ .../MyCode.Project.Services.csproj | 4 +- .../Controllers/TestController.cs | 44 +++++++++-- 14 files changed, 294 insertions(+), 98 deletions(-) create mode 100644 Reportapi/MyCode.Project.Domain/Message/Response/PurOrder/PurOrderDetilResp.cs create mode 100644 Reportapi/MyCode.Project.Domain/Message/Response/PurOrder/PurOrderMainResp.cs create mode 100644 Reportapi/MyCode.Project.Domain/Repositories/IPurOrderRepository.cs delete mode 100644 Reportapi/MyCode.Project.Domain/Repositories/IPushKingDeeOrderRepository.cs create mode 100644 Reportapi/MyCode.Project.Repositories/PurOrderRepository.cs delete mode 100644 Reportapi/MyCode.Project.Repositories/PushKingDeeOrderRepository.cs delete mode 100644 Reportapi/MyCode.Project.Services/IServices/ILiQiongHaiService.cs create mode 100644 Reportapi/MyCode.Project.Services/IServices/IPurOrderService.cs delete mode 100644 Reportapi/MyCode.Project.Services/Implementation/LiQiongHaiService.cs create mode 100644 Reportapi/MyCode.Project.Services/Implementation/PurOrderService.cs diff --git a/Reportapi/MyCode.Project.Domain/Message/Response/PurOrder/PurOrderDetilResp.cs b/Reportapi/MyCode.Project.Domain/Message/Response/PurOrder/PurOrderDetilResp.cs new file mode 100644 index 0000000..dc35799 --- /dev/null +++ b/Reportapi/MyCode.Project.Domain/Message/Response/PurOrder/PurOrderDetilResp.cs @@ -0,0 +1,46 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MyCode.Project.Domain.Message.Response.PurOrder +{ + public class PurOrderDetilResp + { + + + public int Fid { get; set; } + + /// + /// 物料名称 + /// + public string MaterialName { get; set; } + + ///// + ///// 订单编号 + ///// + //public string FBILLNO { get; set; } + + + /// + /// 采购数量 + /// + public decimal Qty { get; set; } + + /// + /// 总入库数量 + /// + public decimal StockInQty { get; set; } + + /// + /// 总未入库数量 + /// + public decimal RemainStockInQty { get;set; } + + /// + /// 入库比例 + /// + public decimal StockInRate { get; set; } + } +} diff --git a/Reportapi/MyCode.Project.Domain/Message/Response/PurOrder/PurOrderMainResp.cs b/Reportapi/MyCode.Project.Domain/Message/Response/PurOrder/PurOrderMainResp.cs new file mode 100644 index 0000000..c913809 --- /dev/null +++ b/Reportapi/MyCode.Project.Domain/Message/Response/PurOrder/PurOrderMainResp.cs @@ -0,0 +1,49 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MyCode.Project.Domain.Message.Response.PurOrder +{ + public class PurOrderMainResp + { + + public int Fid { get; set; } + + /// + /// 供应商名称 + /// + public string SupplierName { get; set; } + + /// + /// 订单编号 + /// + public string FBILLNO { get; set; } + + /// + /// 采购日期 + /// + public string FDate { get; set; } + + /// + /// 总数量 + /// + public decimal Qty { get; set; } + + /// + /// 总入库数量 + /// + public decimal StockInQty { get; set; } + + /// + /// 总未入库数量 + /// + public decimal RemainStockInQty { get; set; } + + /// + /// 入库比例 + /// + public decimal StockInRate { get; set; } + } +} diff --git a/Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj b/Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj index 08f306f..5eed7b9 100644 --- a/Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj +++ b/Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj @@ -70,6 +70,8 @@ + + @@ -85,7 +87,7 @@ - + @@ -113,7 +115,6 @@ - diff --git a/Reportapi/MyCode.Project.Domain/Repositories/IPurOrderRepository.cs b/Reportapi/MyCode.Project.Domain/Repositories/IPurOrderRepository.cs new file mode 100644 index 0000000..b247856 --- /dev/null +++ b/Reportapi/MyCode.Project.Domain/Repositories/IPurOrderRepository.cs @@ -0,0 +1,33 @@ +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.PurOrder; +using MyCode.Project.Domain.Message.Act.Common; + +namespace MyCode.Project.Domain.Repositories +{ + public interface IPurOrderRepository : IRepository + { + /// + /// 根据查询参数查询采购订单列表 + /// + /// + /// + PageResult GetPurOrderMain(PagedSearch search); + + /// + /// 根据内码查采购订单明细 + /// + /// + /// + /// + PageResult GetPurOrderDetil(PagedSearch search); + } +} diff --git a/Reportapi/MyCode.Project.Domain/Repositories/IPushKingDeeOrderRepository.cs b/Reportapi/MyCode.Project.Domain/Repositories/IPushKingDeeOrderRepository.cs deleted file mode 100644 index 1204b68..0000000 --- a/Reportapi/MyCode.Project.Domain/Repositories/IPushKingDeeOrderRepository.cs +++ /dev/null @@ -1,30 +0,0 @@ -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; - -namespace MyCode.Project.Domain.Repositories -{ - public interface IPushKingDeeOrderRepository : IRepository - { - ///// - ///// 根据行数查询采购订单列表 - ///// - ///// - ///// - //PageResult PurOrderMainQuery(int PageSize); - - ///// - ///// 根据内码查采购订单明细 - ///// - ///// - ///// - //PageResult PurOrderDetilQuery(int FID); - } -} diff --git a/Reportapi/MyCode.Project.Repositories/MyCode.Project.Repositories.csproj b/Reportapi/MyCode.Project.Repositories/MyCode.Project.Repositories.csproj index 19a8647..6040b3c 100644 --- a/Reportapi/MyCode.Project.Repositories/MyCode.Project.Repositories.csproj +++ b/Reportapi/MyCode.Project.Repositories/MyCode.Project.Repositories.csproj @@ -90,7 +90,7 @@ - + diff --git a/Reportapi/MyCode.Project.Repositories/PurOrderRepository.cs b/Reportapi/MyCode.Project.Repositories/PurOrderRepository.cs new file mode 100644 index 0000000..cb0a8fb --- /dev/null +++ b/Reportapi/MyCode.Project.Repositories/PurOrderRepository.cs @@ -0,0 +1,76 @@ +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.PurOrder; +using MyCode.Project.Domain.Message.Act.Common; + +namespace MyCode.Project.Repositories +{ + public class PurOrderRepository: Repository, IPurOrderRepository + { + public PurOrderRepository(MyCodeSqlSugarClient context) : base(context) + { } + + + public PageResult GetPurOrderMain(PagedSearch search) + { + SearchCondition where = new SearchCondition(); + + //where.AddSqlCondition("a.FDOCUMENTSTATUS='C' ", true); + where.AddSqlCondition("1 = 1 ", true); + + string sql = $@" + SELECT *,a.StockInQty/a.Qty AS 'StockInRate' + FROM( + SELECT a.FID AS 'Fid',C.FNAME AS 'SupplierName',a.FBILLNO,FORMAT(a.FDATE,'yyyy-MM-dd') AS 'FDate',SUM(D.FQTY) AS 'Qty',SUM(E.FSTOCKINQTY) AS'StockInQty' + ,SUM(E.FREMAINSTOCKINQTY) AS 'RemainStockInQty' + FROM t_PUR_POOrder A WITH(NOLOCK) + LEFT JOIN T_BD_SUPPLIER Cccc WITH(NOLOCK) ON Cccc.FSUPPLIERID= A.FSUPPLIERID + LEFT JOIN T_BD_SUPPLIER_L C WITH(NOLOCK) ON C.FSUPPLIERID= A.FSUPPLIERID AND C.FLOCALEID= 2052 + LEFT JOIN t_PUR_POOrderEntry D WITH(NOLOCK) ON A.FID = D.FID + LEFT JOIN t_PUR_POOrderEntry_R E WITH(NOLOCK) ON E.FENTRYID = D.FENTRYID + GROUP BY a.FID,C.FNAME,a.FBILLNO,a.FDATE + ) a"; + + + var list = this.SelectListPage(sql, where, search.Page, search.PageSize, $@"FDate desc "); + return list; + } + + public PageResult GetPurOrderDetil(PagedSearch search) + { + SearchCondition where = new SearchCondition(); + + //where.AddSqlCondition("a.FDOCUMENTSTATUS='C' ", true); + where.AddSqlCondition($"A.Fid = {search.Condition.Id} ", true); + + string sql = $@" + SELECT A.FID AS 'Fid',C.FNAME AS 'MaterialName',D.FQTY AS 'Qty',E.FSTOCKINQTY AS'StockInQty',E.FREMAINSTOCKINQTY AS 'RemainStockInQty',E.FSTOCKINQTY/D.FQTY AS 'StockInRate' + FROM t_PUR_POOrder A WITH(NOLOCK) + LEFT JOIN t_PUR_POOrderEntry D WITH(NOLOCK) ON A.FID = D.FID + LEFT JOIN t_PUR_POOrderEntry_R E WITH(NOLOCK) ON E.FENTRYID = D.FENTRYID + LEFT JOIN T_BD_MATERIAL_L C WITH(NOLOCK) ON C.FMATERIALID = D.FMATERIALID AND C.FLOCALEID= 2052 + WHERE 1=1 + AND A.Fid = {search.Condition.Id} "; + + //var list = this.SelectListPage(sql, where, search.Page, search.PageSize, $@"Fid desc "); + + var result = new PageResult(); + + result.DataList = this.SelectList(sql); + result.TotalCount = result.DataList.Count; + + return result; + } + + + } +} \ No newline at end of file diff --git a/Reportapi/MyCode.Project.Repositories/PushKingDeeOrderRepository.cs b/Reportapi/MyCode.Project.Repositories/PushKingDeeOrderRepository.cs deleted file mode 100644 index ae45f55..0000000 --- a/Reportapi/MyCode.Project.Repositories/PushKingDeeOrderRepository.cs +++ /dev/null @@ -1,26 +0,0 @@ -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; - -namespace MyCode.Project.Repositories -{ - public class PushKingDeeOrderRepository: Repository, IPushKingDeeOrderRepository - { - public PushKingDeeOrderRepository(MyCodeSqlSugarClient context) : base(context) - { } - - - - - - - } -} \ No newline at end of file diff --git a/Reportapi/MyCode.Project.Services/IServices/ILiQiongHaiService.cs b/Reportapi/MyCode.Project.Services/IServices/ILiQiongHaiService.cs deleted file mode 100644 index e2b7613..0000000 --- a/Reportapi/MyCode.Project.Services/IServices/ILiQiongHaiService.cs +++ /dev/null @@ -1,10 +0,0 @@ -using MyCode.Project.Infrastructure.JackYun; - -namespace MyCode.Project.Services -{ - public interface ILiQiongHaiService - { - - - } -} diff --git a/Reportapi/MyCode.Project.Services/IServices/IPurOrderService.cs b/Reportapi/MyCode.Project.Services/IServices/IPurOrderService.cs new file mode 100644 index 0000000..dc23929 --- /dev/null +++ b/Reportapi/MyCode.Project.Services/IServices/IPurOrderService.cs @@ -0,0 +1,15 @@ +using MyCode.Project.Domain.Message.Act.Common; +using MyCode.Project.Domain.Message.Response.PurOrder; +using MyCode.Project.Infrastructure.Common; +using MyCode.Project.Infrastructure.JackYun; + +namespace MyCode.Project.Services +{ + public interface IPurOrderService + { + + PageResult GetPurMain(PagedSearch search); + + PageResult GetPurDetil(PagedSearch search); + } +} diff --git a/Reportapi/MyCode.Project.Services/Implementation/LiQiongHaiService.cs b/Reportapi/MyCode.Project.Services/Implementation/LiQiongHaiService.cs deleted file mode 100644 index d1d1e1f..0000000 --- a/Reportapi/MyCode.Project.Services/Implementation/LiQiongHaiService.cs +++ /dev/null @@ -1,21 +0,0 @@ -using MyCode.Project.Domain.Message.Request.JackYun; -using MyCode.Project.Domain.Repositories; -using MyCode.Project.Infrastructure.Common; -using MyCode.Project.Infrastructure.JackYun; -using System; - -namespace MyCode.Project.Services.Implementation -{ - public class LiQiongHaiService : ServiceBase //, ILiQiongHaiService - { - - private IPushKingDeeOrderRepository _pushKingDeeOrderRepository; - - public LiQiongHaiService(IPushKingDeeOrderRepository pushKingDeeOrderRepository) - { - _pushKingDeeOrderRepository = pushKingDeeOrderRepository; - } - - - } -} diff --git a/Reportapi/MyCode.Project.Services/Implementation/PurOrderService.cs b/Reportapi/MyCode.Project.Services/Implementation/PurOrderService.cs new file mode 100644 index 0000000..f6728a4 --- /dev/null +++ b/Reportapi/MyCode.Project.Services/Implementation/PurOrderService.cs @@ -0,0 +1,31 @@ +using MyCode.Project.Domain.Message.Act.Common; +using MyCode.Project.Domain.Message.Request.JackYun; +using MyCode.Project.Domain.Message.Response.PurOrder; +using MyCode.Project.Domain.Repositories; +using MyCode.Project.Infrastructure.Common; +using MyCode.Project.Infrastructure.JackYun; +using System; + +namespace MyCode.Project.Services.Implementation +{ + public class PurOrderService : ServiceBase , IPurOrderService + { + + private IPurOrderRepository _pushKingDeeOrderRepository; + + public PurOrderService(IPurOrderRepository pushKingDeeOrderRepository) + { + _pushKingDeeOrderRepository = pushKingDeeOrderRepository; + } + + public PageResult GetPurMain(PagedSearch search) + { + return _pushKingDeeOrderRepository.GetPurOrderMain(search); + } + + public PageResult GetPurDetil(PagedSearch search) + { + return _pushKingDeeOrderRepository.GetPurOrderDetil(search); + } + } +} diff --git a/Reportapi/MyCode.Project.Services/MyCode.Project.Services.csproj b/Reportapi/MyCode.Project.Services/MyCode.Project.Services.csproj index 262fe1b..870aa3a 100644 --- a/Reportapi/MyCode.Project.Services/MyCode.Project.Services.csproj +++ b/Reportapi/MyCode.Project.Services/MyCode.Project.Services.csproj @@ -116,13 +116,13 @@ - + - + diff --git a/Reportapi/MyCode.Project.WebApi/Controllers/TestController.cs b/Reportapi/MyCode.Project.WebApi/Controllers/TestController.cs index ab9d6da..5cfde30 100644 --- a/Reportapi/MyCode.Project.WebApi/Controllers/TestController.cs +++ b/Reportapi/MyCode.Project.WebApi/Controllers/TestController.cs @@ -1,4 +1,9 @@ -using MyCode.Project.Infrastructure.Common; +using MyCode.Project.Domain.Message.Act.Common; +using MyCode.Project.Domain.Message.Response.PurOrder; +using MyCode.Project.Infrastructure.Common; +using MyCode.Project.Services; +using MyCode.Project.Services.Implementation; +using System; using System.Web.Http; namespace MyCode.Project.WebApi.Controllers @@ -7,14 +12,41 @@ namespace MyCode.Project.WebApi.Controllers /// 测试接口 /// public class TestController : BaseAPIController - { - - public TestController( ) + { + IPurOrderService _PurOrderService; + + public TestController(IPurOrderService purOrderService) { - + _PurOrderService = purOrderService; } - + public TestController() + { + } + #region 测试 + + /// + /// 测试采购看板 + /// + [HttpPost] + [AllowAnonymous] + public PageResult GetPurOrderMain(PagedSearch search) + { + return _PurOrderService.GetPurMain(search); + } + + + /// + /// 测试采购看板 + /// + [HttpPost] + [AllowAnonymous] + public PageResult GetPurOrderDetil(PagedSearch search) + { + return _PurOrderService.GetPurDetil(search); + } + #endregion + //#region AESEncrypt(AES加密) /////