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

提交

Browse Source
This commit is contained in:
qianhao.xu
2024-04-28 08:36:00 +08:00
parent 80f0da54c8
commit f88400eb00
5 changed files with 157 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ZR.Service/mes/mm/IService/IMaterialInputService.cs
View File

@@ -1,8 +1,10 @@
using System;
using Microsoft.AspNetCore.Mvc;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using ZR.Model.MES.mm.Dto;
using ZR.Model.MES.pro;
namespace ZR.Service.mes.mm.IService
@@ -13,6 +15,7 @@ namespace ZR.Service.mes.mm.IService
string[] Getend_AGV_points();
List<ProWorkorder_v2> Getworkorderlist(DateTime datetimespan);
int Generatetask(IngredientTaskDto task,string name);
}
}

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

@@ -14,6 +14,8 @@ using ZR.Model.MES.mm;
using ZR.Model.MES.pro;
using System.Globalization;
using static System.Runtime.InteropServices.JavaScript.JSType;
using ZR.Model.MES.mm.Dto;
using SqlSugar;
namespace ZR.Service.mes.mm
{
@@ -73,10 +75,7 @@ namespace ZR.Service.mes.mm
DayOfWeek dayOfWeek = datetimespan.DayOfWeek;
int dayOfWeekNumber = (int)dayOfWeek + 1; // 将 DayOfWeek 枚举转换为从 1 开始的数字
Console.WriteLine($"日期：{datetimespan}");
Console.WriteLine($"年份：{year}");
Console.WriteLine($"周数：{week}");
Console.WriteLine($"这一周中的第几天：{dayOfWeekNumber}");
List<ProWorkorder_v2> WorkorderList = Context.Queryable<ProWorkorder_v2>()
.Where(it => it.Year == year)
@@ -89,6 +88,36 @@ namespace ZR.Service.mes.mm
return WorkorderList;
}
/// <summary>
/// 生成任务单
/// </summary>
/// <param name="task"></param>
/// <returns></returns>
public int Generatetask(IngredientTaskDto task,string name)
{
List<MmIngredientTask> ingredientTasks=new List<MmIngredientTask> ();
foreach(var item in task.workorders)
{
MmIngredientTask ingredientTask = new MmIngredientTask();
ingredientTask.AgvPosition = task.agv_position;
ingredientTask.TaskId = SnowFlakeSingle.Instance.NextId();
ingredientTask.Workorder = item.workorder;
ingredientTask.Partnumber = item.partnumber;
ingredientTask.PreviousNumber = item.previousNumber;
ingredientTask.PreviousNumbered=item.previousNumbered;
ingredientTask.CreatedBy = name;
ingredientTasks.Add(ingredientTask);
}
return Context.Insertable(ingredientTasks).ExecuteCommand();
}
}
}