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

1

Browse Source
This commit is contained in:
qianjiawei
2023-09-13 16:15:59 +08:00
parent 5365efa279
commit 8b116138f9
4 changed files with 43 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
EquipMgr/Tnb.EquipMgr.Entities/Dto/MaintainInfoQueryinput.cs Normal file
View File

@@ -0,0 +1,16 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.EquipMgr.Entities.Dto
{
public class MaintainInfoQueryinput
{
public string? sort { get; set; }
public string? keyword { get; set; }
public string? status { get; set; }
}
}

29
EquipMgr/Tnb.EquipMgr/ToolMoldMaintainRunService.cs
View File

@@ -100,10 +100,21 @@ namespace Tnb.EquipMgr
}
[HttpGet]
public async Task<dynamic> GetMaintainInfo()
[AllowAnonymous]
public async Task<dynamic> GetMaintainInfo([FromQuery] MaintainInfoQueryinput input)
{
Dictionary<string, string> dicstatus = new Dictionary<string, string>();
dicstatus.Add("UnMaintain", "待保养");
dicstatus.Add("Completed", "已完成");
string status = string.Empty;
if (!string.IsNullOrEmpty(input.status))
{
status = dicstatus.Where(p => p.Value == input.status).Any() ? dicstatus.Where(p => p.Value == input.status).First().Key : "";
}
List<dynamic> result = new();
var plans = await _db.Queryable<ToolMoldMaintainPlan>().ToListAsync();
var plans = await _db.Queryable<ToolMoldMaintainPlan>()
.WhereIF(!string.IsNullOrEmpty(status), p => p.status == status)
.ToListAsync();
var ToolMolds = await _db.Queryable<ToolMolds>().ToListAsync();
var ToolMoldsEquipments = await _db.Queryable<ToolMoldsEquipment>().ToListAsync();
var EqpEquipments = await _db.Queryable<EqpEquipment>().ToListAsync();
@@ -123,7 +134,9 @@ namespace Tnb.EquipMgr
if (planMoldRelations?.Count > 0)
{
var mids = planMoldRelations.Select(x => x.mold_id).ToList();
var molds = ToolMolds.Where(it => mids.Contains(it.id)).ToList();
var molds = ToolMolds.Where(it => mids.Contains(it.id))
.WhereIF(!string.IsNullOrEmpty(input.keyword), p => p.mold_code!.Contains(input.keyword!) || p.mold_name!.Contains(input.keyword!))
.ToList();
if (molds?.Count > 0)
{
List<dynamic> infos = new List<dynamic> { };
@@ -136,7 +149,7 @@ namespace Tnb.EquipMgr
info.mold_name = mold.mold_name;
info.mold_status = dic.Where(p => p.Id == mold.mold_status).Any() ? dic.Where(p => p.Id == mold.mold_status).First().FullName : "";
info.maintain_qty = mold.maintain_qty;
info.plan_start_time = planMoldRelations[i].plan_start_time == null ? "" : ((DateTime)planMoldRelations[i].plan_start_time).ToString("yyyy-MM-dd");
info.plan_start_time = planMoldRelations[i].plan_start_time == null ? "" : ((DateTime)planMoldRelations[i].plan_start_time!).ToString("yyyy-MM-dd");
info.createtime = plan.create_time == null ? "" : ((DateTime)plan.create_time).ToString("yyyy-MM-dd");
info.status = plan.status == "UnMaintain" ? "待保养" : "已完成";
info.createuser = string.IsNullOrEmpty(plan.create_id) ? "" : users.Where(p => p.Id == plan.create_id).First().RealName;
@@ -155,7 +168,13 @@ namespace Tnb.EquipMgr
}
}
}
}
if (!string.IsNullOrEmpty(input.sort))
{
if (input.sort == "createtime")
result = result.OrderByDescending(p => p.createtime).ToList();
if (input.sort == "plan_start_time")
result = result.OrderByDescending(p => p.plan_start_time).ToList(); ;
}
return result;
}

5
ProductionMgr/Tnb.ProductionMgr.Interfaces/IAndonService.cs
View File

@@ -9,8 +9,7 @@ namespace Tnb.ProductionMgr.Interfaces
{
public interface IAndonService
{
public Task<dynamic> GetPrdTask(string stationId);
public Task SaveData(AndonRecordInput AndonRecordInput);
Task<dynamic> GetPrdTask(string stationId);
Task SaveData(AndonRecordInput AndonRecordInput);
}
}

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

@@ -68,6 +68,7 @@ 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);
return result;
}
[HttpPost]