测试版本1.8.2

SIMDP.Project/App.config

@@ -10,7 +10,7 @@
 		<add key="ComponentDbType" value="sqlserver" />
 		<!--默认登陆的用户ID-->
 		<add key="DefaultUser" value="123" />
-		<add key="Version" value="1.8.1" />
+		<add key="Version" value="1.8.2" />
 		<add key="ClientSettingsProvider.ServiceUri" value="" />
 	</appSettings>
 	<connectionStrings>

SIMDP.Project/Form/FormCurrentTask.Designer.cs

@@ -106,11 +106,11 @@ namespace SIMDP.Project
             // gridControl_Mtoc
             // 
             this.gridControl_Mtoc.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gridControl_Mtoc.Location = new System.Drawing.Point(3, 18);
+            this.gridControl_Mtoc.Location = new System.Drawing.Point(3, 22);
             this.gridControl_Mtoc.MainView = this.gridView_Mtoc;
             this.gridControl_Mtoc.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.gridControl_Mtoc.Name = "gridControl_Mtoc";
-            this.gridControl_Mtoc.Size = new System.Drawing.Size(1554, 107);
+            this.gridControl_Mtoc.Size = new System.Drawing.Size(1445, 103);
             this.gridControl_Mtoc.TabIndex = 0;
             this.gridControl_Mtoc.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView_Mtoc});
@@ -203,7 +203,7 @@ namespace SIMDP.Project
             this.label_PageInfo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.label_PageInfo.Location = new System.Drawing.Point(6, 476);
             this.label_PageInfo.Name = "label_PageInfo";
-            this.label_PageInfo.Size = new System.Drawing.Size(75, 14);
+            this.label_PageInfo.Size = new System.Drawing.Size(92, 18);
             this.label_PageInfo.TabIndex = 9;
             this.label_PageInfo.Text = "共 {0} 条记录";
             // 
@@ -217,7 +217,7 @@ namespace SIMDP.Project
             this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1569, 501);
+            this.panel1.Size = new System.Drawing.Size(1460, 501);
             this.panel1.TabIndex = 1;
             // 
             // groupBox4
@@ -228,7 +228,7 @@ namespace SIMDP.Project
             this.groupBox4.Controls.Add(this.gridControl_Mtoc);
             this.groupBox4.Location = new System.Drawing.Point(3, 342);
             this.groupBox4.Name = "groupBox4";
-            this.groupBox4.Size = new System.Drawing.Size(1560, 128);
+            this.groupBox4.Size = new System.Drawing.Size(1451, 128);
             this.groupBox4.TabIndex = 30;
             this.groupBox4.TabStop = false;
             this.groupBox4.Text = "本地数据";
@@ -240,7 +240,7 @@ namespace SIMDP.Project
             this.groupBox3.Controls.Add(this.coTableLayoutPanel3);
             this.groupBox3.Location = new System.Drawing.Point(3, 266);
             this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Size = new System.Drawing.Size(1563, 73);
+            this.groupBox3.Size = new System.Drawing.Size(1454, 73);
             this.groupBox3.TabIndex = 29;
             this.groupBox3.TabStop = false;
             this.groupBox3.Text = "录入工位";
@@ -267,11 +267,11 @@ namespace SIMDP.Project
             this.coTableLayoutPanel3.Controls.Add(this.txt_ModelInput, 5, 0);
             this.coTableLayoutPanel3.Controls.Add(this.lookUp_Color, 7, 0);
             this.coTableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.coTableLayoutPanel3.Location = new System.Drawing.Point(3, 18);
+            this.coTableLayoutPanel3.Location = new System.Drawing.Point(3, 22);
             this.coTableLayoutPanel3.Name = "coTableLayoutPanel3";
             this.coTableLayoutPanel3.RowCount = 1;
             this.coTableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.coTableLayoutPanel3.Size = new System.Drawing.Size(1557, 52);
+            this.coTableLayoutPanel3.Size = new System.Drawing.Size(1448, 48);
             this.coTableLayoutPanel3.TabIndex = 0;
             // 
             // labelControl5
@@ -279,24 +279,24 @@ namespace SIMDP.Project
             this.labelControl5.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.labelControl5.Appearance.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.labelControl5.Appearance.Options.UseFont = true;
-            this.labelControl5.Location = new System.Drawing.Point(47, 16);
+            this.labelControl5.Location = new System.Drawing.Point(24, 11);
             this.labelControl5.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl5.Name = "labelControl5";
-            this.labelControl5.Size = new System.Drawing.Size(60, 20);
+            this.labelControl5.Size = new System.Drawing.Size(75, 25);
             this.labelControl5.TabIndex = 4;
             this.labelControl5.Text = "模式：";
             // 
             // lookUp_TaskState
             // 
             this.lookUp_TaskState.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.lookUp_TaskState.Location = new System.Drawing.Point(113, 10);
+            this.lookUp_TaskState.Location = new System.Drawing.Point(105, 8);
             this.lookUp_TaskState.Name = "lookUp_TaskState";
             this.lookUp_TaskState.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.lookUp_TaskState.Properties.Appearance.Options.UseFont = true;
             this.lookUp_TaskState.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
             this.lookUp_TaskState.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.lookUp_TaskState.Size = new System.Drawing.Size(282, 32);
