D7文字显示修改

source/AssemblyLineClient/useControl/EquipControl.cs

@@ -97,7 +97,29 @@ namespace OnlineStore.AssemblyLine
                 lblUseServo.Visible = equip.UseAxis;
                 if (equip.MoveInfo.MoveType.Equals(LineMoveType.InStore))
                 {
-                    lblMoveInfo.Text = "入库中：" + equip.MoveInfo.MoveParam.PosId + "_" + equip.MoveInfo.MoveParam.WareCode;
+                    if (equip.OnlyProOutTray)
+                    {
+                        if (equip.MoveInfo.MoveParam.IsNG)
+                        {
+                            lblMoveInfo.Text = "NG料移栽：" + equip.MoveInfo.MoveParam.PosId + "_" + equip.MoveInfo.MoveParam.WareCode;
+                        }
+                        else if (equip.MoveInfo.MoveParam.urgentReel)
+                        {
+                            lblMoveInfo.Text = "紧急料移栽：" + equip.MoveInfo.MoveParam.PosId + "_" + equip.MoveInfo.MoveParam.WareCode;
+                        }
+                        else if (equip.MoveInfo.MoveParam.cutReel)
+                        {
+                            lblMoveInfo.Text = "分盘料移栽：" + equip.MoveInfo.MoveParam.PosId + "_" + equip.MoveInfo.MoveParam.WareCode;
+                        }
+                        else
+                        {
+                            lblMoveInfo.Text = "工单料移栽：" + equip.MoveInfo.MoveParam.PosId + "_" + equip.MoveInfo.MoveParam.WareCode;
+                        }
+                    }
+                    else
+                    {
+                        lblMoveInfo.Text = "入库中：" + equip.MoveInfo.MoveParam.PosId + "_" + equip.MoveInfo.MoveParam.WareCode;
+                    }
                 }
                 else if (equip.MoveInfo.MoveType.Equals(LineMoveType.OutStore))
                 {

source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs

@@ -365,7 +365,7 @@ namespace OnlineStore.DeviceLibrary
                 MoveInfo.NextMoveStep(LineMoveStep.FI_22_UpdownToP3);
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
                 InLog("料盘移栽" + MoveInfo.SLog + "：升降轴到P3[" + Config.UpDownAxisP3 + "]");
-                UpdownAxis.AbsMove(MoveInfo, Config.UpDownAxisP3, Config.UpdownAxis_P3Speed); 
+                UpdownAxis.AbsMove(MoveInfo, Config.UpDownAxisP3, Config.UpdownAxis_P3Speed);
             }
             else if (MoveInfo.IsStep(LineMoveStep.FI_22_UpdownToP3))
             {
@@ -531,7 +531,7 @@ namespace OnlineStore.DeviceLibrary
                 }
                 else if (MoveInfo.IsTimeOut(120))
                 {
-                    MoveTimeOut(MoveInfo, "获取库位号超时 "+getPosIdMsg);
+                    MoveTimeOut(MoveInfo, "获取库位号超时 " + getPosIdMsg);
                 }
             }
             else if (MoveInfo.IsStep(LineMoveStep.FI_32_WaitTray))//TODO
@@ -545,7 +545,7 @@ namespace OnlineStore.DeviceLibrary
                     UpdownAxis.AbsMove(MoveInfo, targetPositon, Config.UpdownAxis_P2Speed);
                     LastPosParam.TrayNumber = currTrayNum;
                     InLog("料盘移栽" + MoveInfo.SLog + "：升降轴到P2: [" + targetPositon + "]  暂不更新托盘信息");
