瀏覽代碼

优化程序

林豪 左 3 月之前
父節點
當前提交
1554312c6a

+ 1 - 1
YWGC/FJK/WCS.WorkEngineering/Systems/分拣支线/环形库分流点.cs

@@ -416,7 +416,7 @@ namespace WCS.WorkEngineering.Systems
                             taskInfo.Status = TaskStatus.FinishOfShunt;
                             taskInfo.EditTime = DateTime.Now;
                             taskInfo.WarehouseCode = taskInfo.WarehouseCode.Contains("R") ? taskInfo.WarehouseCode : taskInfo.WarehouseCode + "R";
-                            taskInfo.AddrTo = "Robot";
+                            taskInfo.AddrTo = maDuoXinXi.MaDuoGongWei;
                             taskInfo.WmsTask = maDuoXinXi.LastXYNO;
                             taskInfo.TaskGroupKey = maDuoXinXi.Id.ToString();
                             taskInfo.GoodsType = goodsType;

+ 12 - 12
YWGC/FJK/WCS.WorkEngineering/Systems/环形库/机械臂cs.cs

@@ -232,10 +232,10 @@ namespace WCS.WorkEngineering.Systems
                         obj.Data.SCol1 = 0;
                         obj.Data.SLayer1 = 0;
                         obj.Data.SDepth1 = 0;
-                        obj.Data.ELine1 = task.Line.ToShort();
-                        obj.Data.ECol1 = task.Col.ToShort();
-                        obj.Data.ELayer1 = task.Layer.ToShort();
-                        obj.Data.EDepth1 = task.Depth.ToShort();
+                        obj.Data.ELine1 = task.AddrTo.ToShort();
+                        obj.Data.ECol1 = task.WmsTask.ToShort();
+                        obj.Data.ELayer1 = 0;
+                        obj.Data.EDepth1 = 0;
                         obj.Data.TaskNumber2 = 0;
                         obj.Data.SLine2 = 0;
                         obj.Data.SCol2 = 0;
@@ -268,10 +268,10 @@ namespace WCS.WorkEngineering.Systems
                         obj.Data.SCol1 = 0;
                         obj.Data.SLayer1 = 0;
                         obj.Data.SDepth1 = 0;
-                        obj.Data.ELine1 = task.Line.ToShort();
-                        obj.Data.ECol1 = task.Col.ToShort();
-                        obj.Data.ELayer1 = task.Layer.ToShort();
-                        obj.Data.EDepth1 = task.Depth.ToShort();
+                        obj.Data.ELine1 = task.AddrTo.ToShort();
+                        obj.Data.ECol1 = task.WmsTask.ToShort();
+                        obj.Data.ELayer1 = 0;
+                        obj.Data.EDepth1 = 0;
                         //二工位取深度较少的值
                         taskInfo = taskList[0];
                         task = taskInfo.Item1;
@@ -281,10 +281,10 @@ namespace WCS.WorkEngineering.Systems
                         obj.Data.SCol2 = 0;
                         obj.Data.SLayer2 = 0;
                         obj.Data.SDepth2 = 0;
-                        obj.Data.ELine2 = task.Line.ToShort();
-                        obj.Data.ECol2 = task.Col.ToShort();
-                        obj.Data.ELayer2 = task.Layer.ToShort();
-                        obj.Data.EDepth2 = task.Depth.ToShort();
+                        obj.Data.ELine2 = task.AddrTo.ToShort();
+                        obj.Data.ECol2 = task.WmsTask.ToShort();
+                        obj.Data.ELayer2 = 0;
+                        obj.Data.EDepth2 = 0;
                         obj.Data.TaskSum = taskList.Count.ToShort();
                         obj.Data.GoodsType = task.GoodsType switch
                         {