根据需求调整界面

BaseLib/obj/Debug/BaseLib.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-a01dcec7f4571c4225b0c861cc7338c1fc4ac30297e6b4c61940198f497c948a
+f357daf96bfdede7d42fce956e3e29b3152b3f47

BaseLib/obj/Debug/BaseLib.csproj.FileListAbsolute.txt

@@ -2695,3 +2695,13 @@ C:\Users\Public\Music\新建文件夹\药环压制设备线体外数据监控系
 C:\Users\Public\Music\新建文件夹\药环压制设备线体外数据监控系统-V10.10\BaseLib\obj\Debug\BaseLib.csproj.Up2Date
 C:\Users\Public\Music\新建文件夹\药环压制设备线体外数据监控系统-V10.10\BaseLib\obj\Debug\BaseLib.dll
 C:\Users\Public\Music\新建文件夹\药环压制设备线体外数据监控系统-V10.10\BaseLib\obj\Debug\BaseLib.pdb
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\bin\Debug\BaseLib.dll
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\bin\Debug\BaseLib.pdb
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\BaseLib\obj\Debug\BaseLib.csproj.AssemblyReference.cache
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\BaseLib\obj\Debug\BaseLib.Properties.Resources.resources
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\BaseLib\obj\Debug\BaseLibRWFile.Form_SysSet.resources
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\BaseLib\obj\Debug\BaseLib.csproj.GenerateResource.cache
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\BaseLib\obj\Debug\BaseLib.csproj.CoreCompileInputs.cache
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\BaseLib\obj\Debug\BaseLib.csproj.CopyComplete
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\BaseLib\obj\Debug\BaseLib.dll
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\BaseLib\obj\Debug\BaseLib.pdb

LHY-WD-BC_MES/Windows/FrmCommunication.Designer.cs

@@ -82,7 +82,7 @@
             this.uiTableLayoutPanel1.RowCount = 2;
             this.uiTableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
             this.uiTableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.uiTableLayoutPanel1.Size = new System.Drawing.Size(1604, 881);
+            this.uiTableLayoutPanel1.Size = new System.Drawing.Size(1604, 813);
             this.uiTableLayoutPanel1.TabIndex = 0;
             this.uiTableLayoutPanel1.TagString = null;
             // 
@@ -98,12 +98,12 @@
             this.uiGroupBox3.Controls.Add(this.cobTcpServer);
             this.uiGroupBox3.Dock = System.Windows.Forms.DockStyle.Fill;
             this.uiGroupBox3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.uiGroupBox3.Location = new System.Drawing.Point(4, 445);
+            this.uiGroupBox3.Location = new System.Drawing.Point(4, 411);
             this.uiGroupBox3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.uiGroupBox3.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiGroupBox3.Name = "uiGroupBox3";
-            this.uiGroupBox3.Padding = new System.Windows.Forms.Padding(0, 35, 0, 0);
-            this.uiGroupBox3.Size = new System.Drawing.Size(794, 431);
+            this.uiGroupBox3.Padding = new System.Windows.Forms.Padding(0, 32, 0, 0);
+            this.uiGroupBox3.Size = new System.Drawing.Size(794, 397);
             this.uiGroupBox3.TabIndex = 2;
             this.uiGroupBox3.Text = "Server通讯";
             this.uiGroupBox3.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -239,8 +239,8 @@
             this.uiGroupBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.uiGroupBox1.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiGroupBox1.Name = "uiGroupBox1";
-            this.uiGroupBox1.Padding = new System.Windows.Forms.Padding(0, 35, 0, 0);
-            this.uiGroupBox1.Size = new System.Drawing.Size(794, 430);
+            this.uiGroupBox1.Padding = new System.Windows.Forms.Padding(0, 32, 0, 0);
+            this.uiGroupBox1.Size = new System.Drawing.Size(794, 396);
             this.uiGroupBox1.TabIndex = 0;
             this.uiGroupBox1.Text = "PLC通讯";
             this.uiGroupBox1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -433,8 +433,8 @@
             this.uiGroupBox2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.uiGroupBox2.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiGroupBox2.Name = "uiGroupBox2";
-            this.uiGroupBox2.Padding = new System.Windows.Forms.Padding(0, 35, 0, 0);
-            this.uiGroupBox2.Size = new System.Drawing.Size(794, 430);
+            this.uiGroupBox2.Padding = new System.Windows.Forms.Padding(0, 32, 0, 0);
+            this.uiGroupBox2.Size = new System.Drawing.Size(794, 396);
             this.uiGroupBox2.TabIndex = 1;
             this.uiGroupBox2.Text = "Client通讯";
             this.uiGroupBox2.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
@@ -557,9 +557,9 @@
             // 
             // FrmCommunication
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1604, 881);
+            this.ClientSize = new System.Drawing.Size(1604, 813);
             this.Controls.Add(this.uiTableLayoutPanel1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.Name = "FrmCommunication";

LHY-WD-BC_MES/Windows/FrmFirstWindow.Designer.cs

@@ -52,7 +52,6 @@
             this.label15 = new System.Windows.Forms.Label();
             this.label14 = new System.Windows.Forms.Label();
             this.label13 = new System.Windows.Forms.Label();
-            this.label12 = new System.Windows.Forms.Label();
             this.label11 = new System.Windows.Forms.Label();
             this.label17 = new System.Windows.Forms.Label();
             this.label18 = new System.Windows.Forms.Label();
@@ -100,6 +99,14 @@
             this.txtA料仓5当前重量 = new Sunny.UI.UITextBox();
             this.uiLabel12 = new Sunny.UI.UILabel();
             this.timer1 = new System.Windows.Forms.Timer(this.components);
+            this.label5 = new System.Windows.Forms.Label();
+            this.label6 = new System.Windows.Forms.Label();
+            this.label7 = new System.Windows.Forms.Label();
+            this.label19 = new System.Windows.Forms.Label();
+            this.uiTextBox1 = new Sunny.UI.UITextBox();
+            this.uiTextBox2 = new Sunny.UI.UITextBox();
+            this.uiComboBox1 = new Sunny.UI.UIComboBox();
+            this.label20 = new System.Windows.Forms.Label();
             this.uchmiM01M02 = new HRT_Measure.UCHMI();
             this.uchmiM03 = new HRT_Measure.UCHMI();
             this.uchmiM04M05 = new HRT_Measure.UCHMI();
@@ -133,8 +140,8 @@
             // 
             this.splitContainerMain.Panel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(27)))), ((int)(((byte)(44)))));
             this.splitContainerMain.Panel2.Controls.Add(this.tableLayoutPanelBottom);
-            this.splitContainerMain.Size = new System.Drawing.Size(1904, 1083);
-            this.splitContainerMain.SplitterDistance = 416;
+            this.splitContainerMain.Size = new System.Drawing.Size(1904, 1000);
+            this.splitContainerMain.SplitterDistance = 384;
             this.splitContainerMain.TabIndex = 3;
             // 
             // tableLayoutPanelUp
