From c7b9a44f8c5669745dd460224eff955dc63a8262 Mon Sep 17 00:00:00 2001
From: yuyubo <1870149533@qq.com>
Date: Sun, 24 Aug 2025 19:00:55 +0800
Subject: [PATCH] 1
---
.../Response/LxmZHMDReport/SalOrderResp.cs | 65 ++++-
.../Repositories/IJackOrdersRepository.cs | 2 +
.../JackOrdersRepository.cs | 20 ++
.../PurOrderRepository.cs | 5 +
.../IServices/IYuyuboService.cs | 10 +-
.../Implementation/YuyuboService.cs | 13 +-
.../Admin/Controllers/DataChartController.cs | 64 ++++-
.../MyCode.Project.WebApi.csproj | 2 -
Reportapi/MyCode.Project.WebApi/Web.config | 253 ++++++++++++++++++
9 files changed, 426 insertions(+), 8 deletions(-)
create mode 100644 Reportapi/MyCode.Project.WebApi/Web.config
diff --git a/Reportapi/MyCode.Project.Domain/Message/Response/LxmZHMDReport/SalOrderResp.cs b/Reportapi/MyCode.Project.Domain/Message/Response/LxmZHMDReport/SalOrderResp.cs
index 874695c..2d3ab6e 100644
--- a/Reportapi/MyCode.Project.Domain/Message/Response/LxmZHMDReport/SalOrderResp.cs
+++ b/Reportapi/MyCode.Project.Domain/Message/Response/LxmZHMDReport/SalOrderResp.cs
@@ -8,7 +8,9 @@ namespace MyCode.Project.Domain.Message.Response.LxmZHMDReport
{
public class SalOrderResp
{
-
+ ///
+ /// 主键ID
+ ///
public int Fid { get; set; }
@@ -24,8 +26,67 @@ namespace MyCode.Project.Domain.Message.Response.LxmZHMDReport
///
- /// 总数量
+ /// 销售数量
///
public decimal Qty { get; set; }
+
+ ///
+ /// 出库数量
+ ///
+ public decimal FStockOutQty { get; set; }
+
+ ///
+ /// 出库数量
+ ///
+ public decimal FRemainOutQty { get; set; }
+
+ ///
+ /// 出库比例
+ ///
+ public decimal OutboundPercentage { get; set; }
+ }
+
+ public class SalOrderDetailResp
+ {
+
+
+ public int Fid { get; set; }
+
+ ///
+ /// 主键ID
+ ///
+ public int FENTRYID { get; set; }
+
+ ///
+ /// 物料名称
+ ///
+ public string FNAME { get; set; }
+
+ ///
+ /// 订单编号
+ ///
+ public string FBILLNO { get; set; }
+
+
+ ///
+ /// 销售数量
+ ///
+ public decimal Qty { get; set; }
+
+ ///
+ /// 出库数量
+ ///
+ public decimal FStockOutQty { get; set; }
+
+ ///
+ /// 出库数量
+ ///
+ public decimal FRemainOutQty { get; set; }
+
+ ///
+ /// 出库比例
+ ///
+ public decimal OutboundPercentage { get; set; }
+
}
}
diff --git a/Reportapi/MyCode.Project.Domain/Repositories/IJackOrdersRepository.cs b/Reportapi/MyCode.Project.Domain/Repositories/IJackOrdersRepository.cs
index 1a74353..75a8b50 100644
--- a/Reportapi/MyCode.Project.Domain/Repositories/IJackOrdersRepository.cs
+++ b/Reportapi/MyCode.Project.Domain/Repositories/IJackOrdersRepository.cs
@@ -9,6 +9,7 @@ using MyCode.Project.Domain.Model;
using MyCode.Project.Infrastructure.Common;
using MyCode.Project.Domain.Message;
using MyCode.Project.Domain.Message.Response.LxmZHMDReport;
+using MyCode.Project.Domain.Message.Act.Common;
namespace MyCode.Project.Domain.Repositories
{
@@ -16,5 +17,6 @@ namespace MyCode.Project.Domain.Repositories
{
PageResult GetPageList(PagedSearch search);
+ PageResult GetDetailPageList(PagedSearch search);
}
}
diff --git a/Reportapi/MyCode.Project.Repositories/JackOrdersRepository.cs b/Reportapi/MyCode.Project.Repositories/JackOrdersRepository.cs
index d8e4d10..725ee1b 100644
--- a/Reportapi/MyCode.Project.Repositories/JackOrdersRepository.cs
+++ b/Reportapi/MyCode.Project.Repositories/JackOrdersRepository.cs
@@ -44,6 +44,26 @@ namespace MyCode.Project.Repositories
}
+ public PageResult GetDetailPageList(PagedSearch search)
+ {
+ var Condition = search.Condition;
+ SearchCondition where = new SearchCondition();
+
+ where.AddCondition("a.fid ", Condition.Id ,SqlOperator.Equal,true);
+
+ string sql = $@"
+ SELECT a.FID, c.FNAME,a.FENTRYID,a.FQTY,f.FStockOutQty,(FQTY-FStockOutQty) AS FRemainOutQty
+ ,OutboundPercentage=CONVERT(DECIMAL(18,2),(CASE WHEN FQTY !=0 THEN FStockOutQty/FQTY*1.00 ELSE 0 END))
+ FROM dbo.T_SAL_ORDERENTRY a
+ LEFT JOIN dbo.T_BD_MATERIAL b ON a.FMATERIALID=b.FMATERIALID
+ LEFT JOIN dbo.T_BD_MATERIAL_L c ON b.FMATERIALID=c.FMATERIALID
+ LEFT JOIN T_SAL_ORDERENTRY_R f ON a.FENTRYID=f.FENTRYID";
+
+
+ var list = this.SelectListPage(sql, where, search.Page, search.PageSize, $@"FENTRYID ");
+ return list;
+ }
+
}
}
\ No newline at end of file
diff --git a/Reportapi/MyCode.Project.Repositories/PurOrderRepository.cs b/Reportapi/MyCode.Project.Repositories/PurOrderRepository.cs
index cb0a8fb..aeba264 100644
--- a/Reportapi/MyCode.Project.Repositories/PurOrderRepository.cs
+++ b/Reportapi/MyCode.Project.Repositories/PurOrderRepository.cs
@@ -45,6 +45,11 @@ namespace MyCode.Project.Repositories
return list;
}
+ ///
+ /// 销售订单详情
+ ///
+ ///
+ ///
public PageResult GetPurOrderDetil(PagedSearch search)
{
SearchCondition where = new SearchCondition();
diff --git a/Reportapi/MyCode.Project.Services/IServices/IYuyuboService.cs b/Reportapi/MyCode.Project.Services/IServices/IYuyuboService.cs
index 7d31e6a..3c32061 100644
--- a/Reportapi/MyCode.Project.Services/IServices/IYuyuboService.cs
+++ b/Reportapi/MyCode.Project.Services/IServices/IYuyuboService.cs
@@ -1,4 +1,5 @@
-using MyCode.Project.Domain.Message.Response.LxmZHMDReport;
+using MyCode.Project.Domain.Message.Act.Common;
+using MyCode.Project.Domain.Message.Response.LxmZHMDReport;
using MyCode.Project.Infrastructure.Common;
using MyCode.Project.Infrastructure.JackYun;
@@ -13,5 +14,12 @@ namespace MyCode.Project.Services
///
///
PageResult GetPageList(PagedSearch search);
+
+ ///
+ /// 销售订单明细列表
+ ///
+ ///
+ ///
+ PageResult GetDetailPageList(PagedSearch search);
}
}
diff --git a/Reportapi/MyCode.Project.Services/Implementation/YuyuboService.cs b/Reportapi/MyCode.Project.Services/Implementation/YuyuboService.cs
index 5414637..12484e1 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.Act.Common;
+using MyCode.Project.Domain.Message.Request.JackYun;
using MyCode.Project.Domain.Message.Response.LxmZHMDReport;
using MyCode.Project.Domain.Repositories;
using MyCode.Project.Infrastructure.Common;
@@ -27,5 +28,15 @@ namespace MyCode.Project.Services.Implementation
return _jackOrdersRepository.GetPageList(search);
}
+ ///
+ /// 销售订单明细列表
+ ///
+ ///
+ ///
+ public PageResult GetDetailPageList(PagedSearch search)
+ {
+ return _jackOrdersRepository.GetDetailPageList(search);
+ }
+
}
}
diff --git a/Reportapi/MyCode.Project.WebApi/Areas/Admin/Controllers/DataChartController.cs b/Reportapi/MyCode.Project.WebApi/Areas/Admin/Controllers/DataChartController.cs
index e84796f..9fbb2bf 100644
--- a/Reportapi/MyCode.Project.WebApi/Areas/Admin/Controllers/DataChartController.cs
+++ b/Reportapi/MyCode.Project.WebApi/Areas/Admin/Controllers/DataChartController.cs
@@ -1,11 +1,13 @@
using MyCode.Project.Domain.Message.Act.Common;
using MyCode.Project.Domain.Message.Response.LxmZHMDReport;
+using MyCode.Project.Domain.Message.Response.PurOrder;
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.Services.Implementation;
using MyCode.Project.WebApi.App_Filter;
using System;
using System.IO;
@@ -20,10 +22,15 @@ namespace MyCode.Project.WebApi.Areas.Admin.Controllers
{
#region 初始化
private IYuyuboService _yuyuboService;
+ IPurOrderService _PurOrderService;
+ private IPrdOrderService _prdOrderService;
- public DataChartController(IYuyuboService yuyuboService)
+ public DataChartController(IYuyuboService yuyuboService, IPurOrderService purOrderService
+ ,IPrdOrderService prdOrderService)
{
_yuyuboService = yuyuboService;
+ _PurOrderService = purOrderService;
+ _prdOrderService = prdOrderService;
}
@@ -37,11 +44,64 @@ namespace MyCode.Project.WebApi.Areas.Admin.Controllers
///
[HttpPost]
[AllowAnonymous]
- public PageResult GetPageList(PagedSearch search)
+ public PageResult GetSalOrderPageList(PagedSearch search)
{
return _yuyuboService.GetPageList(search);
}
+ ///
+ /// 销售订单明细列表
+ ///
+ ///
+ ///
+ [HttpPost]
+ [AllowAnonymous]
+ public PageResult GetSalOrderDetailPageList(PagedSearch search)
+ {
+ return _yuyuboService.GetDetailPageList(search);
+ }
+
+ ///
+ /// 采购看板
+ ///
+ [HttpPost]
+ [AllowAnonymous]
+ public PageResult GetPurOrderMain(PagedSearch search)
+ {
+ return _PurOrderService.GetPurMain(search);
+ }
+
+
+ ///
+ /// 采购看板详情
+ ///
+ [HttpPost]
+ [AllowAnonymous]
+ public PageResult GetPurOrderDetil(PagedSearch search)
+ {
+ return _PurOrderService.GetPurDetil(search);
+ }
+
+ ///
+ /// 获取生产订单
+ ///
+ [AllowAnonymous]
+ [HttpPost]
+ public PageResult GetMoRespData(PagedSearch pagedSearch)
+ {
+ return _prdOrderService.GetPrdMoPageList(pagedSearch);
+ }
+
+ ///
+ /// 获取生产订单详情
+ ///
+ [AllowAnonymous]
+ [HttpPost]
+
+ public PageResult GetMoEntryRespData(PagedSearch search)
+ {
+ return _prdOrderService.GetPrdMoEntryPageList(search);
+ }
}
}
diff --git a/Reportapi/MyCode.Project.WebApi/MyCode.Project.WebApi.csproj b/Reportapi/MyCode.Project.WebApi/MyCode.Project.WebApi.csproj
index ddd07f7..38cfb04 100644
--- a/Reportapi/MyCode.Project.WebApi/MyCode.Project.WebApi.csproj
+++ b/Reportapi/MyCode.Project.WebApi/MyCode.Project.WebApi.csproj
@@ -208,8 +208,6 @@
-
-
Global.asax
diff --git a/Reportapi/MyCode.Project.WebApi/Web.config b/Reportapi/MyCode.Project.WebApi/Web.config
new file mode 100644
index 0000000..8b44b6a
--- /dev/null
+++ b/Reportapi/MyCode.Project.WebApi/Web.config
@@ -0,0 +1,253 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file