Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AGV调试

Browse Source
This commit is contained in:
qianhao.xu
2024-05-15 11:48:34 +08:00
parent 5e0be58a1d
commit 5c108fb878
6 changed files with 82 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ZR.Service/mes/mm/MaterialInputService.cs
View File

@@ -145,7 +145,7 @@ namespace ZR.Service.mes.mm
int skip = ((query.pageNum ?? 1) - 1) * (query.pageSize ?? 10);
var returndata = WorkorderList
.OrderBy(it => it.ClientWorkorder)
.OrderBy(it=>it.Sort)
.Skip(skip)
.Take(query.pageSize ?? 10)
.ToList();
@@ -168,6 +168,7 @@ namespace ZR.Service.mes.mm
int remian = item.previousNumber - item.previousNumbered;
if (remian == 0)
{
//更改配料进度为完成
int result = Context.Updateable<MmFkWorkorderIngredient>()
.Where(it => it.FkWorkorder == item.workorder)
.Where(it => it.FkBlanknumber == item.blanknumber)
@@ -179,9 +180,10 @@ namespace ZR.Service.mes.mm
}
else
{
//更改配料进度 修改配料进度
Context.Updateable<MmFkWorkorderIngredient>()
.Where(it => it.FkWorkorder == item.workorder)
.Where(it => it.FkBlanknumber == item.blanknumber)
.Where(it => it.FkBlanknumber == item.blanknumber)
.SetColumns(it => it.Previous_numbered == item.previousNumbered)
.SetColumns(it => it.UpdatedTime == DateTime.Now)
.SetColumns(it => it.Isingredient == 0)
@@ -267,7 +269,7 @@ namespace ZR.Service.mes.mm
/// <param name="start_point"></param>
/// <param name="end_point"></param>
/// <returns></returns>
public string AGV_schedule(string start_point, string end_point,string agvCode= "1743 ")
public string AGV_schedule(string start_point, string end_point,string agvCode= "1743")
{
// 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();
@@ -277,7 +279,7 @@ namespace ZR.Service.mes.mm
AGVtask_third task = new AGVtask_third();
task.reqCode = SnowFlakeSingle.Instance.NextId().ToString();
task.taskTyp = "F01";
task.agvCode = agvCode;
task.agvCode = agvCode.Trim();
// MmAgvLocation start_object = Context.Queryable<MmAgvLocation>().Where(it => it.Coordinate == start_point).First();
// MmAgvLocation end_object = Context.Queryable<MmAgvLocation>().Where(it => it.Coordinate == end_point).First();
//判断是否跨楼层