@@ -151,7 +158,7 @@
             this.tableLayoutPanelUp.Name = "tableLayoutPanelUp";
             this.tableLayoutPanelUp.RowCount = 1;
             this.tableLayoutPanelUp.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanelUp.Size = new System.Drawing.Size(1904, 416);
+            this.tableLayoutPanelUp.Size = new System.Drawing.Size(1904, 384);
             this.tableLayoutPanelUp.TabIndex = 0;
             // 
             // tableLayoutPanelBottom
@@ -168,12 +175,12 @@
             this.tableLayoutPanelBottom.Name = "tableLayoutPanelBottom";
             this.tableLayoutPanelBottom.RowCount = 1;
             this.tableLayoutPanelBottom.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanelBottom.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 663F));
-            this.tableLayoutPanelBottom.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 663F));
-            this.tableLayoutPanelBottom.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 663F));
-            this.tableLayoutPanelBottom.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 663F));
-            this.tableLayoutPanelBottom.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 663F));
-            this.tableLayoutPanelBottom.Size = new System.Drawing.Size(1904, 663);
+            this.tableLayoutPanelBottom.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 612F));
+            this.tableLayoutPanelBottom.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 612F));
+            this.tableLayoutPanelBottom.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 612F));
+            this.tableLayoutPanelBottom.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 612F));
+            this.tableLayoutPanelBottom.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 612F));
+            this.tableLayoutPanelBottom.Size = new System.Drawing.Size(1904, 612);
             this.tableLayoutPanelBottom.TabIndex = 0;
             // 
             // uiGroupBox3
@@ -197,8 +204,8 @@
             this.uiGroupBox3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.uiGroupBox3.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiGroupBox3.Name = "uiGroupBox3";
-            this.uiGroupBox3.Padding = new System.Windows.Forms.Padding(0, 35, 0, 0);
-            this.uiGroupBox3.Size = new System.Drawing.Size(628, 653);
+            this.uiGroupBox3.Padding = new System.Windows.Forms.Padding(0, 32, 0, 0);
+            this.uiGroupBox3.Size = new System.Drawing.Size(628, 602);
             this.uiGroupBox3.Style = Sunny.UI.UIStyle.Custom;
             this.uiGroupBox3.TabIndex = 3;
             this.uiGroupBox3.Text = "检测 装箱";
@@ -324,6 +331,14 @@
             // grbPressure
             // 
             this.grbPressure.BackColor = System.Drawing.Color.Transparent;
+            this.grbPressure.Controls.Add(this.label20);
+            this.grbPressure.Controls.Add(this.uiComboBox1);
+            this.grbPressure.Controls.Add(this.label5);
+            this.grbPressure.Controls.Add(this.label6);
+            this.grbPressure.Controls.Add(this.label7);
+            this.grbPressure.Controls.Add(this.label19);
+            this.grbPressure.Controls.Add(this.uiTextBox1);
+            this.grbPressure.Controls.Add(this.uiTextBox2);
             this.grbPressure.Controls.Add(this.uiLabel11);
             this.grbPressure.Controls.Add(this.uiLabel10);
             this.grbPressure.Controls.Add(this.txt动作提示);
@@ -333,7 +348,6 @@
             this.grbPressure.Controls.Add(this.label15);
             this.grbPressure.Controls.Add(this.label14);
             this.grbPressure.Controls.Add(this.label13);
-            this.grbPressure.Controls.Add(this.label12);
             this.grbPressure.Controls.Add(this.label11);
             this.grbPressure.Controls.Add(this.label17);
             this.grbPressure.Controls.Add(this.label18);
@@ -352,8 +366,8 @@
             this.grbPressure.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.grbPressure.MinimumSize = new System.Drawing.Size(1, 1);
             this.grbPressure.Name = "grbPressure";
-            this.grbPressure.Padding = new System.Windows.Forms.Padding(0, 35, 0, 0);
-            this.grbPressure.Size = new System.Drawing.Size(626, 653);
+            this.grbPressure.Padding = new System.Windows.Forms.Padding(0, 32, 0, 0);
+            this.grbPressure.Size = new System.Drawing.Size(626, 602);
             this.grbPressure.Style = Sunny.UI.UIStyle.Custom;
             this.grbPressure.TabIndex = 1;
             this.grbPressure.Text = "压机";
@@ -362,29 +376,31 @@
             // 
             // uiLabel11
             // 
-            this.uiLabel11.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.uiLabel11.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.uiLabel11.ForeColor = System.Drawing.Color.Green;
-            this.uiLabel11.Location = new System.Drawing.Point(40, 413);
+            this.uiLabel11.Location = new System.Drawing.Point(16, 413);
             this.uiLabel11.Name = "uiLabel11";
             this.uiLabel11.Size = new System.Drawing.Size(110, 41);
             this.uiLabel11.TabIndex = 206;
             this.uiLabel11.Text = "动作提示";
+            this.uiLabel11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // uiLabel10
             // 
-            this.uiLabel10.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.uiLabel10.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.uiLabel10.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            this.uiLabel10.Location = new System.Drawing.Point(40, 355);
+            this.uiLabel10.Location = new System.Drawing.Point(16, 355);
             this.uiLabel10.Name = "uiLabel10";
             this.uiLabel10.Size = new System.Drawing.Size(110, 41);
             this.uiLabel10.TabIndex = 205;
             this.uiLabel10.Text = "当前动作";
+            this.uiLabel10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // txt动作提示
             // 
             this.txt动作提示.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.txt动作提示.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F);
-            this.txt动作提示.Location = new System.Drawing.Point(176, 406);
+            this.txt动作提示.Location = new System.Drawing.Point(159, 409);
             this.txt动作提示.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt动作提示.MinimumSize = new System.Drawing.Size(1, 16);
             this.txt动作提示.Name = "txt动作提示";
@@ -399,7 +415,7 @@
             // 
             this.txt当前动作.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.txt当前动作.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F);
-            this.txt当前动作.Location = new System.Drawing.Point(176, 348);
+            this.txt当前动作.Location = new System.Drawing.Point(159, 351);
             this.txt当前动作.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt当前动作.MinimumSize = new System.Drawing.Size(1, 16);
             this.txt当前动作.Name = "txt当前动作";
@@ -416,7 +432,7 @@
             this.btnClearPressure.FillColor = System.Drawing.Color.LightSkyBlue;
             this.btnClearPressure.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F);
             this.btnClearPressure.ForeColor = System.Drawing.Color.Black;
-            this.btnClearPressure.Location = new System.Drawing.Point(470, 261);
+            this.btnClearPressure.Location = new System.Drawing.Point(453, 282);
             this.btnClearPressure.MinimumSize = new System.Drawing.Size(1, 1);
             this.btnClearPressure.Name = "btnClearPressure";
             this.btnClearPressure.Size = new System.Drawing.Size(105, 43);