+            this.lookUp_TaskState.Size = new System.Drawing.Size(262, 36);
             this.lookUp_TaskState.TabIndex = 24;
             // 
             // btn_Check_RecoverProduce
@@ -306,11 +306,11 @@ namespace SIMDP.Project
             this.btn_Check_RecoverProduce.Appearance.Options.UseFont = true;
             this.btn_Check_RecoverProduce.AutoSize = true;
             this.btn_Check_RecoverProduce.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btn_Check_RecoverProduce.ImageOptions.Image")));
-            this.btn_Check_RecoverProduce.Location = new System.Drawing.Point(1405, 11);
+            this.btn_Check_RecoverProduce.Location = new System.Drawing.Point(1294, 9);
             this.btn_Check_RecoverProduce.Margin = new System.Windows.Forms.Padding(10, 3, 10, 3);
             this.btn_Check_RecoverProduce.MaximumSize = new System.Drawing.Size(135, 30);
             this.btn_Check_RecoverProduce.Name = "btn_Check_RecoverProduce";
-            this.btn_Check_RecoverProduce.Size = new System.Drawing.Size(106, 30);
+            this.btn_Check_RecoverProduce.Size = new System.Drawing.Size(122, 30);
             this.btn_Check_RecoverProduce.TabIndex = 26;
             this.btn_Check_RecoverProduce.Text = "操作确认";
             this.btn_Check_RecoverProduce.Click += new System.EventHandler(this.btn_Check_RecoverProduce_Click);
@@ -320,10 +320,10 @@ namespace SIMDP.Project
             this.labelControl3.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.labelControl3.Appearance.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.labelControl3.Appearance.Options.UseFont = true;
-            this.labelControl3.Location = new System.Drawing.Point(1106, 16);
+            this.labelControl3.Location = new System.Drawing.Point(1009, 11);
             this.labelControl3.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl3.Name = "labelControl3";
-            this.labelControl3.Size = new System.Drawing.Size(50, 20);
+            this.labelControl3.Size = new System.Drawing.Size(63, 25);
             this.labelControl3.TabIndex = 4;
             this.labelControl3.Text = "颜色:";
             // 
@@ -332,10 +332,10 @@ namespace SIMDP.Project
             this.labelControl6.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.labelControl6.Appearance.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.labelControl6.Appearance.Options.UseFont = true;
-            this.labelControl6.Location = new System.Drawing.Point(451, 16);
+            this.labelControl6.Location = new System.Drawing.Point(402, 11);
             this.labelControl6.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl6.Name = "labelControl6";
-            this.labelControl6.Size = new System.Drawing.Size(50, 20);
+            this.labelControl6.Size = new System.Drawing.Size(63, 25);
             this.labelControl6.TabIndex = 4;
             this.labelControl6.Text = "车号:";
             // 
@@ -343,11 +343,11 @@ namespace SIMDP.Project
             // 
             this.txt_VINInput.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.txt_VINInput.Enabled = false;
-            this.txt_VINInput.Location = new System.Drawing.Point(507, 11);
+            this.txt_VINInput.Location = new System.Drawing.Point(471, 9);
             this.txt_VINInput.Name = "txt_VINInput";
             this.txt_VINInput.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txt_VINInput.Properties.Appearance.Options.UseFont = true;
-            this.txt_VINInput.Size = new System.Drawing.Size(285, 30);
+            this.txt_VINInput.Size = new System.Drawing.Size(264, 34);
             this.txt_VINInput.TabIndex = 25;
             this.txt_VINInput.Click += new System.EventHandler(this.txt_VINInput_Click);
             this.txt_VINInput.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txt_VIN_KeyDown);
@@ -357,10 +357,10 @@ namespace SIMDP.Project
             this.labelControl1.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.labelControl1.Appearance.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.labelControl1.Appearance.Options.UseFont = true;
-            this.labelControl1.Location = new System.Drawing.Point(834, 16);
+            this.labelControl1.Location = new System.Drawing.Point(754, 11);
             this.labelControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl1.Name = "labelControl1";
-            this.labelControl1.Size = new System.Drawing.Size(60, 20);
+            this.labelControl1.Size = new System.Drawing.Size(75, 25);
             this.labelControl1.TabIndex = 4;
             this.labelControl1.Text = "车型：";
             // 
@@ -368,13 +368,13 @@ namespace SIMDP.Project
             // 
             this.txt_ModelInput.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.txt_ModelInput.Enabled = false;
-            this.txt_ModelInput.Location = new System.Drawing.Point(900, 11);
+            this.txt_ModelInput.Location = new System.Drawing.Point(835, 9);
             this.txt_ModelInput.Name = "txt_ModelInput";
             this.txt_ModelInput.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txt_ModelInput.Properties.Appearance.Options.UseFont = true;
             this.txt_ModelInput.Properties.Mask.EditMask = "f0";
             this.txt_ModelInput.Properties.Mask.MaskType = DevExpress.XtraEditors.Mask.MaskType.Numeric;
-            this.txt_ModelInput.Size = new System.Drawing.Size(181, 30);
+            this.txt_ModelInput.Size = new System.Drawing.Size(168, 34);
             this.txt_ModelInput.TabIndex = 25;
             this.txt_ModelInput.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txt_VIN_KeyDown);
             // 