-                
+
                     if (IOValue(IO_Type.SL_AxisLocationCheck).Equals(IO_VALUE.LOW) && MoveInfo.ShelfNoTray.Equals(false))
                     {
                         InLog("获取库位" + MoveInfo.SLog + "： 上料轴开始慢速上升到P3点，不等待结果");
@@ -568,7 +568,7 @@ namespace OnlineStore.DeviceLibrary
             else if (MoveInfo.IsStep(LineMoveStep.FI_34_CylinderRelax))
             {
                 MoveInfo.NextMoveStep(LineMoveStep.FI_35_AxisToP1);
-                MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000)); 
+                MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
                 UpdownAxis.AbsMove(MoveInfo, Config.UpDownAxisP1, Config.UpdownAxis_P1Speed);
                 if (LastResult.Equals(98))
                 {
@@ -596,22 +596,9 @@ namespace OnlineStore.DeviceLibrary
                 }
                 else
                 {
-                    //if (IOValue(IO_Type.SL_ClampCylinder_Check).Equals(IO_VALUE.LOW))
-                    {
-                        FI_37_TrayMoveOk();
-                    }
-                    //else
-                    //{
-                    //    MoveInfo.NextMoveStep(LineMoveStep.FI_36_ClampCheck);
-                    //    InLog("料盘移栽" + MoveInfo.SLog + "：等待夹爪无料");
-                    //    MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_ClampCylinder_Check, IO_VALUE.LOW));
-                    //}
+                    FI_37_TrayMoveOk();
                 }
             }
-            //else if (MoveInfo.IsStep(LineMoveStep.FI_36_ClampCheck))
-            //{
-            //    FI_37_TrayMoveOk();
-            //}
             else if (MoveInfo.IsStep(LineMoveStep.FI_37_TrayMoveOk))
             {
                 if (axisCheckTimer != null && axisCheckTimer.Enabled)

source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs

@@ -1031,10 +1031,15 @@ namespace OnlineStore.DeviceLibrary
                 }
                 else if (SecondMoveInfo.IsTimeOut(30))
                 {
-                    WarnMsg = SecondMoveInfo.Name + "[" + SecondMoveInfo.MoveStep + "] 等待开始入库超时 [" + Math.Round(MoveInfo.StepSpan().TotalSeconds, 1) + "]秒";
+                    string msg = "开始入库";
+                    if (OnlyProOutTray)
+                    {
+                        msg = "开始移栽";
+                    }
+                    WarnMsg = SecondMoveInfo.Name + "[" + SecondMoveInfo.MoveStep + "] 等待"+ msg + "超时 [" + Math.Round(MoveInfo.StepSpan().TotalSeconds, 1) + "]秒";
                     LogUtil.error(WarnMsg + "，暂时放托盘离开");
                     SecondMoveInfo.NextMoveStep(LineMoveStep.MO_14_TopDown);
-                    InLog("放托盘（放开阻挡）： " + MoveInfo.SLog + " 入库超时，放托盘离开，顶升气缸1下降");
+                    InLog("放托盘（放开阻挡）： " + MoveInfo.SLog + msg+"超时，放托盘离开，顶升气缸1下降");
                     CylinderMove(SecondMoveInfo, IO_Type.TopCylinder_Up, IO_Type.TopCylinder_Down);
                 }
             }

source/DeviceLibrary/model/InOutParam.cs

@@ -67,7 +67,7 @@ namespace OnlineStore.DeviceLibrary
         public string NgMsg = "";
         public string ToStr()
         {
-            return $" [{ TrayNumber }] [{ WareCode }] [{ PosId }] [{ PlateW }x{ PlateH }]，InStoreNg [{ IsNG }],urgentReel [{ urgentReel }],cutReel [{ cutReel }],smallReel [{ smallReel }],rfid [{ rfid }],rfidLoc [{ rfidLoc }]";
+            return $" [{ TrayNumber }] [{ WareCode }] [{ PosId }] [{ PlateW }x{ PlateH }]，NG [{ IsNG }],urgentReel [{ urgentReel }],cutReel [{ cutReel }],smallReel [{ smallReel }],rfid [{ rfid }],rfidLoc [{ rfidLoc }]";
         }
         public string ToShortStr()
         {