@@ -431,7 +447,7 @@
             this.label16.AutoSize = true;
             this.label16.BackColor = System.Drawing.Color.Transparent;
             this.label16.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            this.label16.Location = new System.Drawing.Point(389, 271);
+            this.label16.Location = new System.Drawing.Point(565, 241);
             this.label16.Name = "label16";
             this.label16.Size = new System.Drawing.Size(35, 21);
             this.label16.TabIndex = 199;
@@ -441,7 +457,7 @@
             // 
             this.label15.AutoSize = true;
             this.label15.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            this.label15.Location = new System.Drawing.Point(389, 211);
+            this.label15.Location = new System.Drawing.Point(565, 197);
             this.label15.Name = "label15";
             this.label15.Size = new System.Drawing.Size(17, 21);
             this.label15.TabIndex = 198;
@@ -452,7 +468,7 @@
             this.label14.AutoSize = true;
             this.label14.BackColor = System.Drawing.Color.Transparent;
             this.label14.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            this.label14.Location = new System.Drawing.Point(389, 165);
+            this.label14.Location = new System.Drawing.Point(565, 153);
             this.label14.Name = "label14";
             this.label14.Size = new System.Drawing.Size(45, 21);
             this.label14.TabIndex = 197;
@@ -463,29 +479,18 @@
             this.label13.AutoSize = true;
             this.label13.BackColor = System.Drawing.Color.Transparent;
             this.label13.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            this.label13.Location = new System.Drawing.Point(389, 118);
+            this.label13.Location = new System.Drawing.Point(565, 109);
             this.label13.Name = "label13";
-            this.label13.Size = new System.Drawing.Size(54, 21);
+            this.label13.Size = new System.Drawing.Size(40, 21);
             this.label13.TabIndex = 196;
-            this.label13.Text = "mm/s";
-            // 
-            // label12
-            // 
-            this.label12.AutoSize = true;
-            this.label12.BackColor = System.Drawing.Color.Transparent;
-            this.label12.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            this.label12.Location = new System.Drawing.Point(389, 69);
-            this.label12.Name = "label12";
-            this.label12.Size = new System.Drawing.Size(40, 21);
-            this.label12.TabIndex = 195;
-            this.label12.Text = "mm";
+            this.label13.Text = "mm";
             // 
             // label11
             // 
             this.label11.AutoSize = true;
             this.label11.BackColor = System.Drawing.Color.Transparent;
             this.label11.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            this.label11.Location = new System.Drawing.Point(183, 271);
+            this.label11.Location = new System.Drawing.Point(341, 241);
             this.label11.Name = "label11";
             this.label11.Size = new System.Drawing.Size(74, 21);
             this.label11.TabIndex = 194;
@@ -496,7 +501,7 @@
             this.label17.AutoSize = true;
             this.label17.BackColor = System.Drawing.Color.Transparent;
             this.label17.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            this.label17.Location = new System.Drawing.Point(183, 218);
+            this.label17.Location = new System.Drawing.Point(341, 197);
             this.label17.Name = "label17";
             this.label17.Size = new System.Drawing.Size(74, 21);
             this.label17.TabIndex = 187;
@@ -507,7 +512,7 @@
             this.label18.AutoSize = true;
             this.label18.BackColor = System.Drawing.Color.Transparent;
             this.label18.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            this.label18.Location = new System.Drawing.Point(151, 165);
+            this.label18.Location = new System.Drawing.Point(341, 153);
             this.label18.Name = "label18";
             this.label18.Size = new System.Drawing.Size(106, 21);
             this.label18.TabIndex = 186;
@@ -518,29 +523,29 @@
             this.label10.AutoSize = true;
             this.label10.BackColor = System.Drawing.Color.Transparent;
             this.label10.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            this.label10.Location = new System.Drawing.Point(151, 120);
+            this.label10.Location = new System.Drawing.Point(341, 109);
             this.label10.Name = "label10";
             this.label10.Size = new System.Drawing.Size(106, 21);
             this.label10.TabIndex = 180;
-            this.label10.Text = "主缸位移速度";
+            this.label10.Text = "主缸当前位置";
             // 
             // label9
             // 
             this.label9.AutoSize = true;
             this.label9.BackColor = System.Drawing.Color.Transparent;
             this.label9.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
-            this.label9.Location = new System.Drawing.Point(151, 65);
+            this.label9.Location = new System.Drawing.Point(341, 65);
             this.label9.Name = "label9";
             this.label9.Size = new System.Drawing.Size(106, 21);
             this.label9.TabIndex = 179;
-            this.label9.Text = "主缸当前位置";
+            this.label9.Text = "当前产品型号";
             // 
             // txt工件计数
             // 
             this.txt工件计数.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.txt工件计数.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txt工件计数.ForeColor = System.Drawing.Color.Black;
-            this.txt工件计数.Location = new System.Drawing.Point(277, 265);
+            this.txt工件计数.Location = new System.Drawing.Point(453, 236);
             this.txt工件计数.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt工件计数.MinimumSize = new System.Drawing.Size(1, 16);
             this.txt工件计数.Name = "txt工件计数";
@@ -557,7 +562,7 @@
             this.txt保压倒计时.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.txt保压倒计时.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txt保压倒计时.ForeColor = System.Drawing.Color.Black;
-            this.txt保压倒计时.Location = new System.Drawing.Point(277, 208);
+            this.txt保压倒计时.Location = new System.Drawing.Point(453, 192);
             this.txt保压倒计时.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt保压倒计时.MinimumSize = new System.Drawing.Size(1, 16);
             this.txt保压倒计时.Name = "txt保压倒计时";
@@ -574,7 +579,7 @@
             this.txt主缸压力.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.txt主缸压力.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txt主缸压力.ForeColor = System.Drawing.Color.Black;
-            this.txt主缸压力.Location = new System.Drawing.Point(277, 162);
+            this.txt主缸压力.Location = new System.Drawing.Point(453, 148);
             this.txt主缸压力.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt主缸压力.MinimumSize = new System.Drawing.Size(1, 16);
             this.txt主缸压力.Name = "txt主缸压力";
@@ -591,7 +596,7 @@
             this.txt主缸速度.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.txt主缸速度.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txt主缸速度.ForeColor = System.Drawing.Color.Black;
-            this.txt主缸速度.Location = new System.Drawing.Point(277, 113);
+            this.txt主缸速度.Location = new System.Drawing.Point(453, 104);
             this.txt主缸速度.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt主缸速度.MinimumSize = new System.Drawing.Size(1, 16);
             this.txt主缸速度.Name = "txt主缸速度";
@@ -608,7 +613,7 @@
             this.txt主缸位置.Cursor = System.Windows.Forms.Cursors.IBeam;
             this.txt主缸位置.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txt主缸位置.ForeColor = System.Drawing.Color.Black;