@@ -382,14 +382,14 @@ namespace SIMDP.Project
             // 
             this.lookUp_Color.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.lookUp_Color.Enabled = false;
-            this.lookUp_Color.Location = new System.Drawing.Point(1162, 10);
+            this.lookUp_Color.Location = new System.Drawing.Point(1078, 8);
             this.lookUp_Color.Name = "lookUp_Color";
             this.lookUp_Color.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.lookUp_Color.Properties.Appearance.Options.UseFont = true;
             this.lookUp_Color.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
             this.lookUp_Color.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.lookUp_Color.Size = new System.Drawing.Size(195, 32);
+            this.lookUp_Color.Size = new System.Drawing.Size(181, 36);
             this.lookUp_Color.TabIndex = 24;
             // 
             // groupBox2
@@ -399,7 +399,7 @@ namespace SIMDP.Project
             this.groupBox2.Controls.Add(this.coTableLayoutPanel4);
             this.groupBox2.Location = new System.Drawing.Point(3, 80);
             this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(1563, 186);
+            this.groupBox2.Size = new System.Drawing.Size(1454, 186);
             this.groupBox2.TabIndex = 29;
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "扫码工位";
@@ -426,13 +426,13 @@ namespace SIMDP.Project
             this.coTableLayoutPanel4.Controls.Add(this.lbl_ScanningFEMCode, 5, 0);
             this.coTableLayoutPanel4.Controls.Add(this.gridControl_FEM, 5, 1);
             this.coTableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.coTableLayoutPanel4.Location = new System.Drawing.Point(3, 18);
+            this.coTableLayoutPanel4.Location = new System.Drawing.Point(3, 22);
             this.coTableLayoutPanel4.Name = "coTableLayoutPanel4";
             this.coTableLayoutPanel4.RowCount = 3;
             this.coTableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
             this.coTableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
             this.coTableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
-            this.coTableLayoutPanel4.Size = new System.Drawing.Size(1557, 165);
+            this.coTableLayoutPanel4.Size = new System.Drawing.Size(1448, 161);
             this.coTableLayoutPanel4.TabIndex = 0;
             // 
             // lbl_FEMScanner
@@ -440,10 +440,10 @@ namespace SIMDP.Project
             this.lbl_FEMScanner.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.lbl_FEMScanner.Appearance.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lbl_FEMScanner.Appearance.Options.UseFont = true;
-            this.lbl_FEMScanner.Location = new System.Drawing.Point(816, 17);
+            this.lbl_FEMScanner.Location = new System.Drawing.Point(733, 14);
             this.lbl_FEMScanner.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.lbl_FEMScanner.Name = "lbl_FEMScanner";
-            this.lbl_FEMScanner.Size = new System.Drawing.Size(70, 20);
+            this.lbl_FEMScanner.Size = new System.Drawing.Size(89, 25);
             this.lbl_FEMScanner.TabIndex = 8;
             this.lbl_FEMScanner.Text = "FEM码：";
             this.lbl_FEMScanner.MouseDown += new System.Windows.Forms.MouseEventHandler(this.labelControl3_MouseDown);
@@ -453,10 +453,10 @@ namespace SIMDP.Project
             this.labelControl8.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.labelControl8.Appearance.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.labelControl8.Appearance.Options.UseFont = true;
-            this.labelControl8.Location = new System.Drawing.Point(45, 17);
+            this.labelControl8.Location = new System.Drawing.Point(22, 14);
             this.labelControl8.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl8.Name = "labelControl8";
-            this.labelControl8.Size = new System.Drawing.Size(60, 20);
+            this.labelControl8.Size = new System.Drawing.Size(75, 25);
             this.labelControl8.TabIndex = 4;
             this.labelControl8.Text = "指针：";
             // 
@@ -468,9 +468,9 @@ namespace SIMDP.Project
             this.lbl_Scanning_Pointer.Appearance.Options.UseTextOptions = true;
             this.lbl_Scanning_Pointer.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
             this.lbl_Scanning_Pointer.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.Horizontal;
-            this.lbl_Scanning_Pointer.Location = new System.Drawing.Point(111, 15);
+            this.lbl_Scanning_Pointer.Location = new System.Drawing.Point(103, 11);
             this.lbl_Scanning_Pointer.Name = "lbl_Scanning_Pointer";
-            this.lbl_Scanning_Pointer.Size = new System.Drawing.Size(35, 24);
+            this.lbl_Scanning_Pointer.Size = new System.Drawing.Size(45, 30);
             this.lbl_Scanning_Pointer.TabIndex = 24;
             this.lbl_Scanning_Pointer.Text = "-----";
             this.lbl_Scanning_Pointer.MouseDown += new System.Windows.Forms.MouseEventHandler(this.lbl_vincode_MouseDown);
@@ -480,10 +480,10 @@ namespace SIMDP.Project
             this.lbl_HeadScanner.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.lbl_HeadScanner.Appearance.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lbl_HeadScanner.Appearance.Options.UseFont = true;
-            this.lbl_HeadScanner.Location = new System.Drawing.Point(415, 17);
+            this.lbl_HeadScanner.Location = new System.Drawing.Point(368, 14);
             this.lbl_HeadScanner.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.lbl_HeadScanner.Name = "lbl_HeadScanner";
