lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

0914-修改材料接口、焊接管理及三四级看板

Browse Source
This commit is contained in:
高飞
2022-09-14 16:38:27 +08:00
parent c3cbd62265
commit 456be52603
88 changed files with 11052 additions and 444 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx.cs
+102 -74
View File
@@ -15,19 +15,14 @@ namespace FineUIPro.Web
{
if (!IsPostBack)
{
var firstOKRates = from x in Funs.DB.HJGL_FirstOKRate where x.ProjectId == this.CurrUser.LoginProjectId && x.Type == "unit" orderby x.Months descending select x;
var units = firstOKRates.Where(x => x.Type == "unit").Select(x => x.Name).Distinct();
if (firstOKRates.Count() > 0)
var oneOKRates = from x in Funs.DB.HJGL_FL_OneOKRate where x.ProjectId == this.CurrUser.LoginProjectId select x;
if (oneOKRates.Count() > 0)
{
int totalNum = 0, oKNum = 0;
foreach (var item in units)
foreach (var item in oneOKRates)
{
var f = firstOKRates.FirstOrDefault(x => x.Name == item); //取每个单位最后一个月的一次合格率数据进行汇总
if (f != null)
{
totalNum += f.TotalNum ?? 0;
oKNum += f.OKNum ?? 0;
}
totalNum += !string.IsNullOrEmpty(item.TestWeldAmount) ? Convert.ToInt32(item.TestWeldAmount) : 0;
oKNum += !string.IsNullOrEmpty(item.OnceQualifiedQuantity) ? Convert.ToInt32(item.OnceQualifiedQuantity) : 0;
}
if (totalNum > 0)
{
@@ -49,16 +44,16 @@ namespace FineUIPro.Web
get
{
Model.Num num = new Model.Num();
var finishRates = from x in Funs.DB.HJGL_FinishRate where x.ProjectId == this.CurrUser.LoginProjectId && x.Type == "unit" select x;
int totalNum = 0, finishNum = 0;
foreach (var item in finishRates)
var totalQuantity = from x in Funs.DB.HJGL_FL_TotalQuantity where x.ProjectId == this.CurrUser.LoginProjectId select x;
decimal totalNum = 0, finishNum = 0;
foreach (var item in totalQuantity)
{
totalNum += item.TotalNum ?? 0;
finishNum += item.FinishNum ?? 0;
totalNum += !string.IsNullOrEmpty(item.TotalWeldQuantity) ? Convert.ToDecimal(item.TotalWeldQuantity) : 0;
finishNum += !string.IsNullOrEmpty(item.TotalCompleted) ? Convert.ToDecimal(item.TotalCompleted) : 0;
}
int notFinishNum = totalNum - finishNum;
num.num1 = finishNum;
num.num2 = notFinishNum;
decimal notFinishNum = totalNum - finishNum;
num.num10 = finishNum;
num.num11 = notFinishNum;
return JsonConvert.SerializeObject(num);
}
}
@@ -69,40 +64,47 @@ namespace FineUIPro.Web
{
get
{
List<Model.SingleSerie2> series = new List<Model.SingleSerie2>();
List<Model.SingleSerie> series = new List<Model.SingleSerie>();
Model.BusinessColumn businessColumn = new Model.BusinessColumn();
List<string> listCategories = new List<string>();
businessColumn.title = "一次合格率";
var views = (from x in Funs.DB.HJGL_FirstOKRate where x.ProjectId == this.CurrUser.LoginProjectId && x.Type == "unit" orderby x.Months select x).ToList();
var months = views.Select(x => x.Months).Distinct().ToList();
var units = views.Select(x => x.Name).Distinct().ToList();
for (int i = 0; i < months.Count; i++)
{
listCategories.Add(string.Format("{0:yyyy-MM}", views[i].Months));
}
var views = (from x in Funs.DB.HJGL_FL_OneOKRate where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList();
var units = views.Select(x => x.UnitName).Distinct().ToList();
for (int i = 0; i < units.Count; i++)
{
listCategories.Add(units[i]);
}
int totalNum = 0, oKNum = 0;
Model.SingleSerie s = new Model.SingleSerie();
List<double> listdata = new List<double>();
for (int i = 0; i < units.Count; i++)
{
Model.SingleSerie2 s = new Model.SingleSerie2();
s.name = units[i];
s.type = "line";
List<double?> listdata = new List<double?>();
for (int j = 0; j < months.Count; j++)
var items = views.Where(x => x.UnitName == units[i]);
totalNum = 0;
oKNum = 0;
foreach (var item in items)
{
var item = views.FirstOrDefault(x => x.Name == units[i] && x.Months == months[j]);
if (item != null)
{
listdata.Add(Convert.ToDouble(item.Rate.Replace("%", "")));
}
else
{
listdata.Add(null);
}
totalNum += !string.IsNullOrEmpty(item.TestWeldAmount) ? Convert.ToInt32(item.TestWeldAmount) : 0;
oKNum += !string.IsNullOrEmpty(item.OnceQualifiedQuantity) ? Convert.ToInt32(item.OnceQualifiedQuantity) : 0;
}
if (totalNum > 0)
{
var a = Convert.ToDouble(oKNum);
var b = Convert.ToDouble(totalNum);
listdata.Add(Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 2)));
}
else
{
listdata.Add(0);
}
s.data = listdata;
series.Add(s);
}
s.data = listdata;
series.Add(s);
businessColumn.categories = listCategories;
businessColumn.series3 = series;
businessColumn.series = series;
return JsonConvert.SerializeObject(businessColumn);
}
}
@@ -111,40 +113,46 @@ namespace FineUIPro.Web
{
get
{
List<Model.SingleSerie2> series = new List<Model.SingleSerie2>();
List<Model.SingleSerie> series = new List<Model.SingleSerie>();
Model.BusinessColumn businessColumn = new Model.BusinessColumn();
List<string> listCategories = new List<string>();
businessColumn.title = "一次合格率";
var views = (from x in Funs.DB.HJGL_FirstOKRate where x.ProjectId == this.CurrUser.LoginProjectId && x.Type == "device" orderby x.Months select x).ToList();
var months = views.Select(x => x.Months).Distinct().ToList();
var devices = views.Select(x => x.Name).Distinct().ToList();
for (int i = 0; i < months.Count; i++)
{
listCategories.Add(string.Format("{0:yyyy-MM}", views[i].Months));
}
var views = (from x in Funs.DB.HJGL_FL_OneOKRate where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList();
var devices = views.Select(x => x.DeviceName).Distinct().ToList();
for (int i = 0; i < devices.Count; i++)
{
listCategories.Add(devices[i]);
}
int totalNum = 0, oKNum = 0;
Model.SingleSerie s = new Model.SingleSerie();
List<double> listdata = new List<double>();
for (int i = 0; i < devices.Count; i++)
{
Model.SingleSerie2 s = new Model.SingleSerie2();
s.name = devices[i];
s.type = "line";
List<double?> listdata = new List<double?>();
for (int j = 0; j < months.Count; j++)
var items = views.Where(x => x.DeviceName == devices[i]);
totalNum = 0;
oKNum = 0;
foreach (var item in items)
{
var item = views.FirstOrDefault(x => x.Name == devices[i] && x.Months == months[j]);
if (item != null)
{
listdata.Add(Convert.ToDouble(item.Rate.Replace("%", "")));
}
else
{
listdata.Add(null);
}
totalNum += !string.IsNullOrEmpty(item.TestWeldAmount) ? Convert.ToInt32(item.TestWeldAmount) : 0;
oKNum += !string.IsNullOrEmpty(item.OnceQualifiedQuantity) ? Convert.ToInt32(item.OnceQualifiedQuantity) : 0;
}
if (totalNum > 0)
{
var a = Convert.ToDouble(oKNum);
var b = Convert.ToDouble(totalNum);
listdata.Add(Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 2)));
}
else
{
listdata.Add(0);
}
s.data = listdata;
series.Add(s);
}
s.data = listdata;
series.Add(s);
businessColumn.categories = listCategories;
businessColumn.series3 = series;
businessColumn.series = series;
return JsonConvert.SerializeObject(businessColumn);
}
}
@@ -160,16 +168,26 @@ namespace FineUIPro.Web
List<string> listCategories = new List<string>();
businessColumn.title = "焊接完成量";
businessColumn.xFontNum = 7;
var views = (from x in Funs.DB.HJGL_FinishRate where x.ProjectId == this.CurrUser.LoginProjectId && x.Type == "unit" orderby x.Code select x).ToList();
var views = (from x in Funs.DB.HJGL_FL_TotalQuantity where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList();
Model.SingleSerie s = new Model.SingleSerie();
Model.SingleSerie s2 = new Model.SingleSerie();
List<double> listdata = new List<double>();
List<double> listdata2 = new List<double>();
foreach (var item in views)
double totalCompleted = 0, totalNoCompleted = 0;
var units = views.Select(x => x.Unit).Distinct().ToList();
foreach (var unit in units)
{
listCategories.Add(item.Name);
listdata.Add(item.FinishNum ?? 0);
listdata2.Add((item.TotalNum ?? 0) - (item.FinishNum ?? 0));
totalCompleted = 0;
totalNoCompleted = 0;
listCategories.Add(unit);
var unitViews = views.Where(x => x.Unit == unit);
foreach (var item in unitViews)
{
totalCompleted += Convert.ToDouble(!string.IsNullOrEmpty(item.TotalCompleted) ? Convert.ToDecimal(item.TotalCompleted) : 0);
totalNoCompleted += Convert.ToDouble(!string.IsNullOrEmpty(item.TotalWeldQuantity) ? Convert.ToDecimal(item.TotalWeldQuantity) : 0) - Convert.ToDouble(!string.IsNullOrEmpty(item.TotalCompleted) ? Convert.ToDecimal(item.TotalCompleted) : 0);
}
listdata.Add(totalCompleted);
listdata2.Add(totalNoCompleted);
}
s.data = listdata;
s2.data = listdata2;
@@ -190,16 +208,26 @@ namespace FineUIPro.Web
List<string> listCategories = new List<string>();
businessColumn.title = "焊接完成量";
businessColumn.xFontNum = 7;
var views = (from x in Funs.DB.HJGL_FinishRate where x.ProjectId == this.CurrUser.LoginProjectId && x.Type == "device" orderby x.Code select x).ToList();
var views = (from x in Funs.DB.HJGL_FL_TotalQuantity where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList();
Model.SingleSerie s = new Model.SingleSerie();
Model.SingleSerie s2 = new Model.SingleSerie();
List<double> listdata = new List<double>();
List<double> listdata2 = new List<double>();
foreach (var item in views)
double totalCompleted = 0, totalNoCompleted = 0;
var deviceNames = views.Select(x => x.DeviceName).Distinct().ToList();
foreach (var deviceName in deviceNames)
{
listCategories.Add(item.Name);
listdata.Add(item.FinishNum ?? 0);
listdata2.Add((item.TotalNum ?? 0) - (item.FinishNum ?? 0));
totalCompleted = 0;
totalNoCompleted = 0;
listCategories.Add(deviceName);
var deviceNameViews = views.Where(x => x.DeviceName == deviceName);
foreach (var item in deviceNameViews)
{
totalCompleted += Convert.ToDouble(!string.IsNullOrEmpty(item.TotalCompleted) ? Convert.ToDecimal(item.TotalCompleted) : 0);
totalNoCompleted += Convert.ToDouble(!string.IsNullOrEmpty(item.TotalWeldQuantity) ? Convert.ToDecimal(item.TotalWeldQuantity) : 0) - Convert.ToDouble(!string.IsNullOrEmpty(item.TotalCompleted) ? Convert.ToDecimal(item.TotalCompleted) : 0);
}
listdata.Add(totalCompleted);
listdata2.Add(totalNoCompleted);
}
s.data = listdata;
s2.data = listdata2;