-            this.txt主缸位置.Location = new System.Drawing.Point(277, 63);
+            this.txt主缸位置.Location = new System.Drawing.Point(453, 60);
             this.txt主缸位置.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.txt主缸位置.MinimumSize = new System.Drawing.Size(1, 16);
             this.txt主缸位置.Name = "txt主缸位置";
@@ -632,8 +637,8 @@
             this.uiGroupBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.uiGroupBox1.MinimumSize = new System.Drawing.Size(1, 1);
             this.uiGroupBox1.Name = "uiGroupBox1";
-            this.uiGroupBox1.Padding = new System.Windows.Forms.Padding(0, 35, 0, 0);
-            this.uiGroupBox1.Size = new System.Drawing.Size(626, 653);
+            this.uiGroupBox1.Padding = new System.Windows.Forms.Padding(0, 32, 0, 0);
+            this.uiGroupBox1.Size = new System.Drawing.Size(626, 602);
             this.uiGroupBox1.Style = Sunny.UI.UIStyle.Custom;
             this.uiGroupBox1.TabIndex = 0;
             this.uiGroupBox1.Text = "上料 称重";
@@ -647,7 +652,7 @@
             this.uiSplitContainer1.CollapsePanel = Sunny.UI.UISplitContainer.UICollapsePanel.None;
             this.uiSplitContainer1.Cursor = System.Windows.Forms.Cursors.Default;
             this.uiSplitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.uiSplitContainer1.Location = new System.Drawing.Point(0, 35);
+            this.uiSplitContainer1.Location = new System.Drawing.Point(0, 32);
             this.uiSplitContainer1.MinimumSize = new System.Drawing.Size(20, 20);
             this.uiSplitContainer1.Name = "uiSplitContainer1";
             this.uiSplitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;
@@ -693,8 +698,8 @@
             this.uiSplitContainer1.Panel2.Controls.Add(this.txtA料仓4当前重量);
             this.uiSplitContainer1.Panel2.Controls.Add(this.txtA料仓5当前重量);
             this.uiSplitContainer1.Panel2.Controls.Add(this.uiLabel12);
-            this.uiSplitContainer1.Size = new System.Drawing.Size(626, 618);
-            this.uiSplitContainer1.SplitterDistance = 212;
+            this.uiSplitContainer1.Size = new System.Drawing.Size(626, 570);
+            this.uiSplitContainer1.SplitterDistance = 195;
             this.uiSplitContainer1.SplitterWidth = 11;
             this.uiSplitContainer1.Style = Sunny.UI.UIStyle.Custom;
             this.uiSplitContainer1.TabIndex = 0;
@@ -1199,13 +1204,129 @@
             // 
             this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
             // 
+            // label5
+            // 
+            this.label5.AutoSize = true;
+            this.label5.BackColor = System.Drawing.Color.Transparent;
+            this.label5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+            this.label5.Location = new System.Drawing.Point(271, 109);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(45, 21);
+            this.label5.TabIndex = 212;
+            this.label5.Text = "MPa";
+            // 
+            // label6
+            // 
+            this.label6.AutoSize = true;
+            this.label6.BackColor = System.Drawing.Color.Transparent;
+            this.label6.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+            this.label6.Location = new System.Drawing.Point(271, 153);
+            this.label6.Name = "label6";
+            this.label6.Size = new System.Drawing.Size(24, 21);
+            this.label6.TabIndex = 211;
+            this.label6.Text = "%";
+            // 
+            // label7
+            // 
+            this.label7.AutoSize = true;
+            this.label7.BackColor = System.Drawing.Color.Transparent;
+            this.label7.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+            this.label7.Location = new System.Drawing.Point(17, 109);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(138, 21);
+            this.label7.TabIndex = 210;
+            this.label7.Text = "主缸当前压力设定";
+            // 
+            // label19
+            // 
+            this.label19.AutoSize = true;
+            this.label19.BackColor = System.Drawing.Color.Transparent;
+            this.label19.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+            this.label19.Location = new System.Drawing.Point(17, 153);
+            this.label19.Name = "label19";
+            this.label19.Size = new System.Drawing.Size(138, 21);
+            this.label19.TabIndex = 209;
+            this.label19.Text = "主缸当前流量设定";
+            // 
+            // uiTextBox1
+            // 
+            this.uiTextBox1.Cursor = System.Windows.Forms.Cursors.IBeam;
+            this.uiTextBox1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiTextBox1.ForeColor = System.Drawing.Color.Black;
+            this.uiTextBox1.Location = new System.Drawing.Point(159, 104);
+            this.uiTextBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.uiTextBox1.MinimumSize = new System.Drawing.Size(1, 16);
+            this.uiTextBox1.Name = "uiTextBox1";
+            this.uiTextBox1.Padding = new System.Windows.Forms.Padding(5);
+            this.uiTextBox1.ShowText = false;
+            this.uiTextBox1.Size = new System.Drawing.Size(105, 31);
+            this.uiTextBox1.Style = Sunny.UI.UIStyle.Custom;
+            this.uiTextBox1.TabIndex = 208;
+            this.uiTextBox1.TextAlignment = System.Drawing.ContentAlignment.MiddleRight;
+            this.uiTextBox1.Watermark = "";
+            // 
+            // uiTextBox2
+            // 
+            this.uiTextBox2.Cursor = System.Windows.Forms.Cursors.IBeam;
+            this.uiTextBox2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.uiTextBox2.ForeColor = System.Drawing.Color.Black;
+            this.uiTextBox2.Location = new System.Drawing.Point(159, 148);
+            this.uiTextBox2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.uiTextBox2.MinimumSize = new System.Drawing.Size(1, 16);
+            this.uiTextBox2.Name = "uiTextBox2";
+            this.uiTextBox2.Padding = new System.Windows.Forms.Padding(5);
+            this.uiTextBox2.ShowText = false;
+            this.uiTextBox2.Size = new System.Drawing.Size(105, 31);
+            this.uiTextBox2.Style = Sunny.UI.UIStyle.Custom;
+            this.uiTextBox2.TabIndex = 207;
+            this.uiTextBox2.TextAlignment = System.Drawing.ContentAlignment.MiddleRight;
+            this.uiTextBox2.Watermark = "";
+            // 
+            // uiComboBox1
+            // 
+            this.uiComboBox1.DataSource = null;
+            this.uiComboBox1.DropDownStyle = Sunny.UI.UIDropDownStyle.DropDownList;
+            this.uiComboBox1.DropDownWidth = 100;
+            this.uiComboBox1.FillColor = System.Drawing.Color.White;
+            this.uiComboBox1.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.uiComboBox1.ItemHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(200)))), ((int)(((byte)(255)))));
+            this.uiComboBox1.Items.AddRange(new object[] {
+            "型号1",
+            "型号2",
+            "型号3",
+            "型号4",
+            "型号5",
+            "型号6"});
+            this.uiComboBox1.ItemSelectForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255)))));
+            this.uiComboBox1.Location = new System.Drawing.Point(159, 61);
+            this.uiComboBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.uiComboBox1.MinimumSize = new System.Drawing.Size(63, 0);
+            this.uiComboBox1.Name = "uiComboBox1";
+            this.uiComboBox1.Padding = new System.Windows.Forms.Padding(0, 0, 30, 2);
+            this.uiComboBox1.Size = new System.Drawing.Size(105, 29);
+            this.uiComboBox1.SymbolSize = 24;
+            this.uiComboBox1.TabIndex = 213;
+            this.uiComboBox1.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+            this.uiComboBox1.Watermark = "";
+            // 
+            // label20
+            // 
+            this.label20.AutoSize = true;
+            this.label20.BackColor = System.Drawing.Color.Transparent;
+            this.label20.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
+            this.label20.Location = new System.Drawing.Point(17, 65);
+            this.label20.Name = "label20";
+            this.label20.Size = new System.Drawing.Size(106, 21);
+            this.label20.TabIndex = 214;
+            this.label20.Text = "产品型号选择";
+            // 
             // uchmiM01M02
             // 
             this.uchmiM01M02.DisplayLabel = "上料房 称重房";
             this.uchmiM01M02.Dock = System.Windows.Forms.DockStyle.Fill;
             this.uchmiM01M02.Location = new System.Drawing.Point(3, 3);
             this.uchmiM01M02.Name = "uchmiM01M02";