-            this.lbl_HeadScanner.Size = new System.Drawing.Size(80, 20);
+            this.lbl_HeadScanner.Size = new System.Drawing.Size(100, 25);
             this.lbl_HeadScanner.TabIndex = 6;
             this.lbl_HeadScanner.Text = "车头码：";
             this.lbl_HeadScanner.MouseDown += new System.Windows.Forms.MouseEventHandler(this.labelControl2_MouseDown);
@@ -496,9 +496,9 @@ namespace SIMDP.Project
             this.lbl_Scanning_MatchRes.Appearance.Options.UseTextOptions = true;
             this.lbl_Scanning_MatchRes.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
             this.lbl_Scanning_MatchRes.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.Horizontal;
-            this.lbl_Scanning_MatchRes.Location = new System.Drawing.Point(1179, 15);
+            this.lbl_Scanning_MatchRes.Location = new System.Drawing.Point(1095, 11);
             this.lbl_Scanning_MatchRes.Name = "lbl_Scanning_MatchRes";
-            this.lbl_Scanning_MatchRes.Size = new System.Drawing.Size(45, 24);
+            this.lbl_Scanning_MatchRes.Size = new System.Drawing.Size(55, 30);
             this.lbl_Scanning_MatchRes.TabIndex = 24;
             this.lbl_Scanning_MatchRes.Text = "-----";
             // 
@@ -509,11 +509,11 @@ namespace SIMDP.Project
             this.btn_ForceMatch.Appearance.Options.UseFont = true;
             this.btn_ForceMatch.AutoSize = true;
             this.btn_ForceMatch.ImageOptions.ImageUri.Uri = "Recurrence;Office2013";
-            this.btn_ForceMatch.Location = new System.Drawing.Point(1397, 12);
+            this.btn_ForceMatch.Location = new System.Drawing.Point(1287, 11);
             this.btn_ForceMatch.Margin = new System.Windows.Forms.Padding(10, 3, 10, 3);
             this.btn_ForceMatch.MaximumSize = new System.Drawing.Size(135, 30);
             this.btn_ForceMatch.Name = "btn_ForceMatch";
-            this.btn_ForceMatch.Size = new System.Drawing.Size(106, 30);
+            this.btn_ForceMatch.Size = new System.Drawing.Size(122, 30);
             this.btn_ForceMatch.TabIndex = 26;
             this.btn_ForceMatch.Text = "匹配指针";
             this.btn_ForceMatch.Click += new System.EventHandler(this.btn_ForceMatch_Click);
@@ -522,11 +522,11 @@ namespace SIMDP.Project
             // 
             this.gridControl_Head.Dock = System.Windows.Forms.DockStyle.Fill;
             this.gridControl_Head.Font = new System.Drawing.Font("宋体", 15F);
-            this.gridControl_Head.Location = new System.Drawing.Point(501, 58);
+            this.gridControl_Head.Location = new System.Drawing.Point(465, 56);
             this.gridControl_Head.MainView = this.gridView_Head;
             this.gridControl_Head.Name = "gridControl_Head";
             this.coTableLayoutPanel4.SetRowSpan(this.gridControl_Head, 2);
-            this.gridControl_Head.Size = new System.Drawing.Size(280, 104);
+            this.gridControl_Head.Size = new System.Drawing.Size(260, 102);
             this.gridControl_Head.TabIndex = 27;
             this.gridControl_Head.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView_Head});
@@ -563,9 +563,9 @@ namespace SIMDP.Project
             this.lbl_Scanning_HeadCode.Appearance.Options.UseTextOptions = true;
             this.lbl_Scanning_HeadCode.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
             this.lbl_Scanning_HeadCode.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.Horizontal;
-            this.lbl_Scanning_HeadCode.Location = new System.Drawing.Point(501, 15);
+            this.lbl_Scanning_HeadCode.Location = new System.Drawing.Point(465, 11);
             this.lbl_Scanning_HeadCode.Name = "lbl_Scanning_HeadCode";
-            this.lbl_Scanning_HeadCode.Size = new System.Drawing.Size(35, 24);
+            this.lbl_Scanning_HeadCode.Size = new System.Drawing.Size(45, 30);
             this.lbl_Scanning_HeadCode.TabIndex = 24;
             this.lbl_Scanning_HeadCode.Text = "-----";
             this.lbl_Scanning_HeadCode.MouseDown += new System.Windows.Forms.MouseEventHandler(this.lbl_headCode_MouseDown);
@@ -578,9 +578,9 @@ namespace SIMDP.Project
             this.lbl_ScanningFEMCode.Appearance.Options.UseTextOptions = true;
             this.lbl_ScanningFEMCode.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
             this.lbl_ScanningFEMCode.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.Horizontal;
-            this.lbl_ScanningFEMCode.Location = new System.Drawing.Point(892, 15);
+            this.lbl_ScanningFEMCode.Location = new System.Drawing.Point(828, 11);
             this.lbl_ScanningFEMCode.Name = "lbl_ScanningFEMCode";
