优化界面显示

DeviceLibrary/theMachine/BoxTransport.cs

@@ -193,8 +193,7 @@ namespace DeviceLibrary
                     IgnoreX09 = false;                    
                     break;
                 case MoveStep.StoreTS09:
-                    RobotManage.CameraA.CameraGrabOne(RobotManage.CameraA.GetFixtureStateFilename(From.posid, WareCode, storeMoveType, FixtureState.FromOut));
-                    DoorControl.Invoke(false);
+                    RobotManage.CameraA.CameraGrabOne(RobotManage.CameraA.GetFixtureStateFilename(From.posid, WareCode, storeMoveType, FixtureState.FromOut));                    
                     if (!IgnoreX09 && IOManager.IOValue(SIO_Type.TrayCheck_Fixture,Config).Equals(IO_VALUE.LOW))
                     {
                         Msg.add(string.Format(crc.GetString("Res0003","取料后料叉{0}没有检测到物料无法继续,请检查."), Config.DIList[SIO_Type.TrayCheck_Fixture].ElectricalDefinition), MsgLevel.alarm, ErrInfo.X09_BoxNotDetect);
@@ -202,6 +201,7 @@ namespace DeviceLibrary
                     }
                     else
                     {
+                        DoorControl.Invoke(false);
                         Msg.add("", MsgLevel.info, ErrInfo.X09_Clear);
                         IgnoreX09 = false;
                         if (To.posid == BoxStorePosition.ngdoor && ConfigHelper.Config.Get($"Device_{mainMachine.MachineSide}_Use_Fixpos", false)

DeviceLibrary/theMachine/Store/StoreMachine.cs

@@ -237,6 +237,9 @@ namespace DeviceLibrary
         }
         private (bool, string) InOut_Axis_interference(int from, int to)
         {
+            if (RobotManage.DisableUpdownProtect)
+                return (false, "");
+
             if (Middle_Axis.IsBusy || UpDown_Axis.IsBusy)
                 return (true, crc.GetString("Res0046.95729a30","旋转或升降轴在运动,进出轴不可运动"));
 

TheMachine/SettingControl.Designer.cs

@@ -120,6 +120,7 @@ namespace TheMachine
             // 
             // tabPage_set
             // 
+            this.tabPage_set.AutoScroll = true;
             this.tabPage_set.Controls.Add(this.fixtureSizeConfigControl1);
             this.tabPage_set.Controls.Add(this.tp);
             this.tabPage_set.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));

TheMachine/UC/ConfigControl.cs

@@ -71,7 +71,7 @@ namespace TheMachine
             }
 
             tableLayoutPanel1.SuspendLayout();
-            int maxrow = tableLayoutPanel1.Height / 34;
+            int maxrow = tableLayoutPanel1.Height / 52;
             tableLayoutPanel1.Controls.Clear();
             this.tableLayoutPanel1.RowStyles.Clear();
             //this.tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType., 26));
@@ -107,7 +107,7 @@ namespace TheMachine
                     button.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
                     button.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
                     button.Name = configBase.ProName;
-                    button.Size = new System.Drawing.Size(225, 27);
+                    button.Size = new System.Drawing.Size(225, 45);
                     button.Text = crc.GetString(configBase.ProName,configBase.Explain);
                     button.Click += Button_Click;
                     button.ForeColor = color;

TheMachine/UC/uc_boxdebug.Designer.cs

@@ -141,7 +141,6 @@ namespace TheMachine
             this.dataGridView1.AllowUserToResizeRows = false;
             this.dataGridView1.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
             this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-            this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Top;
             this.dataGridView1.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;
             this.dataGridView1.EnableHeadersVisualStyles = false;
             this.dataGridView1.Location = new System.Drawing.Point(0, 0);
@@ -156,7 +155,7 @@ namespace TheMachine
             this.dataGridView1.ShowCellToolTips = false;
             this.dataGridView1.ShowEditingIcon = false;
             this.dataGridView1.ShowRowErrors = false;
-            this.dataGridView1.Size = new System.Drawing.Size(981, 308);
+            this.dataGridView1.Size = new System.Drawing.Size(781, 308);
             this.dataGridView1.TabIndex = 103;
             this.dataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick);
             this.dataGridView1.CellMouseDown += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dataGridView1_CellMouseDown);
@@ -189,7 +188,7 @@ namespace TheMachine
             this.storePosControl1.Machine = null;
             this.storePosControl1.Margin = new System.Windows.Forms.Padding(4);
             this.storePosControl1.Name = "storePosControl1";
-            this.storePosControl1.Size = new System.Drawing.Size(715, 210);
+            this.storePosControl1.Size = new System.Drawing.Size(515, 210);
             this.storePosControl1.TabIndex = 227;
             this.storePosControl1.Tag = "not";
             // 
@@ -197,6 +196,7 @@ namespace TheMachine
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoScroll = true;
             this.Controls.Add(this.cb_fixpos);
             this.Controls.Add(this.storePosControl1);
             this.Controls.Add(this.label_verify);
@@ -206,7 +206,7 @@ namespace TheMachine
             this.Controls.Add(this.groupInout);
             this.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Name = "uc_boxdebug";
-            this.Size = new System.Drawing.Size(981, 785);
+            this.Size = new System.Drawing.Size(981, 546);
             this.groupInout.ResumeLayout(false);
             this.groupInout.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();