RIZO/shgx_tz_mom
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

agv

Browse Source
This commit is contained in:
qianhao.xu 2024-05-07 13:57:18 +08:00
parent 11dfe38106
commit b13aaaa6b0
4 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Infrastructure/Helper/HttpHelper.cs
View File

@ -34,8 +34,15 @@ namespace Infrastructure
using HttpContent httpContent = new StringContent(postData, Encoding.UTF8); using HttpContent httpContent = new StringContent(postData, Encoding.UTF8);
if (contentType != null) if (contentType != null)
httpContent.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue(contentType); httpContent.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue(contentType);
HttpResponseMessage response = null;
HttpResponseMessage response = client.PostAsync(url, httpContent).Result; try
{
response = client.PostAsync(url, httpContent).Result;
}catch (Exception ex)
{
return "异常："+ex.Message;
}
return response.Content.ReadAsStringAsync().Result; return response.Content.ReadAsStringAsync().Result;
} }

6
ZR.Admin.WebApi/appsettings.development.json
View File

@ -11,14 +11,14 @@
{ {
//本地连接服务器 //本地连接服务器
// "Conn": "Data Source=localhost;User ID=root;Password=123456;Initial Catalog=ZrAdmin;", // "Conn": "Data Source=localhost;User ID=root;Password=doantech123;Initial Catalog=ZrAdmin;",
//外网连接服务器 //外网连接服务器
"Conn": "Data Source=47.116.122.230;Port=3307;User ID=root;Password=123456;Initial Catalog=ZrAdmin;", // "Conn": "Data Source=47.116.122.230;Port=3307;User ID=root;Password=123456;Initial Catalog=ZrAdmin;",
// 干巷服务器 // 干巷服务器
// "Conn": "Data Source=192.168.60.251;Port=3306;User ID=root;Password=123456;Initial Catalog=ZrAdmin;", // "Conn": "Data Source=192.168.60.251;Port=3306;User ID=root;Password=123456;Initial Catalog=ZrAdmin;",
//内网连接服务器 //内网连接服务器
//"Conn": "Data Source=192.168.0.36;Port=3306;User ID=root;Password=123456;Initial Catalog=ZrAdmin;", "Conn": "Data Source=192.168.0.36;Port=3306;User ID=root;Password=doantech123;Initial Catalog=ZrAdmin;",
// "Conn": "Data Source=127.0.0.1;Port=3306;User ID=root;Password=123456;Initial Catalog=ZrAdmin;", // "Conn": "Data Source=127.0.0.1;Port=3306;User ID=root;Password=123456;Initial Catalog=ZrAdmin;",
"Type": 0, //数据库类型 MySql = 0, SqlServer = 1, Oracle = 3，PgSql = 4, "Type": 0, //数据库类型 MySql = 0, SqlServer = 1, Oracle = 3，PgSql = 4,
"ConfigId": "0", //多租户唯一标识 "ConfigId": "0", //多租户唯一标识

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

@ -85,7 +85,7 @@ namespace ZR.Service.mes.mm
// 获取这一周中的第几天 // 获取这一周中的第几天
DayOfWeek dayOfWeek = datetimespan.DayOfWeek; DayOfWeek dayOfWeek = datetimespan.DayOfWeek;
int dayOfWeekNumber = (int)dayOfWeek + 1; // 将 DayOfWeek 枚举转换为从 1 开始的数字 int dayOfWeekNumber = (int)dayOfWeek; // 将 DayOfWeek 枚举转换为从 1 开始的数字
@ -93,8 +93,9 @@ namespace ZR.Service.mes.mm
.Where(it => it.Year == year) .Where(it => it.Year == year)
.Where(it => it.Week == week) .Where(it => it.Week == week)
.Where(it => it.Date == dayOfWeekNumber) .Where(it => it.Date == dayOfWeekNumber)
.Where(it => it.Remark3 == "是") .Where(it => it.Remark3 == "是"||it.Remark1=="调试")
.ToList(); .ToList();
foreach (ProWorkorder_v2 workorder in WorkorderList) foreach (ProWorkorder_v2 workorder in WorkorderList)
{ {
bool isExist = Context.Queryable<MmFkWorkorderIngredient>() bool isExist = Context.Queryable<MmFkWorkorderIngredient>()
@ -249,6 +250,14 @@ namespace ZR.Service.mes.mm
AGVtask_third task = new AGVtask_third(); AGVtask_third task = new AGVtask_third();
task.reqCode = SnowFlakeSingle.Instance.NextId().ToString(); task.reqCode = SnowFlakeSingle.Instance.NextId().ToString();
task.taskTyp = "F01"; task.taskTyp = "F01";
// 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();
//判断是否跨楼层
if(end_point=="R1")
{
task.taskTyp = "KLC";
}
task.positionCodePath = new List<AGV_location_third> task.positionCodePath = new List<AGV_location_third>
{ {
new AGV_location_third() new AGV_location_third()

2
ZR.Service/mes/mm/MmFinishedwarehouseService.cs
View File

@ -19,7 +19,7 @@ namespace ZR.Service.mes.mm
public string[] Finish_point() public string[] Finish_point()
{ {
List<MmAgvLocation> positions = Context.Queryable<MmAgvLocation>() List<MmAgvLocation> positions = Context.Queryable<MmAgvLocation>()
.Where(it => it.AreaCode == 4|| it.AreaCode == 5) .Where(it => it.AreaCode == 4|| it.AreaCode == 5|| it.AreaCode == 8)
.ToList(); .ToList();
string[] cors = new string[positions.Count]; string[] cors = new string[positions.Count];