Merge branch 'master' of http://106.15.194.121:8083/zdl/ns200

DeviceLibrary/AutoScanAndLabel/MainMachine _LeftProcess.cs

@@ -149,6 +149,7 @@ namespace DeviceLibrary
                     else
                     else
                     {
                     {
                         LeftMoveInfo.NextMoveStep(MoveStep.L10_WaitReelPut);
                         LeftMoveInfo.NextMoveStep(MoveStep.L10_WaitReelPut);
+                        LeftMoveInfo.log($"等待放料");
                     }
                     }
                     break;
                     break;
                 //等中间步骤抓盘
                 //等中间步骤抓盘
@@ -208,7 +209,7 @@ namespace DeviceLibrary
                             if (param1.RightPlateHeight == 0)//测高未完成
                             if (param1.RightPlateHeight == 0)//测高未完成
                             {
                             {
                                 LeftMoveInfo.NextMoveStep(MoveStep.L13);
                                 LeftMoveInfo.NextMoveStep(MoveStep.L13);
-                                LeftMoveInfo.log($"查询到记录：{RightMoveInfo.MoveParam.UID}，但还未获取到高度，等待");
+                                LeftMoveInfo.log($"查询到记录：{LeftMoveInfo.MoveParam.UID}，但还未获取到高度，等待");
                                 LeftMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
                                 LeftMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
                                 return;
                                 return;
                             }
                             }
@@ -216,7 +217,7 @@ namespace DeviceLibrary
                             {
                             {
                                 LeftMoveInfo.MoveParam.RightPlateHeight = param1.RightPlateHeight;
                                 LeftMoveInfo.MoveParam.RightPlateHeight = param1.RightPlateHeight;
                                 LeftMoveInfo.MoveParam.RightPulseHeight = param1.RightPulseHeight;
                                 LeftMoveInfo.MoveParam.RightPulseHeight = param1.RightPulseHeight;
-                                LeftMoveInfo.log($"查询到记录：{RightMoveInfo.MoveParam.UID}，RightPlateHeight={LeftMoveInfo.MoveParam.RightPlateHeight},RightPulseHeight={LeftMoveInfo.MoveParam.RightPulseHeight}");
+                                LeftMoveInfo.log($"查询到记录：{LeftMoveInfo.MoveParam.UID}，RightPlateHeight={LeftMoveInfo.MoveParam.RightPlateHeight},RightPulseHeight={LeftMoveInfo.MoveParam.RightPulseHeight}");
                             }
                             }
                         }
                         }