代码无效引用清理,试压包资料界面看板修改
This commit is contained in:
@@ -1,13 +1,11 @@
|
||||
using FineUIPro;
|
||||
using Model;
|
||||
using Newtonsoft.Json;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using Model;
|
||||
using System.Net.PeerToPeer;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace BLL
|
||||
@@ -170,11 +168,11 @@ namespace BLL
|
||||
return GetCNCEC_16TodayHJGLData_HJGL();
|
||||
|
||||
}
|
||||
/* var q = GetTodayData();
|
||||
if (q != null && q.State == Const.CNCEC_State_S)
|
||||
data = StatisticalData();
|
||||
else
|
||||
data = StatisticalData();*/
|
||||
/* var q = GetTodayData();
|
||||
if (q != null && q.State == Const.CNCEC_State_S)
|
||||
data = StatisticalData();
|
||||
else
|
||||
data = StatisticalData();*/
|
||||
|
||||
var modelTask = StatisticalDataAsync();
|
||||
var model = await modelTask;
|
||||
@@ -335,8 +333,8 @@ namespace BLL
|
||||
var welderNum = await welderNumTask;
|
||||
var dineInfoList = await dineInfoListTask;
|
||||
var chCheckItemList = await chCheckItemListTask;
|
||||
|
||||
|
||||
|
||||
|
||||
var table = new HJGLData_HJGL
|
||||
{
|
||||
UnitId = thisUnitId,
|
||||
@@ -380,7 +378,7 @@ namespace BLL
|
||||
// 获取达因信息
|
||||
var dineInfo = dineInfoDict.TryGetValue(projectid, out var dineData)
|
||||
? dineData
|
||||
: new { TotalDineNum = (decimal ?)0, CompleteDineNum = (decimal?)0 };
|
||||
: new { TotalDineNum = (decimal?)0, CompleteDineNum = (decimal?)0 };
|
||||
|
||||
// 获取拍片信息
|
||||
var chCheckItem = chCheckItemDict.TryGetValue(projectid, out var checkData)
|
||||
@@ -396,7 +394,7 @@ namespace BLL
|
||||
UnitName = baseUnit.UnitName,
|
||||
ReportDate = DateTime.Now.Date,
|
||||
WelderNum = welderCount,
|
||||
TotalDineNum = Convert.ToInt32 (dineInfo.TotalDineNum),
|
||||
TotalDineNum = Convert.ToInt32(dineInfo.TotalDineNum),
|
||||
CompleteDineNum = Convert.ToInt32(dineInfo.CompleteDineNum),
|
||||
TotalFilmNum = chCheckItem.TotalFilmNum,
|
||||
OKFilmNum = chCheckItem.OKFilmNum,
|
||||
@@ -464,7 +462,7 @@ namespace BLL
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 获取焊工总数
|
||||
/// </summary>
|
||||
@@ -508,7 +506,7 @@ namespace BLL
|
||||
DoneDin = g.Sum(x => x.Dia)
|
||||
});
|
||||
return result;
|
||||
}
|
||||
}
|
||||
public static async Task<IEnumerable<WeldDineOutput>> GetDineInfoAsync()
|
||||
{
|
||||
return await Task.Run(GetDineInfo);
|
||||
|
||||
Reference in New Issue
Block a user