-            this.uchmiM01M02.Size = new System.Drawing.Size(628, 410);
+            this.uchmiM01M02.Size = new System.Drawing.Size(628, 378);
             this.uchmiM01M02.TabIndex = 0;
             // 
             // uchmiM03
@@ -1214,7 +1335,7 @@
             this.uchmiM03.Dock = System.Windows.Forms.DockStyle.Fill;
             this.uchmiM03.Location = new System.Drawing.Point(637, 3);
             this.uchmiM03.Name = "uchmiM03";
-            this.uchmiM03.Size = new System.Drawing.Size(628, 410);
+            this.uchmiM03.Size = new System.Drawing.Size(628, 378);
             this.uchmiM03.TabIndex = 1;
             // 
             // uchmiM04M05
@@ -1223,14 +1344,14 @@
             this.uchmiM04M05.Dock = System.Windows.Forms.DockStyle.Fill;
             this.uchmiM04M05.Location = new System.Drawing.Point(1271, 3);
             this.uchmiM04M05.Name = "uchmiM04M05";
-            this.uchmiM04M05.Size = new System.Drawing.Size(630, 410);
+            this.uchmiM04M05.Size = new System.Drawing.Size(630, 378);
             this.uchmiM04M05.TabIndex = 2;
             // 
             // FrmFirstWindow
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1904, 1083);
+            this.ClientSize = new System.Drawing.Size(1904, 1000);
             this.Controls.Add(this.splitContainerMain);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.Name = "FrmFirstWindow";
@@ -1280,7 +1401,6 @@
         private System.Windows.Forms.Label label15;
         private System.Windows.Forms.Label label14;
         private System.Windows.Forms.Label label13;
-        private System.Windows.Forms.Label label12;
         private System.Windows.Forms.Label label11;
         private System.Windows.Forms.Label label17;
         private System.Windows.Forms.Label label18;
@@ -1332,5 +1452,13 @@
         private Sunny.UI.UILabel uiLabel10;
         private Sunny.UI.UITextBox txt动作提示;
         private Sunny.UI.UITextBox txt当前动作;
+        private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.Label label6;
+        private System.Windows.Forms.Label label7;
+        private System.Windows.Forms.Label label19;
+        private Sunny.UI.UITextBox uiTextBox1;
+        private Sunny.UI.UITextBox uiTextBox2;
+        private System.Windows.Forms.Label label20;
+        private Sunny.UI.UIComboBox uiComboBox1;
     }
 }

LHY-WD-BC_MES/Windows/FrmFirstWindow.resx

@@ -121,6 +121,6 @@
     <value>17, 17</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>50</value>
+    <value>25</value>
   </metadata>
 </root>

LHY-WD-BC_MES/bin/Debug/Config/ProjectConfig.xml

@@ -10,7 +10,7 @@
     <M04_M05_PLC_IP>192.168.1.70</M04_M05_PLC_IP>
     <M04_M05_PLC_Port>102</M04_M05_PLC_Port>
     <压机通讯类型>Modbus串口通信</压机通讯类型>
-    <压机串口号>COM11</压机串口号>
+    <压机串口号>COM3</压机串口号>
     <称重PLC_IP地址>192.168.1.230</称重PLC_IP地址>
     <称重PLC_Port>502</称重PLC_Port>
     <称重通讯类型>ModbusClinet通信</称重通讯类型>

LHY-WD-BC_MES/bin/Debug/Newtonsoft.Json.xml

@@ -865,6 +865,32 @@
             Converts a <see cref="T:System.DateTime"/> to and from Unix epoch time
             </summary>
         </member>
+        <member name="P:Newtonsoft.Json.Converters.UnixDateTimeConverter.AllowPreEpoch">
+            <summary>
+            Gets or sets a value indicating whether the dates before Unix epoch
+            should converted to and from JSON.
+            </summary>
+            <value>
+            <c>true</c> to allow converting dates before Unix epoch to and from JSON;
+            <c>false</c> to throw an exception when a date being converted to or from JSON
+            occurred before Unix epoch. The default value is <c>false</c>.
+            </value>
+        </member>
+        <member name="M:Newtonsoft.Json.Converters.UnixDateTimeConverter.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Converters.UnixDateTimeConverter"/> class.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Converters.UnixDateTimeConverter.#ctor(System.Boolean)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Converters.UnixDateTimeConverter"/> class.
+            </summary>
+            <param name="allowPreEpoch">
+            <c>true</c> to allow converting dates before Unix epoch to and from JSON;
+            <c>false</c> to throw an exception when a date being converted to or from JSON
+            occurred before Unix epoch. The default value is <c>false</c>.
+            </param>
+        </member>
         <member name="M:Newtonsoft.Json.Converters.UnixDateTimeConverter.WriteJson(Newtonsoft.Json.JsonWriter,System.Object,Newtonsoft.Json.JsonSerializer)">
             <summary>
             Writes the JSON representation of the object.
@@ -1010,12 +1036,12 @@
         </member>
         <member name="F:Newtonsoft.Json.DateParseHandling.DateTime">
             <summary>
-            Date formatted strings, e.g. <c>"\/Date(1198908717056)\/"</c> and <c>"2012-03-21T05:40Z"</c>, are parsed to <see cref="F:Newtonsoft.Json.DateParseHandling.DateTime"/>.
+            Date formatted strings, e.g. <c>"\/Date(1198908717056)\/"</c> and <c>"2012-03-21T05:40Z"</c>, are parsed to <see cref="T:System.DateTime"/>.
             </summary>
         </member>
         <member name="F:Newtonsoft.Json.DateParseHandling.DateTimeOffset">
             <summary>