-            this.lbl_ScanningFEMCode.Size = new System.Drawing.Size(35, 24);
+            this.lbl_ScanningFEMCode.Size = new System.Drawing.Size(45, 30);
             this.lbl_ScanningFEMCode.TabIndex = 24;
             this.lbl_ScanningFEMCode.Text = "-----";
             this.lbl_ScanningFEMCode.MouseDown += new System.Windows.Forms.MouseEventHandler(this.lbl_femCode_MouseDown);
@@ -589,11 +589,11 @@ namespace SIMDP.Project
             // 
             this.gridControl_FEM.Dock = System.Windows.Forms.DockStyle.Fill;
             this.gridControl_FEM.Font = new System.Drawing.Font("宋体", 15F);
-            this.gridControl_FEM.Location = new System.Drawing.Point(892, 58);
+            this.gridControl_FEM.Location = new System.Drawing.Point(828, 56);
             this.gridControl_FEM.MainView = this.gridView_FEM;
             this.gridControl_FEM.Name = "gridControl_FEM";
             this.coTableLayoutPanel4.SetRowSpan(this.gridControl_FEM, 2);
-            this.gridControl_FEM.Size = new System.Drawing.Size(281, 104);
+            this.gridControl_FEM.Size = new System.Drawing.Size(261, 102);
             this.gridControl_FEM.TabIndex = 27;
             this.gridControl_FEM.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView_FEM});
@@ -629,7 +629,7 @@ namespace SIMDP.Project
             this.groupBox1.Controls.Add(this.coTableLayoutPanel1);
             this.groupBox1.Location = new System.Drawing.Point(3, 3);
             this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(1563, 71);
+            this.groupBox1.Size = new System.Drawing.Size(1454, 71);
             this.groupBox1.TabIndex = 29;
             this.groupBox1.TabStop = false;
             this.groupBox1.Text = "安装工位";
@@ -653,11 +653,11 @@ namespace SIMDP.Project
             this.coTableLayoutPanel1.Controls.Add(this.lbl_TightingModel, 3, 0);
             this.coTableLayoutPanel1.Controls.Add(this.lbl_TightingColor, 5, 0);
             this.coTableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.coTableLayoutPanel1.Location = new System.Drawing.Point(3, 18);
+            this.coTableLayoutPanel1.Location = new System.Drawing.Point(3, 22);
             this.coTableLayoutPanel1.Name = "coTableLayoutPanel1";
             this.coTableLayoutPanel1.RowCount = 1;
             this.coTableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.coTableLayoutPanel1.Size = new System.Drawing.Size(1557, 50);
+            this.coTableLayoutPanel1.Size = new System.Drawing.Size(1448, 46);
             this.coTableLayoutPanel1.TabIndex = 0;
             // 
             // lbl_Tighting_Pointer
@@ -668,9 +668,9 @@ namespace SIMDP.Project
             this.lbl_Tighting_Pointer.Appearance.Options.UseTextOptions = true;
             this.lbl_Tighting_Pointer.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
             this.lbl_Tighting_Pointer.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.Horizontal;
-            this.lbl_Tighting_Pointer.Location = new System.Drawing.Point(115, 13);
+            this.lbl_Tighting_Pointer.Location = new System.Drawing.Point(107, 8);
             this.lbl_Tighting_Pointer.Name = "lbl_Tighting_Pointer";
-            this.lbl_Tighting_Pointer.Size = new System.Drawing.Size(35, 24);
+            this.lbl_Tighting_Pointer.Size = new System.Drawing.Size(45, 30);
             this.lbl_Tighting_Pointer.TabIndex = 24;
             this.lbl_Tighting_Pointer.Text = "-----";
             this.lbl_Tighting_Pointer.MouseDown += new System.Windows.Forms.MouseEventHandler(this.lbl_vincode_MouseDown);
@@ -680,10 +680,10 @@ namespace SIMDP.Project
             this.labelControl2.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.labelControl2.Appearance.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.labelControl2.Appearance.Options.UseFont = true;
-            this.labelControl2.Location = new System.Drawing.Point(438, 15);
+            this.labelControl2.Location = new System.Drawing.Point(387, 10);
             this.labelControl2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl2.Name = "labelControl2";
-            this.labelControl2.Size = new System.Drawing.Size(60, 20);
+            this.labelControl2.Size = new System.Drawing.Size(75, 25);
             this.labelControl2.TabIndex = 4;
             this.labelControl2.Text = "车型：";
             // 
@@ -692,10 +692,10 @@ namespace SIMDP.Project
             this.labelControl4.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.labelControl4.Appearance.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.labelControl4.Appearance.Options.UseFont = true;
-            this.labelControl4.Location = new System.Drawing.Point(828, 15);
+            this.labelControl4.Location = new System.Drawing.Point(749, 10);
             this.labelControl4.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl4.Name = "labelControl4";
-            this.labelControl4.Size = new System.Drawing.Size(60, 20);
+            this.labelControl4.Size = new System.Drawing.Size(75, 25);
             this.labelControl4.TabIndex = 4;
             this.labelControl4.Text = "颜色：";
             // 
@@ -704,10 +704,10 @@ namespace SIMDP.Project
             this.labelControl7.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.labelControl7.Appearance.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.labelControl7.Appearance.Options.UseFont = true;
-            this.labelControl7.Location = new System.Drawing.Point(49, 15);
+            this.labelControl7.Location = new System.Drawing.Point(26, 10);
             this.labelControl7.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl7.Name = "labelControl7";
-            this.labelControl7.Size = new System.Drawing.Size(60, 20);
+            this.labelControl7.Size = new System.Drawing.Size(75, 25);
             this.labelControl7.TabIndex = 4;
             this.labelControl7.Text = "车号：";
             // 
@@ -719,9 +719,9 @@ namespace SIMDP.Project
             this.lbl_TightingModel.Appearance.Options.UseTextOptions = true;
             this.lbl_TightingModel.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
             this.lbl_TightingModel.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.Horizontal;
-            this.lbl_TightingModel.Location = new System.Drawing.Point(504, 13);
+            this.lbl_TightingModel.Location = new System.Drawing.Point(468, 8);
             this.lbl_TightingModel.Name = "lbl_TightingModel";
-            this.lbl_TightingModel.Size = new System.Drawing.Size(35, 24);
+            this.lbl_TightingModel.Size = new System.Drawing.Size(45, 30);
             this.lbl_TightingModel.TabIndex = 24;
             this.lbl_TightingModel.Text = "-----";
             // 
@@ -733,17 +733,17 @@ namespace SIMDP.Project
             this.lbl_TightingColor.Appearance.Options.UseTextOptions = true;
             this.lbl_TightingColor.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
             this.lbl_TightingColor.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.Horizontal;
-            this.lbl_TightingColor.Location = new System.Drawing.Point(894, 13);
+            this.lbl_TightingColor.Location = new System.Drawing.Point(830, 8);
             this.lbl_TightingColor.Name = "lbl_TightingColor";
-            this.lbl_TightingColor.Size = new System.Drawing.Size(35, 24);
+            this.lbl_TightingColor.Size = new System.Drawing.Size(45, 30);
             this.lbl_TightingColor.TabIndex = 24;
             this.lbl_TightingColor.Text = "-----";
             // 
             // FormCurrentTask
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1569, 501);
+            this.ClientSize = new System.Drawing.Size(1460, 501);
             this.Controls.Add(this.panel1);
             this.Name = "FormCurrentTask";
             this.Text = "当前任务";

SIMDP.Project/Form/FormMonitorTighten.Designer.cs

@@ -31,7 +31,7 @@ namespace SIMDP.Project
         {
             this.components = new System.ComponentModel.Container();
             this.label1 = new System.Windows.Forms.Label();
-            this.label2 = new System.Windows.Forms.Label();
+            this.lbl_newVIN = new System.Windows.Forms.Label();
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
             this.TagCom7 = new ProjectBase.Controls.LeftLabels();
             this.TagCom8 = new ProjectBase.Controls.LeftLabels();
@@ -39,7 +39,7 @@ namespace SIMDP.Project
             this.TagCom6 = new ProjectBase.Controls.RightLabels();
             this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
             this.TagCom3 = new ProjectBase.Controls.LeftLabels();
-            this.label3 = new System.Windows.Forms.Label();
+            this.lbl_oldVIN = new System.Windows.Forms.Label();
             this.TagCom4 = new ProjectBase.Controls.LeftLabels();
             this.TagCom1 = new ProjectBase.Controls.RightLabels();
             this.TagCom2 = new ProjectBase.Controls.RightLabels();
@@ -68,20 +68,20 @@ namespace SIMDP.Project
             this.label1.Text = "FEM自动拧紧设备";
             this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // label2
-            // 
-            this.label2.BackColor = System.Drawing.Color.PaleTurquoise;
-            this.label2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.tableLayoutPanel1.SetColumnSpan(this.label2, 4);
-            this.label2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label2.Font = new System.Drawing.Font("微软雅黑", 15.5F);
-            this.label2.Location = new System.Drawing.Point(0, 0);
-            this.label2.Margin = new System.Windows.Forms.Padding(0);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(457, 50);
-            this.label2.TabIndex = 0;
-            this.label2.Text = "装配车身号：LHG123451234512";
-            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // lbl_newVIN
+            // 
+            this.lbl_newVIN.BackColor = System.Drawing.Color.PaleTurquoise;
+            this.lbl_newVIN.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.tableLayoutPanel1.SetColumnSpan(this.lbl_newVIN, 4);
+            this.lbl_newVIN.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.lbl_newVIN.Font = new System.Drawing.Font("微软雅黑", 15.5F);
+            this.lbl_newVIN.Location = new System.Drawing.Point(0, 0);
+            this.lbl_newVIN.Margin = new System.Windows.Forms.Padding(0);
+            this.lbl_newVIN.Name = "lbl_newVIN";
+            this.lbl_newVIN.Size = new System.Drawing.Size(457, 50);
+            this.lbl_newVIN.TabIndex = 0;
+            this.lbl_newVIN.Text = "装配车身号：LHG123451234512";
+            this.lbl_newVIN.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // tableLayoutPanel1
             // 
@@ -93,7 +93,7 @@ namespace SIMDP.Project
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 17F));
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 17F));
             this.tableLayoutPanel1.Controls.Add(this.TagCom7, 0, 1);
-            this.tableLayoutPanel1.Controls.Add(this.label2, 0, 0);
+            this.tableLayoutPanel1.Controls.Add(this.lbl_newVIN, 0, 0);
             this.tableLayoutPanel1.Controls.Add(this.TagCom8, 0, 3);
             this.tableLayoutPanel1.Controls.Add(this.TagCom5, 2, 1);
             this.tableLayoutPanel1.Controls.Add(this.TagCom6, 2, 3);
@@ -183,7 +183,7 @@ namespace SIMDP.Project
             this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F));
             this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 17F));
             this.tableLayoutPanel2.Controls.Add(this.TagCom3, 0, 1);
-            this.tableLayoutPanel2.Controls.Add(this.label3, 0, 0);
+            this.tableLayoutPanel2.Controls.Add(this.lbl_oldVIN, 0, 0);
             this.tableLayoutPanel2.Controls.Add(this.TagCom4, 0, 3);
             this.tableLayoutPanel2.Controls.Add(this.TagCom1, 2, 1);
             this.tableLayoutPanel2.Controls.Add(this.TagCom2, 2, 3);
@@ -216,20 +216,20 @@ namespace SIMDP.Project
             this.TagCom3.TabIndex = 1;
             this.TagCom3.Torque_Value = "69.3";
             // 
-            // label3
-            // 
-            this.label3.BackColor = System.Drawing.Color.Moccasin;
-            this.label3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.tableLayoutPanel2.SetColumnSpan(this.label3, 4);
-            this.label3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label3.Font = new System.Drawing.Font("微软雅黑", 15.5F);
-            this.label3.Location = new System.Drawing.Point(0, 0);
-            this.label3.Margin = new System.Windows.Forms.Padding(0);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(453, 50);
-            this.label3.TabIndex = 0;
-            this.label3.Text = "搬出车身号：LHG123451234512";
-            this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // lbl_oldVIN
+            // 
+            this.lbl_oldVIN.BackColor = System.Drawing.Color.Moccasin;
+            this.lbl_oldVIN.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.tableLayoutPanel2.SetColumnSpan(this.lbl_oldVIN, 4);
+            this.lbl_oldVIN.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.lbl_oldVIN.Font = new System.Drawing.Font("微软雅黑", 15.5F);
+            this.lbl_oldVIN.Location = new System.Drawing.Point(0, 0);
+            this.lbl_oldVIN.Margin = new System.Windows.Forms.Padding(0);
+            this.lbl_oldVIN.Name = "lbl_oldVIN";
+            this.lbl_oldVIN.Size = new System.Drawing.Size(453, 50);
+            this.lbl_oldVIN.TabIndex = 0;
+            this.lbl_oldVIN.Text = "搬出车身号：LHG123451234512";
+            this.lbl_oldVIN.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // TagCom4
             // 
@@ -353,7 +353,6 @@ namespace SIMDP.Project
             this.Name = "FormMonitorTighten";
             this.Text = "FEM拧紧设备";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
-
             this.tableLayoutPanel1.ResumeLayout(false);
             this.tableLayoutPanel2.ResumeLayout(false);
             this.splitContainer1.Panel1.ResumeLayout(false);
@@ -370,14 +369,14 @@ namespace SIMDP.Project
         private ProjectBase.Controls.CircleLabel circleLabel1;
         private System.Windows.Forms.Label label1;
         private ProjectBase.Controls.LeftLabels TagCom7;
-        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.Label lbl_newVIN;
         private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
         private ProjectBase.Controls.LeftLabels TagCom8;
         private ProjectBase.Controls.RightLabels TagCom5;
         private ProjectBase.Controls.RightLabels TagCom6;
         private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
         private ProjectBase.Controls.LeftLabels TagCom3;
-        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.Label lbl_oldVIN;
         private ProjectBase.Controls.LeftLabels TagCom4;
         private ProjectBase.Controls.RightLabels TagCom1;
         private ProjectBase.Controls.RightLabels TagCom2;

SIMDP.Project/Form/FormMonitorTighten.cs

@@ -39,23 +39,26 @@ namespace SIMDP.Project
 
 
             //230213
