Merge branch 'main' of https://gitee.com/doan-tech/shanghaigangxiangtuzhuangMES

# Conflicts:
#	ZR.Admin.WebApi/appsettings.development.json

Infrastructure/Helper/HttpHelper.cs

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

ZR.Service/mes/mm/MaterialInputService.cs

@@ -85,7 +85,7 @@ namespace ZR.Service.mes.mm
 
             // 获取这一周中的第几天
             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.Week == week)
                  .Where(it => it.Date == dayOfWeekNumber)
-                 .Where(it => it.Remark3 == "是")
+                 .Where(it => it.Remark3 == "是"||it.Remark1=="调试")
                  .ToList();
+          
             foreach (ProWorkorder_v2 workorder in WorkorderList)
             {
                 bool isExist = Context.Queryable<MmFkWorkorderIngredient>()
@@ -249,6 +250,14 @@ namespace ZR.Service.mes.mm
             AGVtask_third task = new AGVtask_third();
             task.reqCode = SnowFlakeSingle.Instance.NextId().ToString();
             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>
             {
                 new AGV_location_third()

ZR.Service/mes/mm/MmFinishedwarehouseService.cs

@@ -19,7 +19,7 @@ namespace ZR.Service.mes.mm
         public string[] Finish_point()
         {
             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();
 
             string[] cors = new string[positions.Count];