-            Date formatted strings, e.g. <c>"\/Date(1198908717056)\/"</c> and <c>"2012-03-21T05:40Z"</c>, are parsed to <see cref="F:Newtonsoft.Json.DateParseHandling.DateTimeOffset"/>.
+            Date formatted strings, e.g. <c>"\/Date(1198908717056)\/"</c> and <c>"2012-03-21T05:40Z"</c>, are parsed to <see cref="T:System.DateTimeOffset"/>.
             </summary>
         </member>
         <member name="T:Newtonsoft.Json.DateTimeZoneHandling">
@@ -2553,6 +2579,8 @@
         <member name="P:Newtonsoft.Json.JsonReader.MaxDepth">
             <summary>
             Gets or sets the maximum depth allowed when reading JSON. Reading past this depth will throw a <see cref="T:Newtonsoft.Json.JsonReaderException"/>.
+            A null value means there is no maximum. 
+            The default value is <c>64</c>.
             </summary>
         </member>
         <member name="P:Newtonsoft.Json.JsonReader.TokenType">
@@ -3012,7 +3040,7 @@
             <summary>
             Gets or sets the maximum depth allowed when reading JSON. Reading past this depth will throw a <see cref="T:Newtonsoft.Json.JsonReaderException"/>.
             A null value means there is no maximum.
-            The default value is <c>null</c>.
+            The default value is <c>64</c>.
             </summary>
         </member>
         <member name="P:Newtonsoft.Json.JsonSerializer.CheckAdditionalContent">
@@ -3102,7 +3130,7 @@
         </member>
         <member name="M:Newtonsoft.Json.JsonSerializer.Deserialize(System.IO.TextReader,System.Type)">
             <summary>
-            Deserializes the JSON structure contained by the specified <see cref="T:System.IO.StringReader"/>
+            Deserializes the JSON structure contained by the specified <see cref="T:System.IO.TextReader"/>
             into an instance of the specified type.
             </summary>
             <param name="reader">The <see cref="T:System.IO.TextReader"/> containing the object.</param>
@@ -3328,7 +3356,7 @@
             <summary>
             Gets or sets the maximum depth allowed when reading JSON. Reading past this depth will throw a <see cref="T:Newtonsoft.Json.JsonReaderException"/>.
             A null value means there is no maximum.
-            The default value is <c>null</c>.
+            The default value is <c>64</c>.
             </summary>
         </member>
         <member name="P:Newtonsoft.Json.JsonSerializerSettings.Formatting">
@@ -3395,6 +3423,12 @@
             Initializes a new instance of the <see cref="T:Newtonsoft.Json.JsonSerializerSettings"/> class.
             </summary>
         </member>
+        <member name="M:Newtonsoft.Json.JsonSerializerSettings.#ctor(Newtonsoft.Json.JsonSerializerSettings)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.JsonSerializerSettings"/> class
+            using values copied from the passed in <see cref="T:Newtonsoft.Json.JsonSerializerSettings"/>.
+            </summary>
+        </member>
         <member name="T:Newtonsoft.Json.JsonTextReader">
             <summary>
             Represents a reader that provides fast, non-cached, forward-only access to JSON text data.
@@ -7029,6 +7063,25 @@
             <param name="reader">The reader.</param>
             <returns>An instance of <see cref="T:Newtonsoft.Json.Linq.JRaw"/> with the content of the reader's current token.</returns>
         </member>
+        <member name="T:Newtonsoft.Json.Linq.JsonCloneSettings">
+            <summary>
+            Specifies the settings used when cloning JSON.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Linq.JsonCloneSettings.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Linq.JsonCloneSettings"/> class.
+            </summary>
+        </member>
+        <member name="P:Newtonsoft.Json.Linq.JsonCloneSettings.CopyAnnotations">
+            <summary>
+            Gets or sets a flag that indicates whether to copy annotations when cloning a <see cref="T:Newtonsoft.Json.Linq.JToken"/>.
+            The default value is <c>true</c>.
+            </summary>
+            <value>
+            A flag that indicates whether to copy annotations when cloning a <see cref="T:Newtonsoft.Json.Linq.JToken"/>.
+            </value>
+        </member>
         <member name="T:Newtonsoft.Json.Linq.JsonLoadSettings">
             <summary>
             Specifies the settings used when loading JSON.
@@ -7090,6 +7143,27 @@
             </summary>
             <value>The comparison used to match property names while merging.</value>
         </member>
+        <member name="T:Newtonsoft.Json.Linq.JsonSelectSettings">
+            <summary>
+            Specifies the settings used when selecting JSON.
+            </summary>
+        </member>
+        <member name="P:Newtonsoft.Json.Linq.JsonSelectSettings.RegexMatchTimeout">
+            <summary>
+            Gets or sets a timeout that will be used when executing regular expressions.
+            </summary>
+            <value>The timeout that will be used when executing regular expressions.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Linq.JsonSelectSettings.ErrorWhenNoMatch">
+            <summary>
+            Gets or sets a flag that indicates whether an error should be thrown if
+            no tokens are found when evaluating part of the expression.
+            </summary>
+            <value>
+            A flag that indicates whether an error should be thrown if
+            no tokens are found when evaluating part of the expression.
+            </value>
+        </member>
         <member name="T:Newtonsoft.Json.Linq.JToken">
             <summary>
             Represents an abstract JSON token.
@@ -7331,6 +7405,10 @@
             <summary>
             Returns the indented JSON for this token.
             </summary>
+            <remarks>
+            <c>ToString()</c> returns a non-JSON string value for tokens with a type of <see cref="F:Newtonsoft.Json.Linq.JTokenType.String"/>.
+            If you want the JSON for all token types then you should use <see cref="M:Newtonsoft.Json.Linq.JToken.WriteTo(Newtonsoft.Json.JsonWriter,Newtonsoft.Json.JsonConverter[])"/>.
+            </remarks>
             <returns>
             The indented JSON for this token.
             </returns>
@@ -7964,42 +8042,62 @@
         </member>
         <member name="M:Newtonsoft.Json.Linq.JToken.SelectToken(System.String)">
             <summary>
-            Selects a <see cref="T:Newtonsoft.Json.Linq.JToken"/> using a JPath expression. Selects the token that matches the object path.
+            Selects a <see cref="T:Newtonsoft.Json.Linq.JToken"/> using a JSONPath expression. Selects the token that matches the object path.
             </summary>
             <param name="path">
-            A <see cref="T:System.String"/> that contains a JPath expression.
+            A <see cref="T:System.String"/> that contains a JSONPath expression.
             </param>
             <returns>A <see cref="T:Newtonsoft.Json.Linq.JToken"/>, or <c>null</c>.</returns>
         </member>
         <member name="M:Newtonsoft.Json.Linq.JToken.SelectToken(System.String,System.Boolean)">
             <summary>
