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:
赵正易
2024-07-10 17:11:01 +08:00
parent 5d42e9e196
commit 13cf1be5a7
16 changed files with 359 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,10 +1,11 @@
using Infrastructure;
using Infrastructure.Attribute;
using SqlSugar;
using System;
using System;
using System.Globalization;
using System.Linq;
using System.Text.Json;
using Infrastructure;
using Infrastructure.Attribute;
using JinianNet.JNTemplate;
using SqlSugar;
using ZR.Model.MES.mm;
using ZR.Model.MES.mm.Dto;
using ZR.Model.MES.pro;
@@ -21,44 +22,46 @@ namespace ZR.Service.mes.mm
public MaterialInputService()
{
logger = NLog.LogManager.GetCurrentClassLogger();
}
/// <summary>
/// 获取AGV上料起点
/// </summary>
/// <returns></returns>
public string[] Getstart_AGV_points()
{
List<MmAgvLocation> positions = Context.Queryable<MmAgvLocation>()
List<MmAgvLocation> positions = Context
.Queryable<MmAgvLocation>()
.Where(it => it.AreaCode == 2)
.Where(it => it.Type == 0)
.ToList();
string[] cors = new string[positions.Count];
for (int i = 0; i < positions.Count; i++) cors[i] = positions[i].Coordinate.ToString();
for (int i = 0; i < positions.Count; i++)
cors[i] = positions[i].Coordinate.ToString();
return cors;
}
/// <summary>
/// 获取AGV上料终点
/// </summary>
/// <returns></returns>
public string[] Getend_AGV_points()
{
List<MmAgvLocation> positions = Context.Queryable<MmAgvLocation>()
.Where(it => it.AreaCode == 2)
.Where(it => it.Type == 1)
.ToList();
List<MmAgvLocation> positions = Context
.Queryable<MmAgvLocation>()
.Where(it => it.AreaCode == 2)
.Where(it => it.Type == 1)
.ToList();
string[] cors = new string[positions.Count];
for (int i = 0; i < positions.Count; i++) cors[i] = positions[i].Coordinate.ToString();
for (int i = 0; i < positions.Count; i++)
cors[i] = positions[i].Coordinate.ToString();
return cors;
}
/// <summary>
/// 获取工单列表
/// </summary>
@@ -66,27 +69,40 @@ namespace ZR.Service.mes.mm
/// <returns></returns>
public (List<ProWorkorder_v2>, int) Getworkorderlist(WorkorderqueryDto query)
{
DateTime datetimespan = new DateTime(query.datetimespan.Year, query.datetimespan.Month, query.datetimespan.Day, 0, 0, 0);
DateTime datetimespan = new DateTime(
query.datetimespan.Year,
query.datetimespan.Month,
query.datetimespan.Day,
0,
0,
0
);
// 获取年份和周数
Calendar calendar = new GregorianCalendar();
int year = calendar.GetYear(datetimespan);
int week = calendar.GetWeekOfYear(datetimespan, CalendarWeekRule.FirstFourDayWeek, DayOfWeek.Sunday);
int week = calendar.GetWeekOfYear(
datetimespan,
CalendarWeekRule.FirstFourDayWeek,
DayOfWeek.Sunday
);
// 获取这一周中的第几天
DayOfWeek dayOfWeek = datetimespan.DayOfWeek;
int dayOfWeekNumber = (int)dayOfWeek; // 将 DayOfWeek 枚举转换为从 1 开始的数字
Console.WriteLine("<-获取工单列表-> " + year + "年" + week + "周" + dayOfWeekNumber + "日");
Console.WriteLine(
"<-获取工单列表-> " + year + "年" + week + "周" + dayOfWeekNumber + "日"
);
logger.Error("<-获取工单列表-> " + year + "年" + week + "周" + dayOfWeekNumber + "日");
//todo 已经和正在配料的工单号和毛坯号不能变？？？？？？
//todo 已经和正在配料的工单号和毛坯号不能变？？？？？？
int total = 0;
List<ProWorkorder_v2> WorkorderList = Context.Queryable<ProWorkorder_v2>()
.Where(it => it.Year == year)
.Where(it => it.Week == week)
.Where(it => it.Date == dayOfWeekNumber)
.Where(it => it.Remark3 == "是" || it.Remark1 == "调试")
.ToList();
List<ProWorkorder_v2> WorkorderList = Context
.Queryable<ProWorkorder_v2>()
.Where(it => it.Year == year)
.Where(it => it.Week == week)
.Where(it => it.Date == dayOfWeekNumber)
.Where(it => it.Remark3 == "是" || it.Remark1 == "调试")
.ToList();
// .ToPageList(query.pageNum??1, query.pageSize??10, ref total);
foreach (ProWorkorder_v2 workorder in WorkorderList)
@@ -96,7 +112,8 @@ namespace ZR.Service.mes.mm
workorder.ClientWorkorder = "调试:" + workorder.Id;
}
// 配料任务
bool isExist = Context.Queryable<MmFkWorkorderIngredient>()
bool isExist = Context
.Queryable<MmFkWorkorderIngredient>()
.Where(it => it.FkWorkorder == workorder.ClientWorkorder)
.Where(it => it.FkBlanknumber == workorder.BlankNumber)
.Any();
@@ -115,17 +132,17 @@ namespace ZR.Service.mes.mm
else
{
// todo 有个漏洞 如果计划单 修改数量 remian 就不对
var ingredient = Context.Queryable<MmFkWorkorderIngredient>()
.Where(it => it.FkWorkorder == workorder.ClientWorkorder)
.Where(it => it.FkBlanknumber == workorder.BlankNumber)
.First();
var ingredient = Context
.Queryable<MmFkWorkorderIngredient>()
.Where(it => it.FkWorkorder == workorder.ClientWorkorder)
.Where(it => it.FkBlanknumber == workorder.BlankNumber)
.First();
if (ingredient != null)
{
workorder.PreviousNumber = workorder.PreviousNumber - (ingredient.Previous_numbered ?? 0);
workorder.PreviousNumber =
workorder.PreviousNumber - (ingredient.Previous_numbered ?? 0);
}
}
}
WorkorderList.RemoveAll(num => num.PreviousNumber <= 0);
@@ -157,29 +174,28 @@ namespace ZR.Service.mes.mm
if (remian == 0)
{
//更改配料进度为完成
int result = Context.Updateable<MmFkWorkorderIngredient>()
.Where(it => it.FkWorkorder == item.workorder)
.Where(it => it.FkBlanknumber == item.blanknumber)
.SetColumns(it => it.Previous_numbered == item.previousNumbered)
int result = Context
.Updateable<MmFkWorkorderIngredient>()
.Where(it => it.FkWorkorder == item.workorder)
.Where(it => it.FkBlanknumber == item.blanknumber)
.SetColumns(it => it.Previous_numbered == item.previousNumbered)
.SetColumns(it => it.Isingredient == 1)
.SetColumns(it => it.UpdatedTime == DateTime.Now)
.ExecuteCommand();
.ExecuteCommand();
}
else
{
//更改配料进度 修改配料进度
Context.Updateable<MmFkWorkorderIngredient>()
.Where(it => it.FkWorkorder == item.workorder)
.Where(it => it.FkBlanknumber == item.blanknumber)
.SetColumns(it => it.Previous_numbered == item.previousNumbered)
.SetColumns(it => it.UpdatedTime == DateTime.Now)
.SetColumns(it => it.Isingredient == 0)
.ExecuteCommand();
Context
.Updateable<MmFkWorkorderIngredient>()
.Where(it => it.FkWorkorder == item.workorder)
.Where(it => it.FkBlanknumber == item.blanknumber)
.SetColumns(it => it.Previous_numbered == item.previousNumbered)
.SetColumns(it => it.UpdatedTime == DateTime.Now)
.SetColumns(it => it.Isingredient == 0)
.ExecuteCommand();
}
MmIngredientTask ingredientTask = new MmIngredientTask();
ingredientTask.AgvPosition = task.agv_position;
ingredientTask.TaskId = taskid.ToString();
@@ -191,17 +207,12 @@ namespace ZR.Service.mes.mm
ingredientTask.CreatedBy = name;
ingredientTask.CreatedTime = DateTime.Now;
ingredientTasks.Add(ingredientTask);
}
return Context.Insertable(ingredientTasks).ExecuteCommand();
}
/// <summary>
/// 获取配料任务
/// </summary>
@@ -213,19 +224,18 @@ namespace ZR.Service.mes.mm
DateTime startOfDay = queryParams.datetimespan.Date;
// 获取当天的结束时间
DateTime endOfDay = startOfDay.AddDays(1).AddTicks(-1);
return Context.Queryable<MmIngredientTask>()
.Where(it => it.CreatedTime > startOfDay && it.CreatedTime < endOfDay)
.Where(it => it.Isfinal == 0)
.GroupBy(it => it.TaskId)
.Select(it => new MmIngredientTask()
{
TaskId = it.TaskId,
AgvPosition = SqlFunc.AggregateMax(it.AgvPosition),
CreatedTime = SqlFunc.AggregateMax(it.CreatedTime)
})
.ToList();
return Context
.Queryable<MmIngredientTask>()
.Where(it => it.CreatedTime > startOfDay && it.CreatedTime < endOfDay)
.Where(it => it.Isfinal == 0)
.GroupBy(it => it.TaskId)
.Select(it => new MmIngredientTask()
{
TaskId = it.TaskId,
AgvPosition = SqlFunc.AggregateMax(it.AgvPosition),
CreatedTime = SqlFunc.AggregateMax(it.CreatedTime)
})
.ToList();
}
/// <summary>
@@ -244,13 +254,13 @@ namespace ZR.Service.mes.mm
/// <returns></returns>
public string[] Getfabgopoints()
{
return Context.Queryable<MmAgvLocation>().Where(it => it.AreaCode == 3)
.Select(it => it.Coordinate).ToArray();
return Context
.Queryable<MmAgvLocation>()
.Where(it => it.AreaCode == 3)
.Select(it => it.Coordinate)
.ToArray();
}
/// <summary>
/// agv从仓库到车间 进料
/// </summary>
@@ -262,7 +272,8 @@ 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();
string url = "https://192.168.60.1:443/rcms/services/rest/hikRpcService/genAgvSchedulingTask";
string url =
"https://192.168.60.1:443/rcms/services/rest/hikRpcService/genAgvSchedulingTask";
logger.Info(" 1.任务调度请求url " + url);
AGVtask_third task = new AGVtask_third();
task.reqCode = SnowFlakeSingle.Instance.NextId().ToString();
@@ -274,23 +285,12 @@ namespace ZR.Service.mes.mm
if (end_point == "R1" || start_point == "R1")
{
task.taskTyp = "KLC";
}
task.positionCodePath = new List<AGV_location_third>
{
new AGV_location_third()
{
positionCode=start_point,
type="00"
},
new AGV_location_third()
{
positionCode=end_point,
type="00"
}
new AGV_location_third() { positionCode = start_point, type = "00" },
new AGV_location_third() { positionCode = end_point, type = "00" }
};
task.podDir = "0";
task.priority = "1";
@@ -302,10 +302,8 @@ namespace ZR.Service.mes.mm
logger.Info(" 3.任务调度请求响应 " + response);
return response;
}
/// <summary>
/// 紧急终止AGV
/// </summary>
@@ -324,17 +322,13 @@ namespace ZR.Service.mes.mm
logger.Info(" 2.紧急终止AGV请求数据 " + postData);
string response = HttpHelper.HttpPost(url, postData);
logger.Info(" 3.紧急终止AGV响应数据 " + response);
return response;
}
/// <summary>
/// 完成配料任务
/// 1.更改站点托盘
@@ -348,33 +342,63 @@ 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();
List<MmIngredientTask> tasks = Context.Queryable<MmIngredientTask>().Where(it => it.TaskId.Equals(taskId)).ToList();
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();
Context
.Updateable<ProWorkorder_v2>()
.Where(it => it.ClientWorkorder == tasks[i].Workorder)
.SetColumns(it => it.Status == 1)
.ExecuteCommand();
}
}
//查询毛坯号
List<MmIngredientTask> TO_blankList = Context.Queryable<MmIngredientTask>().Where(it => it.TaskId == taskId).ToList();
List<MmIngredientTask> TO_blankList = Context
.Queryable<MmIngredientTask>()
.Where(it => it.TaskId == taskId)
.ToList();
foreach (var task in TO_blankList)
{
if (!string.IsNullOrEmpty(task.Blanknumber))
{
WmBlankInventory blankInventory = Context
.Queryable<WmBlankInventory>()
.Where(it => it.BlankNum == task.Blanknumber)
// 默认毛坯扣除
.Where(it => it.Type == 1)
.Where(it => it.Status == 1)
.First();
if (blankInventory == null)
{
continue;
}
//1 扣除库存
Context.Updateable<WmBlankInventory>().SetColumns(it => it.Quantity == it.Quantity - task.PreviousNumbered)
.Where(it => it.BlankNum == task.Blanknumber).ExecuteCommand();
Context
.Updateable<WmBlankInventory>()
.SetColumns(it => it.Quantity == it.Quantity - task.PreviousNumbered)
.Where(it => it.Id == blankInventory.Id)
.ExecuteCommand();
//2 增加库存记录
WmBlankRecord res = new WmBlankRecord();
res.Id = SnowFlakeSingle.Instance.NextId().ToString();
res.FkBlankInventoryId = task.Blanknumber;
res.FkBlankInventoryId = blankInventory.Id;
res.BlankNum = task.Blanknumber;
res.ChangeQuantity = task.PreviousNumbered;
res.Type = 3;
res.Status = 1;
res.CreatedBy = "仓库人员";
res.ActionTime = DateTime.Now;
res.CreatedBy = "PDA上料";
res.CreatedTime = DateTime.Now;
//填写库存记录
@@ -383,27 +407,25 @@ namespace ZR.Service.mes.mm
}
});
return result;
}
/// <summary>
/// 车间返程起点
/// </summary>
/// <returns></returns>
public string[] Emptycarreturn_start()
{
List<MmAgvLocation> positions = Context.Queryable<MmAgvLocation>()
.Where(it => it.AreaCode == 3)
.ToList();
List<MmAgvLocation> positions = Context
.Queryable<MmAgvLocation>()
.Where(it => it.AreaCode == 3)
.ToList();
string[] cors = new string[positions.Count];
for (int i = 0; i < positions.Count; i++) cors[i] = positions[i].Coordinate.ToString();
for (int i = 0; i < positions.Count; i++)
cors[i] = positions[i].Coordinate.ToString();
return cors;
}
/// <summary>
@@ -412,17 +434,16 @@ namespace ZR.Service.mes.mm
/// <returns></returns>
public string[] Emptycarreturn_end()
{
List<MmAgvLocation> positions = Context.Queryable<MmAgvLocation>()
.Where(it => it.AreaCode == 2)
.ToList();
List<MmAgvLocation> positions = Context
.Queryable<MmAgvLocation>()
.Where(it => it.AreaCode == 2)
.ToList();
string[] cors = new string[positions.Count];
for (int i = 0; i < positions.Count; i++) cors[i] = positions[i].Coordinate.ToString();
for (int i = 0; i < positions.Count; i++)
cors[i] = positions[i].Coordinate.ToString();
return cors;
}
}
}