wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

执行代码清理，修复warning

Browse Source
This commit is contained in:
潘飞
2023-11-06 19:59:12 +08:00
parent c6b8dfc861
commit 1dbb17f103
118 changed files with 5046 additions and 4111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
ProductionMgr/Tnb.ProductionMgr/AndonService.cs
View File

@@ -27,21 +27,23 @@ namespace Tnb.ProductionMgr
[HttpGet]
public async Task<dynamic> GetPrdTask(string stationId)
{
Dictionary<string, string> dic = new Dictionary<string, string>();
dic.Add("ToBeStarted", "待开工");
dic.Add("InProgress", "进行中");
dic.Add("Closed", "关闭");
dic.Add("Complated", "完工");
dic.Add("ToBeScheduled", "待下发");
dic.Add("Pause", "暂停");
dic.Add("Exception", "异常");
dic.Add("Revoke", "撤销");
Dictionary<string, string> dic = new()
{
{ "ToBeStarted", "待开工" },
{ "InProgress", "进行中" },
{ "Closed", "关闭" },
{ "Complated", "完工" },
{ "ToBeScheduled", "待下发" },
{ "Pause", "暂停" },
{ "Exception", "异常" },
{ "Revoke", "撤销" }
};
List<dynamic> result = new();
var List = await _db.Queryable<PrdMoTask>()
List<PrdMoTask> List = await _db.Queryable<PrdMoTask>()
.WhereIF(!string.IsNullOrEmpty(stationId), p => p.workstation_id == stationId)
.ToListAsync();
var materials = await _db.Queryable<BasMaterial>().ToListAsync();
foreach (var data in List)
List<BasMaterial> materials = await _db.Queryable<BasMaterial>().ToListAsync();
foreach (PrdMoTask data in List)
{
dynamic info = new ExpandoObject();
info.id = data.id;
@@ -55,31 +57,33 @@ namespace Tnb.ProductionMgr
info.plan_end_date = data.estimated_end_date == null ? "" : ((DateTime)data.estimated_end_date!).ToString("yyyy-MM-dd");
result.Add(info);
}
result.OrderByDescending(p => p.plan_start_date);
_ = result.OrderByDescending(p => p.plan_start_date);
return result;
}
[HttpPost]
public async Task SaveData(AndonRecordInput AndonRecordInput)
{
var list = _db.Queryable<AndonBreakDown>().ToList();
AndonRecords andonRecord = new AndonRecords();
andonRecord.mo_id = AndonRecordInput.mo_id;
andonRecord.breakdown_type = list.Where(p => p.id == AndonRecordInput.breakdown).Any() ? list.Where(p => p.id == AndonRecordInput.breakdown).First().type_id : "";
andonRecord.breakdown = AndonRecordInput.breakdown;
andonRecord.create_time = DateTime.Now;
andonRecord.create_id = _userManager.UserId;
await _db.Insertable(andonRecord).ExecuteCommandAsync();
List<AndonBreakDown> list = _db.Queryable<AndonBreakDown>().ToList();
AndonRecords andonRecord = new()
{
mo_id = AndonRecordInput.mo_id,
breakdown_type = list.Where(p => p.id == AndonRecordInput.breakdown).Any() ? list.Where(p => p.id == AndonRecordInput.breakdown).First().type_id : "",
breakdown = AndonRecordInput.breakdown,
create_time = DateTime.Now,
create_id = _userManager.UserId
};
_ = await _db.Insertable(andonRecord).ExecuteCommandAsync();
}
[HttpPost]
public async Task<dynamic> GetAndonCascaderOptions()
{
Dictionary<string, object> result = new Dictionary<string, object>();
Dictionary<string, object> result = new();
List<AndonType> andonTypes = await _db.Queryable<AndonType>().ToListAsync();
List<AndonInfo> andonInfos = await _db.Queryable<AndonInfo>().ToListAsync();
List<AndonBreakDown> andonBreakDowns = await _db.Queryable<AndonBreakDown>().ToListAsync();
List<AndonCascaderOptionsOuput> options = new List<AndonCascaderOptionsOuput>();
foreach (var andonType in andonTypes)
List<AndonCascaderOptionsOuput> options = new();
foreach (AndonType andonType in andonTypes)
{
options.Add(new AndonCascaderOptionsOuput()
{