This commit is contained in:
qianhao.xu
2024-05-11 14:22:15 +08:00
parent 0212f86b92
commit 8b8de3e883
2 changed files with 16 additions and 3 deletions

View File

@@ -23,6 +23,7 @@ using System.Text.Json;
using Infrastructure;
using ZR.Repository;
using System.Numerics;
using ZR.Model.mes.pro;
namespace ZR.Service.mes.mm
{
@@ -213,7 +214,7 @@ namespace ZR.Service.mes.mm
DateTime endOfDay = startOfDay.AddDays(1).AddTicks(-1);
return Context.Queryable<MmIngredientTask>()
.Where(it => it.CreatedTime > startOfDay && it.CreatedTime < endOfDay)
//.Where(it => it.Isfinal == 0)
.Where(it => it.Isfinal == 0)
.GroupBy(it => it.TaskId)
.Select(it => new MmIngredientTask()
{
@@ -344,8 +345,19 @@ namespace ZR.Service.mes.mm
{
// Context.Updateable<MmAgvLocation>().Where(it => it.Coordinate == start_point).SetColumns(it => it.Status == 0).ExecuteCommand();
// Context.Updateable<MmAgvLocation>().Where(it => it.Coordinate == end_point).SetColumns(it => it.Status == 1).ExecuteCommand();
result = Context.Updateable<MmIngredientTask>().Where(it => it.TaskId.Equals(taskId)).SetColumns(it => it.Isfinal == 1).ExecuteCommand();
result = Context.Updateable<MmIngredientTask>().Where(it => it.TaskId.Equals(taskId)).SetColumns(it => it.Isfinal == 1).ExecuteCommand();
List<MmIngredientTask> tasks= Context.Queryable<MmIngredientTask>().Where(it => it.TaskId.Equals(taskId)).ToList();
for(int i=0; i<tasks.Count; i++)
{
if (!string.IsNullOrEmpty(tasks[i].Workorder))
{
Context.Updateable<ProWorkorder_v2>().Where(it=>it.ClientWorkorder== tasks[i].Workorder).SetColumns(it => it.Status == 1).ExecuteCommand();
}
}
});
return result;
}