【编号:16720】成型看板优化Api

FTT.Board/FTT.Board.Api/Controllers/API/FactoryBoardProductDataController.cs

 using FTT.Board.Common;
-using FTT.Board.Models;
 using FttCloud.Public.Database;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
 using System.Web.Http;
 
 namespace FTT.Board.Controllers.API
 {
+    /// <summary>
+    /// 生产数据
+    /// </summary>
     public class FactoryBoardProductDataController : ApiController
     {
+        /// <summary>
+        /// 所属模块
+        /// </summary>
         public ModuleModel ModuleName => ModuleModel.MES;
 
+        #region Get       
+
+        /// <summary>
+        /// 获取生产数据
+        /// </summary>
+        /// <param name="WorkTeamID"></param>
+        /// <returns></returns>
         public string Get(int WorkTeamID)
         {
+            FactoryBoardProductDataResponse model = GetJson(WorkTeamID);
+            return model.ToString();
+        }
+
+        /// <summary>
+        /// 获取生产数据
+        /// </summary>
+        /// <param name="WorkTeamID">车间小组ID</param>
+        /// <param name="PageSize">每页行数</param>
+        /// <param name="PageIndex">页码</param>
+        /// <returns></returns>
+        public FactoryBoardProductDataResponse GetJson(int WorkTeamID, int PageSize = 4, int PageIndex = 1)
+        {
+            if (PageSize <= 0) PageSize = 20;
+            if (PageIndex <= 1) PageIndex = 1;
+
             FactoryBoardProductDataResponse model = new FactoryBoardProductDataResponse();
             DataSet dataSet = Dbo.Create(ModuleName).GetDataSet("[SP_KB_ProductionDataBoard]", new
             {
-                WorkTeamID = WorkTeamID
+                WorkTeamID = WorkTeamID,
+                PageSize = PageSize,
+                PageIndex = PageIndex
             }, true);
 
-            //model.TitleList = Table2Model.ToModel<TitleList>(dataSet.Tables[0]);
             model.Statisticss = Table2Model.ToModel<Statistics>(dataSet.Tables[0]);
-            model.QIDetails = Table2Model.ToModelList<QIDetail>(dataSet.Tables[2]);
-            model.TimeYieldDetails = Table2Model.ToModelList<TimeYieldDetail>(dataSet.Tables[3]);
-            return model.ToString();
+            model.QIDetails = Table2Model.ToModelList<QIDetail>(dataSet.Tables[1]);
+            model.TimeYieldDetails = Table2Model.ToModelList<TimeYieldDetail>(dataSet.Tables[2]);
+
+            model.ProOrderTotal = (int)dataSet.Tables[3].Rows[0][0];
+            model.ProOrders = Table2Model.ToModelList<ProPlan>(dataSet.Tables[4]);
+            return model;
         }
+        #endregion
+
+        #region 数据模型      
 
+        /// <summary>
+        /// 生产数据响应模型
+        /// </summary>
         public class FactoryBoardProductDataResponse
         {
             /// <summary>
@@ -44,11 +79,24 @@ namespace FTT.Board.Controllers.API
             public List<TimeYieldDetail> TimeYieldDetails { get; set; }
 
             /// <summary>
-            /// 客户样品总数
+            /// 不良品明细
             /// </summary>
             public List<QIDetail> QIDetails { get; set; }
 
+            /// <summary>
+            /// 派工单总数
+            /// </summary>
+            public int ProOrderTotal { get; set; }
+
+            /// <summary>
+            /// 派工单信息，分页查询
+            /// </summary>
+            public List<ProPlan> ProOrders { get; set; }
 
+            /// <summary>
+            /// <inheritdoc/>
+            /// </summary>
+            /// <returns></returns>
             public override string ToString()
             {
                 JsonSerializerSettings jsSettings = new JsonSerializerSettings();
@@ -66,6 +114,7 @@ namespace FTT.Board.Controllers.API
             /// 标题
             /// </summary>
             public string Title { get; set; }
+
             /// <summary>
             /// 今日产量
             /// </summary>
@@ -82,14 +131,17 @@ namespace FTT.Board.Controllers.API
             /// 直通率
             /// </summary>
             public string DayThroughRate { get; set; }
+
             /// <summary>
-            /// 成品入库量
+            /// 今日计划
             /// </summary>
-            public int DayStockInQty { get; set; }
+            public int DayPlanQty { get; set; }
+
             /// <summary>
             /// 节拍时间
             /// </summary>
             public string DaySwayedTime { get; set; }
+
             /// <summary>
             /// 月产量
             /// </summary>
@@ -167,7 +219,48 @@ namespace FTT.Board.Controllers.API
             /// </summary>
             public int Count { get; set; }
         }
-    }
 
+        /// <summary>
+        /// 派工单信息
+        /// </summary>
+        public class ProPlan
+        {
+            /// <summary>
+            /// 指令号
+            /// </summary>
+            public string IndexNo { get; set; }
+
+            /// <summary>
+            /// 颜色
+            /// </summary>
+            public string ColorName { get; set; }
+
+            /// <summary>
+            /// 轮次
+            /// </summary>
+            public string RoundNo { get; set; }
+
+            /// <summary>
+            /// 计划日期
+            /// </summary>
+            public string PlanDate { get; set; }
+
+            /// <summary>
+            /// 计划量
+            /// </summary>
+            public int Qty { get; set; }
+
+            /// <summary>
+            /// 完成量
+            /// </summary>
+            public int StockInCount { get; set; }
 
+            /// <summary>
+            /// 状态
+            /// </summary>
+            public string State { get; set; }
+        }
+
+        #endregion
+    }
 }