0

Reportapi/MyCode.Project.WebApi/Areas/Admin/Controllers/DataChartController.cs

@@ -82,35 +82,6 @@ namespace MyCode.Project.WebApi.Areas.Admin.Controllers
             return _PurOrderService.GetPurDetil(search);
         }
 
-        /// <summary>
-        /// 获取生产订单
-        /// </summary>
-        [AllowAnonymous]
-        [HttpPost]
-        public PageResult<PrdMoOrderResp> GetMoRespData(PagedSearch pagedSearch)
-        {
-            return _prdOrderService.GetPrdMoPageList(pagedSearch);
-        }
-
-        /// <summary>
-        /// 获取生产订单详情
-        /// </summary>
-        [AllowAnonymous]
-        [HttpPost]
-
-        public PageResult<PrdMoOrderEntryResp> GetMoEntryRespData(PagedSearch<IdAct> search)
-        {
-            return _prdOrderService.GetPrdMoEntryPageList(search);
-        }
-
-        /// <summary>
-        /// 获取生产订单执行汇总报表数据
-        /// </summary>
-        [AllowAnonymous]
-        [HttpPost]
-        public PageResult<PrdMOExecuteDetailRpt> GetMoExecuteSumRespData(PagedSearch pagedSearch)
-        {
-            return _prdOrderService.GetMoExecuteSumRespData(pagedSearch);
-        }
+        
     }
 }

Reportapi/MyCode.Project.WebApi/Areas/Admin/Controllers/PrdDataChartController.cs

@@ -0,0 +1,120 @@
+using MyCode.Project.Domain.Message.Act.AdminReport.PrdReport;
+using MyCode.Project.Domain.Message.Act.Common;
+using MyCode.Project.Domain.Message.Response.LxmZHMDReport;
+using MyCode.Project.Infrastructure.Common;
+using MyCode.Project.Services;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.Mvc;
+
+namespace MyCode.Project.WebApi.Areas.Admin.Controllers
+{
+    /// <summary>
+    /// 生产看板控制器
+    /// </summary>
+    public class PrdDataChartController : BaseAdminController
+    {
+        private IPrdOrderService _prdOrderService;
+
+        /// <summary>
+        /// 生产订单服务
+        /// </summary>
+        /// <param name="prdOrderService"></param>
+        public PrdDataChartController(IPrdOrderService prdOrderService)
+        {
+            _prdOrderService = prdOrderService;
+        }
+
+        /// <summary>
+        /// 获取生产订单
+        /// </summary>
+        [AllowAnonymous]
+        [HttpPost]
+        public PageResult<PrdMoOrderResp> GetMoRespData(PagedSearch pagedSearch)
+        {
+            return _prdOrderService.GetPrdMoPageList(pagedSearch);
+        }
+
+        /// <summary>
+        /// 获取生产订单详情
+        /// </summary>
+        [AllowAnonymous]
+        [HttpPost]
+
+        public PageResult<PrdMoOrderEntryResp> GetMoEntryRespData(PagedSearch<IdAct> search)
+        {
+            return _prdOrderService.GetPrdMoEntryPageList(search);
+        }
+
+        /// <summary>
+        /// 获取生产订单执行汇总报表数据
+        /// </summary>
+        [AllowAnonymous]
+        [HttpPost]
+        public PageResult<PrdMOExecuteDetailRpt> GetMoExecuteSumRespData(PagedSearch pagedSearch)
+        {
+            return _prdOrderService.GetMoExecuteSumRespData(pagedSearch);
+        }
+
+        /// <summary>
+        /// 获取生产看板头数据
+        /// </summary>
+        /// <param name="yearAndMonth"></param>
+        /// <returns></returns>
+        [AllowAnonymous]
+        [HttpPost]
+        public PrdReportHead GetMoDataChartHeadByYearAndMonth(YearAndMonth yearAndMonth)
+        {
+            return _prdOrderService.GetMoDataChartHeadByYearAndMonth(yearAndMonth);
+        }
+
+        /// <summary>
+        /// 获取生产看板折线数据
+        /// </summary>
+        /// <param name="yearAndMonth"></param>
+        /// <returns></returns>
+        [AllowAnonymous]
+        [HttpPost]
+        public List<PrdReportHead> GetMoDataChartByYearAndMonth(YearAndMonth yearAndMonth)
+        {
+            return _prdOrderService.GetMoDataChartByYearAndMonth(yearAndMonth);
+        }
+
+        /// <summary>
+        /// 获取生产入库数据，主要用作饼图，展示各物料生产入库数量（完工数量）
+        /// </summary>
+        /// <param name="yearAndMonth"></param>
+        /// <returns></returns>
+        [AllowAnonymous]
+        [HttpPost]
+        public List<MaterialAndQty> GetPrdInStockGroupByMaterial(YearAndMonth yearAndMonth)
+        {
+            return _prdOrderService.GetPrdInStockGroupByMaterial(yearAndMonth);
+        }
+
+        /// <summary>
+        /// 获取生产订单数据，主要用作饼图，展示各物料生产订单数量（生产数量）
+        /// </summary>
+        /// <param name="yearAndMonth"></param>
+        /// <returns></returns>
+        [AllowAnonymous]
+        [HttpPost]
+        public List<MaterialAndQty> GetPrdMoGroupByMaterial(YearAndMonth yearAndMonth)
+        {
+            return _prdOrderService.GetPrdMoGroupByMaterial(yearAndMonth);
+        }
+
+        /// <summary>
+        /// 获取即时库存数据，主要用作饼图，展示各物料库存数量（库存数量）
+        /// </summary>
+        /// <returns></returns>
+        [AllowAnonymous]
+        [HttpPost]
+        public List<MaterialAndQty> GetInventoryGroupByMaterial()
+        {
+            return _prdOrderService.GetInventoryGroupByMaterial();
+        }
+    }
+}

Reportapi/MyCode.Project.WebApi/MyCode.Project.WebApi.csproj

@@ -204,6 +204,7 @@
     <Compile Include="Areas\Admin\Controllers\BaseAdminController.cs" />
     <Compile Include="Areas\Admin\Controllers\DataChartController.cs" />
     <Compile Include="Areas\Admin\Controllers\LxmZHMDReportController.cs" />
+    <Compile Include="Areas\Admin\Controllers\PrdDataChartController.cs" />
     <Compile Include="Areas\Extensions.cs" />
     <Compile Include="Areas\Wechat\Controllers\BaseWechatController.cs" />
     <Compile Include="Areas\Wechat\Controllers\ReportController.cs" />
@@ -1674,6 +1675,7 @@
   <ItemGroup>
     <Folder Include="App_Data\" />
     <Folder Include="App_File\download\exceltemp\" />
+    <Folder Include="Areas\Admin\Views\PrdDataChart\" />
     <Folder Include="Configs\" />
     <Folder Include="uploadfiles\" />
   </ItemGroup>