Commit b40b2a40 authored by 朱天博's avatar 朱天博

1,鑫源看板

parent 80c28192
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
{
public class FactoryBoardXYController : ApiController
{
public ModuleModel ModuleName => ModuleModel.MES;
public string PostCX(FactoryBoardRepuest value)
{
FactoryBoardResponse model = new FactoryBoardResponse();
DataSet dataSet = Dbo.Create(ModuleName).GetDataSet("[SP_MES_FactoryWageBoard_XY]", new
{
WorkTeamID = value.FactoryWorkShopTeamID,
PageIndex = value.PageIndex,
PageSize = value.PageSize
}, true);
model.UserWageRanking = Table2Model.ToModelList<UserWageRanking>(dataSet.Tables[0]);
model.ConstantlyWage = Table2Model.ToModelList<ConstantlyWage>(dataSet.Tables[1]);
model.YieldInfo = Table2Model.ToModelList<YieldInfo>(dataSet.Tables[2]);
model.LineChart = Table2Model.ToModelList<LineChart>(dataSet.Tables[3]);
model.DayYield = (int)dataSet.Tables[4].Rows[0][0];
model.Title = dataSet.Tables[5].Rows[0][0].ToString();
return model.ToString();
}
public string PostCXInspection(FactoryBoardRepuest value)
{
List<ConstantlyWage> model = new List<ConstantlyWage>();
DataSet dataSet = Dbo.Create(ModuleName).GetDataSet("[SP_MES_FactoryWageBoard_XY]", new
{
WorkTeamID = value.FactoryWorkShopTeamID,
PageIndex = value.PageIndex,
PageSize = value.PageSize
}, true);
model = Table2Model.ToModelList<ConstantlyWage>(dataSet.Tables[1]);
JsonSerializerSettings jsSettings = new JsonSerializerSettings();
jsSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore;
return JsonConvert.SerializeObject(model, jsSettings).ToString();
}
}
}
...@@ -165,6 +165,7 @@ ...@@ -165,6 +165,7 @@
<Compile Include="Areas\HelpPage\XmlDocumentationProvider.cs" /> <Compile Include="Areas\HelpPage\XmlDocumentationProvider.cs" />
<Compile Include="Controllers\API\CFG\CFG_BoardController.cs" /> <Compile Include="Controllers\API\CFG\CFG_BoardController.cs" />
<Compile Include="Controllers\API\FactoryBoardController.cs" /> <Compile Include="Controllers\API\FactoryBoardController.cs" />
<Compile Include="Controllers\API\FactoryBoardXYController.cs" />
<Compile Include="Controllers\ChartController.cs" /> <Compile Include="Controllers\ChartController.cs" />
<Compile Include="Controllers\API\CFG\CFG_BoardDetailController.cs" /> <Compile Include="Controllers\API\CFG\CFG_BoardDetailController.cs" />
<Compile Include="Controllers\HomeController.cs" /> <Compile Include="Controllers\HomeController.cs" />
...@@ -177,6 +178,7 @@ ...@@ -177,6 +178,7 @@
<Compile Include="Models\Database\Dbo.cs" /> <Compile Include="Models\Database\Dbo.cs" />
<Compile Include="Models\Database\ModuleAttribute.cs" /> <Compile Include="Models\Database\ModuleAttribute.cs" />
<Compile Include="Models\FactoryBoard.cs" /> <Compile Include="Models\FactoryBoard.cs" />
<Compile Include="Models\FactoryBoardXY.cs" />
<Compile Include="Models\MsSqlDbContextWraper.cs" /> <Compile Include="Models\MsSqlDbContextWraper.cs" />
<Compile Include="Models\Table2Model.cs" /> <Compile Include="Models\Table2Model.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
......
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace FTT.Board.Models
{
/// <summary>
/// 成型车间看板出参
/// </summary>
public class FactoryBoardResponse
{
/// <summary>
/// 员工工资排名
/// </summary>
public List<UserWageRanking> UserWageRanking { get; set; }
/// <summary>
/// 实时工资
/// </summary>
public List<ConstantlyWage> ConstantlyWage { get; set; }
/// <summary>
/// 每日产量
/// </summary>
public List<YieldInfo> YieldInfo { get; set; }
/// <summary>
/// 折线图
/// </summary>
public List<LineChart> LineChart { get; set; }
/// <summary>
/// 当日产量
/// </summary>
public int DayYield { get; set; }
/// <summary>
/// 标题
/// </summary>
public string Title { get; set; }
public override string ToString()
{
JsonSerializerSettings jsSettings = new JsonSerializerSettings();
jsSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore;
return JsonConvert.SerializeObject(this, jsSettings).ToString();
}
}
/// <summary>
/// 每日产量
/// </summary>
public class YieldInfo
{
/// <summary>
/// 日期
/// </summary>
public string PlanDate { get; set; }
/// <summary>
/// 货号(型体)
/// </summary>
public string StyleCode { get; set; }
/// <summary>
/// 昨日遗留
/// </summary>
public int MarginQty { get; set; }
/// <summary>
/// 今日计划
/// </summary>
public int TodayPlanQty { get; set; }
/// <summary>
/// 总计划
/// </summary>
public int PlanQty { get; set; }
/// <summary>
/// 实际产量
/// </summary>
public int ReportQty { get; set; }
/// <summary>
/// 产量比例
/// </summary>
public string PlanPercent { get; set; }
}
public class LineChart
{
/// <summary>
/// 日期
/// </summary>
public string PlanDate { get; set; }
/// <summary>
/// 实际产量
/// </summary>
public int ReportQty { get; set; }
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment