1

RC1266-AutoCountMachine/source/AutoCountClient/FrmRobotMain.Designer.cs

@@ -156,7 +156,7 @@
             this.pictureBox1.Location = new System.Drawing.Point(6, 85);
             this.pictureBox1.Name = "pictureBox1";
             this.pictureBox1.Size = new System.Drawing.Size(576, 385);
-            this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+            this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
             this.pictureBox1.TabIndex = 284;
             this.pictureBox1.TabStop = false;
             // 

RC1266-AutoCountMachine/source/AutoCountClient/FrmRobotMain.cs

@@ -480,10 +480,12 @@ namespace OnlineStore.AutoCountClient
                 string trayInfo = "";
                 if (equip.MoveInfo.MoveType.Equals(RobotMoveType.Working) || equip.MoveInfo.MoveType.Equals(RobotMoveType.Labelling))
                 {
+                    s = RobotRunStatus.Busy;
                     trayInfo = equip.MoveInfo.MoveParam.OutStr();
                 }
                 else if (equip.SecMoveInfo.MoveType.Equals(RobotMoveType.Working) || equip.SecMoveInfo.MoveType.Equals(RobotMoveType.Labelling))
                 {
+                    s = RobotRunStatus.Busy;
                     trayInfo = equip.SecMoveInfo.MoveParam.OutStr();
                 }
                 else if (equip is InputEquip)

RC1266-AutoCountMachine/source/DeviceLibrary/bean/OutputEquip.cs

@@ -406,7 +406,11 @@ namespace OnlineStore.DeviceLibrary
                 return;
             }
             BusyMoveProcess();
-            IOTimeOutProcess();
+
+            if (ShelfMoveInfo.MoveType.Equals(RobotMoveType.None) && ShelfMoveInfo.IsInWait.Equals(false))
+            {
+                IOTimeOutProcess();
+            }
 
 
             if (ShelfMoveInfo.MoveType.Equals(RobotMoveType.None))
@@ -695,8 +699,6 @@ namespace OnlineStore.DeviceLibrary
 
         #endregion
 
-
-
-
+      
     }
 }

RC1266-AutoCountMachine/source/DeviceLibrary/bean/OutputEquip_Partial.cs

@@ -52,19 +52,19 @@ namespace OnlineStore.DeviceLibrary
         {
             if (MoveInfo.MoveType.Equals(RobotMoveType.None).Equals(false))
             {
-                LogUtil.error(MoveInfo.Name + "StartWorking 失败 , MoveInfo 忙碌中=" + MoveInfo.MoveType);
+                LogUtil.error(MoveInfo.Name + "StartWorking 失败 , MoveInfo 忙碌中=" + MoveInfo.MoveType,201);
                 return false;
             } 
              
             if(ShelfMoveInfo.MoveType.Equals(RobotMoveType.ShelfPro)&&ShelfMoveInfo.MoveStep>= StepEnum.OS_31_ShendShelfOut)
             {
-                LogUtil.error(MoveInfo.Name + "StartWorking 失败 , ShelfMoveInfo 正在送出料架 " + ShelfMoveInfo.MoveType+"_"+ ShelfMoveInfo.MoveStep);
+                LogUtil.error(MoveInfo.Name + "StartWorking 失败 , ShelfMoveInfo 正在送出料架 " + ShelfMoveInfo.MoveType+"_"+ ShelfMoveInfo.MoveStep,202);
                 return false;
             }
 
             if(SecMoveInfo.MoveType.Equals(RobotMoveType.Labelling)&&SecMoveInfo.MoveStep<= StepEnum.OL11_XYToP3)
             {
-                LogUtil.error(MoveInfo.Name + "StartWorking 失败 , SecMoveInfo 上个贴标还在等待中 " + SecMoveInfo.MoveType + "_" + SecMoveInfo.MoveStep);
+                LogUtil.error(MoveInfo.Name + "StartWorking 失败 , SecMoveInfo 上个贴标还在等待中 " + SecMoveInfo.MoveType + "_" + SecMoveInfo.MoveStep,203);
                 return false;
             }
 

RC1266-AutoCountMachine/source/DeviceLibrary/bean/X_RAY_Equip.cs

@@ -31,7 +31,7 @@ namespace OnlineStore.DeviceLibrary
         public string LastXRayState = "未知";
         public bool InXWork = false;
 
-        private string path_XRAY = Application.StartupPath + @"\XRAY";
+        //private string path_XRAY = Application.StartupPath + @"\XRAY";
         private string path1_tif = Application.StartupPath + @"\XRAY\tif";
         private string path2_png = Application.StartupPath + @"\XRAY\png";
         private string path3_out = Application.StartupPath + @"\XRAY\out";