-            Selects a <see cref="T:Newtonsoft.Json.Linq.JToken"/> using a JPath expression. Selects the token that matches the object path.
+            Selects a <see cref="T:Newtonsoft.Json.Linq.JToken"/> using a JSONPath expression. Selects the token that matches the object path.
             </summary>
             <param name="path">
-            A <see cref="T:System.String"/> that contains a JPath expression.
+            A <see cref="T:System.String"/> that contains a JSONPath expression.
             </param>
             <param name="errorWhenNoMatch">A flag to indicate whether an error should be thrown if no tokens are found when evaluating part of the expression.</param>
             <returns>A <see cref="T:Newtonsoft.Json.Linq.JToken"/>.</returns>
         </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.SelectToken(System.String,Newtonsoft.Json.Linq.JsonSelectSettings)">
+            <summary>
+            Selects a <see cref="T:Newtonsoft.Json.Linq.JToken"/> using a JSONPath expression. Selects the token that matches the object path.
+            </summary>
+            <param name="path">
+            A <see cref="T:System.String"/> that contains a JSONPath expression.
+            </param>
+            <param name="settings">The <see cref="T:Newtonsoft.Json.Linq.JsonSelectSettings"/> used to select tokens.</param>
+            <returns>A <see cref="T:Newtonsoft.Json.Linq.JToken"/>.</returns>
+        </member>
         <member name="M:Newtonsoft.Json.Linq.JToken.SelectTokens(System.String)">
             <summary>
-            Selects a collection of elements using a JPath expression.
+            Selects a collection of elements using a JSONPath expression.
             </summary>
             <param name="path">
-            A <see cref="T:System.String"/> that contains a JPath expression.
+            A <see cref="T:System.String"/> that contains a JSONPath expression.
             </param>
             <returns>An <see cref="T:System.Collections.Generic.IEnumerable`1"/> of <see cref="T:Newtonsoft.Json.Linq.JToken"/> that contains the selected elements.</returns>
         </member>
         <member name="M:Newtonsoft.Json.Linq.JToken.SelectTokens(System.String,System.Boolean)">
             <summary>
-            Selects a collection of elements using a JPath expression.
+            Selects a collection of elements using a JSONPath expression.
             </summary>
             <param name="path">
-            A <see cref="T:System.String"/> that contains a JPath expression.
+            A <see cref="T:System.String"/> that contains a JSONPath expression.
             </param>
             <param name="errorWhenNoMatch">A flag to indicate whether an error should be thrown if no tokens are found when evaluating part of the expression.</param>
             <returns>An <see cref="T:System.Collections.Generic.IEnumerable`1"/> of <see cref="T:Newtonsoft.Json.Linq.JToken"/> that contains the selected elements.</returns>
         </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.SelectTokens(System.String,Newtonsoft.Json.Linq.JsonSelectSettings)">
+            <summary>
+            Selects a collection of elements using a JSONPath expression.
+            </summary>
+            <param name="path">
+            A <see cref="T:System.String"/> that contains a JSONPath expression.
+            </param>
+            <param name="settings">The <see cref="T:Newtonsoft.Json.Linq.JsonSelectSettings"/> used to select tokens.</param>
+            <returns>An <see cref="T:System.Collections.Generic.IEnumerable`1"/> of <see cref="T:Newtonsoft.Json.Linq.JToken"/> that contains the selected elements.</returns>
+        </member>
         <member name="M:Newtonsoft.Json.Linq.JToken.GetMetaObject(System.Linq.Expressions.Expression)">
             <summary>
             Returns the <see cref="T:System.Dynamic.DynamicMetaObject"/> responsible for binding operations performed on this object.
@@ -8024,6 +8122,13 @@
             </summary>
             <returns>A new instance of the <see cref="T:Newtonsoft.Json.Linq.JToken"/>.</returns>
         </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.DeepClone(Newtonsoft.Json.Linq.JsonCloneSettings)">
+            <summary>
+            Creates a new instance of the <see cref="T:Newtonsoft.Json.Linq.JToken"/>. All child tokens are recursively cloned.
+            </summary>
+            <param name="settings">A <see cref="T:Newtonsoft.Json.Linq.JsonCloneSettings"/> object to configure cloning settings.</param>
+            <returns>A new instance of the <see cref="T:Newtonsoft.Json.Linq.JToken"/>.</returns>
+        </member>
         <member name="M:Newtonsoft.Json.Linq.JToken.AddAnnotation(System.Object)">
             <summary>
             Adds an object to the annotation list of this <see cref="T:Newtonsoft.Json.Linq.JToken"/>.
@@ -8629,6 +8734,10 @@
             <summary>
             Returns a <see cref="T:System.String"/> that represents this instance.
             </summary>
+            <remarks>
+            <c>ToString()</c> returns a non-JSON string value for tokens with a type of <see cref="F:Newtonsoft.Json.Linq.JTokenType.String"/>.
+            If you want the JSON for all token types then you should use <see cref="M:Newtonsoft.Json.Linq.JValue.WriteTo(Newtonsoft.Json.JsonWriter,Newtonsoft.Json.JsonConverter[])"/>.
+            </remarks>
             <returns>
             A <see cref="T:System.String"/> that represents this instance.
             </returns>
@@ -10695,6 +10804,50 @@
             <param name="args">Optional arguments to pass to an initializing constructor of the JsonConverter.
             If <c>null</c>, the default constructor is used.</param>
         </member>
+        <member name="T:Newtonsoft.Json.Serialization.KebabCaseNamingStrategy">
+            <summary>
+            A kebab case naming strategy.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Serialization.KebabCaseNamingStrategy.#ctor(System.Boolean,System.Boolean)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Serialization.KebabCaseNamingStrategy"/> class.
+            </summary>
+            <param name="processDictionaryKeys">
+            A flag indicating whether dictionary keys should be processed.
+            </param>
+            <param name="overrideSpecifiedNames">
+            A flag indicating whether explicitly specified property names should be processed,
+            e.g. a property name customized with a <see cref="T:Newtonsoft.Json.JsonPropertyAttribute"/>.
+            </param>
+        </member>
+        <member name="M:Newtonsoft.Json.Serialization.KebabCaseNamingStrategy.#ctor(System.Boolean,System.Boolean,System.Boolean)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Serialization.KebabCaseNamingStrategy"/> class.
+            </summary>
+            <param name="processDictionaryKeys">
+            A flag indicating whether dictionary keys should be processed.
+            </param>
+            <param name="overrideSpecifiedNames">
+            A flag indicating whether explicitly specified property names should be processed,
+            e.g. a property name customized with a <see cref="T:Newtonsoft.Json.JsonPropertyAttribute"/>.
+            </param>
+            <param name="processExtensionDataNames">
+            A flag indicating whether extension data names should be processed.
+            </param>
+        </member>
+        <member name="M:Newtonsoft.Json.Serialization.KebabCaseNamingStrategy.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Newtonsoft.Json.Serialization.KebabCaseNamingStrategy"/> class.
+            </summary>
+        </member>
+        <member name="M:Newtonsoft.Json.Serialization.KebabCaseNamingStrategy.ResolvePropertyName(System.String)">
+            <summary>
+            Resolves the specified property name.
+            </summary>
+            <param name="name">The property name to resolve.</param>
+            <returns>The resolved property name.</returns>
+        </member>
         <member name="T:Newtonsoft.Json.Serialization.MemoryTraceWriter">
             <summary>
             Represents a trace writer that writes to memory. When the trace message limit is
