1
This commit is contained in:
@@ -54,7 +54,6 @@ public class ReportFlowService : BaseService<ProReportwork01>, IReportFlowServic
|
|||||||
.SetColumns(it => it.StoveCode == stove_code)
|
.SetColumns(it => it.StoveCode == stove_code)
|
||||||
.SetColumns(it => it.FeedOrder == feed_order)
|
.SetColumns(it => it.FeedOrder == feed_order)
|
||||||
.ExecuteCommand();
|
.ExecuteCommand();
|
||||||
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -128,8 +127,10 @@ public class ReportFlowService : BaseService<ProReportwork01>, IReportFlowServic
|
|||||||
bool Exist = Context.Queryable<ProReportwork01>().Where(it => it.Workorder == workorder && it.ProcessId == processId).Any();
|
bool Exist = Context.Queryable<ProReportwork01>().Where(it => it.Workorder == workorder && it.ProcessId == processId).Any();
|
||||||
if (Exist)
|
if (Exist)
|
||||||
{
|
{
|
||||||
result = Context.Updateable<ProReportwork01>().Where(it => it.Workorder == workorder && it.ProcessId == processId)
|
result = Context.Updateable<ProReportwork01>()
|
||||||
|
.Where(it => it.Workorder == workorder && it.ProcessId == processId)
|
||||||
.SetColumns(it => it.FinishNum == finish_num)
|
.SetColumns(it => it.FinishNum == finish_num)
|
||||||
|
.SetColumns(it=>it.BadNum == bad_num)
|
||||||
.SetColumns(it => it.Worker == Worker)
|
.SetColumns(it => it.Worker == Worker)
|
||||||
.SetColumns(it => it.JobDate == DateTime.Now)
|
.SetColumns(it => it.JobDate == DateTime.Now)
|
||||||
.SetColumns(it => it.UpdatedBy == Worker)
|
.SetColumns(it => it.UpdatedBy == Worker)
|
||||||
@@ -147,6 +148,7 @@ public class ReportFlowService : BaseService<ProReportwork01>, IReportFlowServic
|
|||||||
proReportwork01.Workorder = workorder;
|
proReportwork01.Workorder = workorder;
|
||||||
proReportwork01.ProcessId = processId;
|
proReportwork01.ProcessId = processId;
|
||||||
proReportwork01.FinishNum = finish_num;
|
proReportwork01.FinishNum = finish_num;
|
||||||
|
proReportwork01.BadNum = bad_num;
|
||||||
proReportwork01.Worker = Worker;
|
proReportwork01.Worker = Worker;
|
||||||
proReportwork01.JobDate = DateTime.Now;
|
proReportwork01.JobDate = DateTime.Now;
|
||||||
proReportwork01.CreatedBy = Worker;
|
proReportwork01.CreatedBy = Worker;
|
||||||
@@ -162,9 +164,6 @@ public class ReportFlowService : BaseService<ProReportwork01>, IReportFlowServic
|
|||||||
|
|
||||||
public List<ProReportWorkDetialDto> GetWorkOrderReportWorkList(string workorder)
|
public List<ProReportWorkDetialDto> GetWorkOrderReportWorkList(string workorder)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
return Context.Queryable<ProReportwork01>()
|
return Context.Queryable<ProReportwork01>()
|
||||||
.LeftJoin<BaseWorkProcesses>((rw, wp) => rw.ProcessId == wp.Id)
|
.LeftJoin<BaseWorkProcesses>((rw, wp) => rw.ProcessId == wp.Id)
|
||||||
.Where((rw, wp) => rw.Workorder == workorder)
|
.Where((rw, wp) => rw.Workorder == workorder)
|
||||||
|
|||||||
Reference in New Issue
Block a user