This commit is contained in:
qianhao.xu 2024-07-23 14:57:43 +08:00
parent 577edf477b
commit 81bff47d73

View File

@ -37,30 +37,39 @@ namespace DOAN.Service.JobKanban
var query1 = Context.Queryable<ProWorkorder>()
.Where(it => it.WorkorderDate == today)
.Where(it => it.RouteId == LineCode);
return Context.Queryable(query1)
.LeftJoin<ProReportwork>((q, r) => q.Workorder == r.FkWorkorder)
.Select((q, r) => new ProWorkorderDto4()
{
FinishNum = r.FinishedNum
}, true)
.ToList();
return Context.Queryable(query1)
.LeftJoin<ProReportwork>((q, r) => q.Workorder == r.FkWorkorder)
.Select((q, r) => new ProWorkorderDto4()
{
FinishNum = r.FinishedNum
}, true)
.ToList();
}
public ProWorkorder GetWorkOrderDetail(string workorder)
public ProWorkorderDto4 GetWorkOrderDetail(string workorder)
{
return Context.Queryable<ProWorkorder>()
.Where(it => it.Workorder == workorder)
.First();
var query = Context.Queryable<ProWorkorder>()
.Where(it => it.Workorder == workorder);
return Context.Queryable(query)
.LeftJoin<ProReportwork>((q, r) => q.Workorder == r.FkWorkorder)
.Select((q, r) => new ProWorkorderDto4()
{
FinishNum = r.FinishedNum
}, true).First();
}
/// <summary>
/// 开始工单
/// </summary>
@ -75,12 +84,12 @@ namespace DOAN.Service.JobKanban
.Where(it => it.Workorder == workorder)
.SetColumns(it => it.Status == 1)
.ExecuteCommand();
ProWorkorderStatus workorderStatus = new ProWorkorderStatus();
workorderStatus.Id = XueHua;
workorderStatus.Status = 1;
workorderStatus.FkWorkorderId = workorder;
workorderStatus.ChangeTime = DateTime.Now;
workorderStatus.CreatedTime = DateTime.Now;
ProWorkorderStatus workorderStatus = new ProWorkorderStatus();
workorderStatus.Id = XueHua;
workorderStatus.Status = 1;
workorderStatus.FkWorkorderId = workorder;
workorderStatus.ChangeTime = DateTime.Now;
workorderStatus.CreatedTime = DateTime.Now;
});
return result;
}
@ -93,10 +102,10 @@ namespace DOAN.Service.JobKanban
/// <returns></returns>
public int FinishWorkOrder(ProReportwork reportWorkDto)
{
int result = 0;
int DispatchNum = Context.Queryable<ProWorkorder>()
int DispatchNum= Context.Queryable<ProWorkorder>()
.Where(it => it.Workorder == reportWorkDto.FkWorkorder)
.Select(it => it.DeliveryNum.Value).First();
UseTran2(() =>
@ -118,7 +127,7 @@ namespace DOAN.Service.JobKanban
reportWork.FinishedNum = reportWorkDto.FinishedNum;
reportWork.GroupCode = reportWorkDto.GroupCode;
reportWork.LineCode = reportWorkDto.LineCode;
reportWork.CreatedTime = DateTime.Now;
reportWork.CreatedTime= DateTime.Now;
reportWork.CreatedBy = reportWorkDto.CreatedBy;
Context.Insertable(reportWork).ExecuteCommand();
});
@ -131,7 +140,7 @@ namespace DOAN.Service.JobKanban
{
KanbanInfo kanbanInfo = new KanbanInfo();
today = today.Date;
kanbanInfo.TotalTaskNum = Context.Queryable<ProWorkorder>()
kanbanInfo.TotalTaskNum= Context.Queryable<ProWorkorder>()
.Where(it => it.WorkorderDate == today)
.Where(it => it.RouteId == LineCode)
.Count();
@ -150,6 +159,6 @@ namespace DOAN.Service.JobKanban
}
}