@@ -11168,5 +11321,43 @@
             A <see cref="T:Newtonsoft.Json.JsonWriter"/> write method has not been called.
             </summary>
         </member>
+        <member name="T:System.Diagnostics.CodeAnalysis.NotNullAttribute">
+            <summary>Specifies that an output will not be null even if the corresponding type allows it.</summary>
+        </member>
+        <member name="T:System.Diagnostics.CodeAnalysis.NotNullWhenAttribute">
+            <summary>Specifies that when a method returns <see cref="P:System.Diagnostics.CodeAnalysis.NotNullWhenAttribute.ReturnValue"/>, the parameter will not be null even if the corresponding type allows it.</summary>
+        </member>
+        <member name="M:System.Diagnostics.CodeAnalysis.NotNullWhenAttribute.#ctor(System.Boolean)">
+            <summary>Initializes the attribute with the specified return value condition.</summary>
+            <param name="returnValue">
+            The return value condition. If the method returns this value, the associated parameter will not be null.
+            </param>
+        </member>
+        <member name="P:System.Diagnostics.CodeAnalysis.NotNullWhenAttribute.ReturnValue">
+            <summary>Gets the return value condition.</summary>
+        </member>
+        <member name="T:System.Diagnostics.CodeAnalysis.MaybeNullAttribute">
+            <summary>Specifies that an output may be null even if the corresponding type disallows it.</summary>
+        </member>
+        <member name="T:System.Diagnostics.CodeAnalysis.AllowNullAttribute">
+            <summary>Specifies that null is allowed as an input even if the corresponding type disallows it.</summary>
+        </member>
+        <member name="T:System.Diagnostics.CodeAnalysis.DoesNotReturnIfAttribute">
+            <summary>
+            Specifies that the method will not return if the associated Boolean parameter is passed the specified value.
+            </summary>
+        </member>
+        <member name="M:System.Diagnostics.CodeAnalysis.DoesNotReturnIfAttribute.#ctor(System.Boolean)">
+            <summary>
+            Initializes a new instance of the <see cref="T:System.Diagnostics.CodeAnalysis.DoesNotReturnIfAttribute"/> class.
+            </summary>
+            <param name="parameterValue">
+            The condition parameter value. Code after the method will be considered unreachable by diagnostics if the argument to
+            the associated parameter matches this value.
+            </param>
+        </member>
+        <member name="P:System.Diagnostics.CodeAnalysis.DoesNotReturnIfAttribute.ParameterValue">
+            <summary>Gets the condition parameter value.</summary>
+        </member>
     </members>
 </doc>

LHY-WD-BC_MES/obj/Debug/监测软件.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-0f0e66390801a2feb8e173b005c9c12a04846654477b932fb6562c927f7c5476
+b4c37bc5cefc3074d723a2bf323d55eea156980d

LHY-WD-BC_MES/obj/Debug/监测软件.csproj.FileListAbsolute.txt

@@ -973,3 +973,42 @@ C:\Users\Public\Music\新建文件夹\药环压制设备线体外数据监控系
 C:\Users\Public\Music\新建文件夹\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\bin\Debug\NPOI.OpenXml4Net.dll
 C:\Users\Public\Music\新建文件夹\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\bin\Debug\NPOI.OpenXmlFormats.dll
 C:\Users\Public\Music\新建文件夹\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\bin\Debug\BaseLib.pdb
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\bin\Debug\药环压制设备线体外数据监控系统.exe.config
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\bin\Debug\药环压制设备线体外数据监控系统.exe
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\bin\Debug\药环压制设备线体外数据监控系统.pdb
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\bin\Debug\Newtonsoft.Json.dll
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\bin\Debug\SunnyUI.Common.dll
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\bin\Debug\SunnyUI.dll
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\bin\Debug\ThoughtWorks.QRCode.dll
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\bin\Debug\ICSharpCode.SharpZipLib.dll
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\bin\Debug\NPOI.dll
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\bin\Debug\MySql.Data.dll
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\bin\Debug\NPOI.OOXML.dll
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\bin\Debug\NPOI.OpenXml4Net.dll
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\bin\Debug\NPOI.OpenXmlFormats.dll
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\bin\Debug\BaseLib.pdb
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\bin\Debug\Newtonsoft.Json.xml
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\obj\Debug\监测软件.csproj.AssemblyReference.cache
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\obj\Debug\HRT_Measure.FrmMain.resources
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\obj\Debug\HRT_Measure.Properties.Resources.resources
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\obj\Debug\HRT_Measure.FrmFirstWindow.resources
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\obj\Debug\HRT_Measure.FrmPLC_M04M05.resources
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\obj\Debug\HRT_Measure.FrmPLC_M03.resources
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\obj\Debug\HRT_Measure.FrmPressure.resources
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\obj\Debug\HRT_Measure.Windows.FrmWeight.resources
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\obj\Debug\HRT_Measure.UCAxis.resources
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\obj\Debug\HRT_Measure.UCAxisPos.resources
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\obj\Debug\HRT_Measure.UCCylinder.resources
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\obj\Debug\HRT_Measure.Windows.FrmParaWrite.resources
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\obj\Debug\HRT_Measure.UCHMI.resources
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\obj\Debug\HRT_Measure.UCProduct.resources
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\obj\Debug\HRT_Measure.FrmAddMaterial.resources
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\obj\Debug\HRT_Measure.FrmCommunication.resources
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\obj\Debug\HRT_Measure.FrmLogin.resources
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\obj\Debug\HRT_Measure.FrmPLC_M01M02.resources
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\obj\Debug\HRT_Measure.FrmProjectConfig.resources
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\obj\Debug\监测软件.csproj.GenerateResource.cache
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\obj\Debug\监测软件.csproj.CoreCompileInputs.cache
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\obj\Debug\监测软件.csproj.CopyComplete
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\obj\Debug\药环压制设备线体外数据监控系统.exe
+C:\Users\hero\Desktop\药环压制设备线体外数据监控系统-V10.10 - 副本\药环压制设备线体外数据监控系统-V10.10\LHY-WD-BC_MES\obj\Debug\药环压制设备线体外数据监控系统.pdb