-            TagCom1.Torque_Value = MXComponent_FEM02.old_torque1.ToString();
-            TagCom2.Torque_Value = MXComponent_FEM02.old_torque2.ToString();
-            TagCom3.Torque_Value = MXComponent_FEM02.old_torque3.ToString();
-            TagCom4.Torque_Value = MXComponent_FEM02.old_torque4.ToString();
-            TagCom5.Torque_Value = MXComponent_FEM02.torque1.ToString();
-            TagCom6.Torque_Value = MXComponent_FEM02.torque2.ToString();
-            TagCom7.Torque_Value = MXComponent_FEM02.torque3.ToString();
-            TagCom8.Torque_Value = MXComponent_FEM02.torque4.ToString();
-
-            TagCom1.Angle_Value = MXComponent_FEM02.old_angle1.ToString();
-            TagCom2.Angle_Value = MXComponent_FEM02.old_angle2.ToString();
-            TagCom3.Angle_Value = MXComponent_FEM02.old_angle3.ToString();
-            TagCom4.Angle_Value = MXComponent_FEM02.old_angle4.ToString();
-            TagCom5.Angle_Value = MXComponent_FEM02.angle1.ToString();
-            TagCom6.Angle_Value = MXComponent_FEM02.angle2.ToString();
-            TagCom7.Angle_Value = MXComponent_FEM02.angle3.ToString();
-            TagCom8.Angle_Value = MXComponent_FEM02.angle4.ToString();
+            lbl_oldVIN.Text = "搬出车身号："+ MXComponent_FEM02.oldVIN;
+            lbl_newVIN.Text = "装配车身号："+ MXComponent_FEM02.newVIN;
+
+            TagCom1.Torque_Value = MXComponent_FEM02.old_torque1.ToString("0.0");
+            TagCom2.Torque_Value = MXComponent_FEM02.old_torque2.ToString("0.0");
+            TagCom3.Torque_Value = MXComponent_FEM02.old_torque3.ToString("0.0");
+            TagCom4.Torque_Value = MXComponent_FEM02.old_torque4.ToString("0.0");
+            TagCom5.Torque_Value = MXComponent_FEM02.torque1.ToString("0.0");
+            TagCom6.Torque_Value = MXComponent_FEM02.torque2.ToString("0.0");
+            TagCom7.Torque_Value = MXComponent_FEM02.torque3.ToString("0.0");
+            TagCom8.Torque_Value = MXComponent_FEM02.torque4.ToString("0.0");
+
+            TagCom1.Angle_Value = MXComponent_FEM02.old_angle1.ToString("0.0");
+            TagCom2.Angle_Value = MXComponent_FEM02.old_angle2.ToString("0.0");
+            TagCom3.Angle_Value = MXComponent_FEM02.old_angle3.ToString("0.0");
+            TagCom4.Angle_Value = MXComponent_FEM02.old_angle4.ToString("0.0");
+            TagCom5.Angle_Value = MXComponent_FEM02.angle1.ToString("0.0");
+            TagCom6.Angle_Value = MXComponent_FEM02.angle2.ToString("0.0");
+            TagCom7.Angle_Value = MXComponent_FEM02.angle3.ToString("0.0");
+            TagCom8.Angle_Value = MXComponent_FEM02.angle4.ToString("0.0");
 
         }
 

SIMDP.Project/MXComponent_FEM02.cs

@@ -554,6 +554,8 @@ namespace SIMDP.Project
                 return;
             }
             Write("拧紧工位数据写入成功", true);
+            //230214 更新拧紧工位显示之前，进行TightingMonitor的数据更新
+            UpdateFormMonitorTightenData();
             RefreshTightingUI(listMtoc[0]);
 
             //AS400指针下调
@@ -690,10 +692,6 @@ namespace SIMDP.Project
         public static float angle3 = 0.0f;
         public static float angle4 = 0.0f;
 
-        public static short old_itightRes1 = 0;
-        public static short old_itightRes2 = 0;
-        public static short old_itightRes3 = 0;
-        public static short old_itightRes4 = 0;
         public static float old_torque1 = 0.0f;
         public static float old_torque2 = 0.0f;
         public static float old_torque3 = 0.0f;
@@ -703,21 +701,12 @@ namespace SIMDP.Project
         public static float old_angle3 = 0.0f;
         public static float old_angle4 = 0.0f;
 
-        public void 读取拧紧结果请求(object value)
-        {
-            bool signal = Convert.ToBoolean(value);
-            LogHelper.log.Info($"signal = {signal}");
-            if (!signal)
-            {
-                Write("读取拧紧结果完成", false);
-                return;
-            }
+        public static string oldVIN = "";
+        public static string newVIN = "";
 
-            //读取新的之前，把旧的值传到搬出工位
-            old_itightRes1 = itightRes1;
-            old_itightRes2 = itightRes2;
-            old_itightRes3 = itightRes3;
-            old_itightRes4 = itightRes4;
+        public void UpdateFormMonitorTightenData()
+        {
+            oldVIN = SysEnvironment.Global_Tighting_Pointer;//这个是发车后，刚刚拧紧完的 （搬出的）
             old_torque1 = torque1;
             old_torque2 = torque2;
             old_torque3 = torque3;
@@ -727,6 +716,31 @@ namespace SIMDP.Project
             old_angle3 = angle3;
             old_angle4 = angle4;
 
+            newVIN = SysEnvironment.Global_Scanning_Pointer; //这个是发车后，从扫码位置过来的，还没拧的
+            itightRes1 = 0;
+            itightRes2 = 0;
+            itightRes3 = 0;
+            itightRes4 = 0;
+            torque1 = 0;
+            torque2 = 0;
+            torque3 = 0;
+            torque4 = 0;
+            angle1 = 0;
+            angle2 = 0;
+            angle3 = 0;
+            angle4 = 0;
+        }
+
+        public void 读取拧紧结果请求(object value)
+        {
+            bool signal = Convert.ToBoolean(value);
+            LogHelper.log.Info($"signal = {signal}");
+            if (!signal)
+            {
+                Write("读取拧紧结果完成", false);
+                return;
+            }
+
             Read("拧紧结果1", out itightRes1);
             Read("拧紧结果2", out itightRes2);
             Read("拧紧结果3", out itightRes3);

SIMDP.Project/Properties/licenses.licx

@@ -1,4 +1,5 @@
-DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v19.2, Version=19.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraTabbedMdi.XtraTabbedMdiManager, DevExpress.XtraBars.v19.2, Version=19.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraTabbedMdi.XtraTabbedMdiManager, DevExpress.XtraBars.v19.2, Version=19.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v19.2, Version=19.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a