修改冲突

UAS_MES_HYSX/FunctionCode/Make/Make_ListenSocket.Designer.cs

@@ -28,89 +28,270 @@
         /// </summary>
         private void InitializeComponent()
         {
+            this.ContainerBox = new System.Windows.Forms.Panel();
             this.OperatResult = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
+            this.SettingBox = new System.Windows.Forms.Panel();
+            this.Connet = new System.Windows.Forms.Button();
             this.Start = new System.Windows.Forms.Button();
-            this.statusLab = new System.Windows.Forms.Label();
+            this.IpPort = new System.Windows.Forms.TextBox();
+            this.IpPortLab = new System.Windows.Forms.Label();
+            this.SNDetails = new UAS_MES_NEW.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+            this.productName = new System.Windows.Forms.Label();
+            this.productCode = new System.Windows.Forms.Label();
+            this.workOrder = new System.Windows.Forms.Label();
+            this.label4 = new System.Windows.Forms.Label();
+            this.label1 = new System.Windows.Forms.Label();
+            this.label3 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.serialNumber = new System.Windows.Forms.Label();
+            this.ContainerBox.SuspendLayout();
+            this.SettingBox.SuspendLayout();
+            this.SNDetails.SuspendLayout();
             this.tableLayoutPanel1.SuspendLayout();
             this.SuspendLayout();
             // 
+            // ContainerBox
+            // 
+            this.ContainerBox.Controls.Add(this.OperatResult);
+            this.ContainerBox.Controls.Add(this.SettingBox);
+            this.ContainerBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.ContainerBox.Location = new System.Drawing.Point(0, 123);
+            this.ContainerBox.Name = "ContainerBox";
+            this.ContainerBox.Size = new System.Drawing.Size(1600, 777);
+            this.ContainerBox.TabIndex = 97;
+            // 
             // OperatResult
             // 
-            this.OperatResult.Dock = System.Windows.Forms.DockStyle.Top;
+            this.OperatResult.Dock = System.Windows.Forms.DockStyle.Fill;
             this.OperatResult.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperatResult.Location = new System.Drawing.Point(0, 0);
+            this.OperatResult.Location = new System.Drawing.Point(0, 194);
             this.OperatResult.Margin = new System.Windows.Forms.Padding(4);
             this.OperatResult.Name = "OperatResult";
-            this.OperatResult.Size = new System.Drawing.Size(1600, 735);
+            this.OperatResult.Size = new System.Drawing.Size(1600, 583);
             this.OperatResult.TabIndex = 91;
             this.OperatResult.Text = "";
             // 
+            // SettingBox
+            // 
+            this.SettingBox.Controls.Add(this.Connet);
+            this.SettingBox.Controls.Add(this.Start);
+            this.SettingBox.Controls.Add(this.IpPort);
+            this.SettingBox.Controls.Add(this.IpPortLab);
+            this.SettingBox.Dock = System.Windows.Forms.DockStyle.Top;
+            this.SettingBox.Location = new System.Drawing.Point(0, 0);
+            this.SettingBox.Name = "SettingBox";
+            this.SettingBox.Size = new System.Drawing.Size(1600, 194);
+            this.SettingBox.TabIndex = 96;
+            // 
+            // Connet
+            // 
+            this.Connet.Anchor = System.Windows.Forms.AnchorStyles.None;
+            this.Connet.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.Connet.Location = new System.Drawing.Point(161, 119);
+            this.Connet.Name = "Connet";
+            this.Connet.Size = new System.Drawing.Size(144, 43);
+            this.Connet.TabIndex = 93;
+            this.Connet.Text = "开启连接";
+            this.Connet.UseVisualStyleBackColor = true;
+            this.Connet.Visible = false;
+            this.Connet.Click += new System.EventHandler(this.Connet_Click);
+            // 
             // Start
             // 
             this.Start.Anchor = System.Windows.Forms.AnchorStyles.None;
             this.Start.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.Start.Location = new System.Drawing.Point(671, 75);
+            this.Start.Location = new System.Drawing.Point(394, 119);
             this.Start.Name = "Start";
-            this.Start.Size = new System.Drawing.Size(258, 57);
+            this.Start.Size = new System.Drawing.Size(144, 43);
             this.Start.TabIndex = 92;
             this.Start.Text = "开启监听";
             this.Start.UseVisualStyleBackColor = true;
             this.Start.Click += new System.EventHandler(this.Start_Click);
             // 
-            // statusLab
+            // IpPort
+            // 
+            this.IpPort.Location = new System.Drawing.Point(161, 47);
+            this.IpPort.Name = "IpPort";
+            this.IpPort.Size = new System.Drawing.Size(309, 31);
+            this.IpPort.TabIndex = 1;
             // 
-            this.statusLab.Anchor = System.Windows.Forms.AnchorStyles.None;
-            this.statusLab.AutoSize = true;
-            this.statusLab.BackColor = System.Drawing.Color.LawnGreen;
-            this.statusLab.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.statusLab.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.statusLab.Location = new System.Drawing.Point(736, 3);
-            this.statusLab.Name = "statusLab";
-            this.statusLab.Size = new System.Drawing.Size(127, 36);
-            this.statusLab.TabIndex = 93;
-            this.statusLab.Text = "运行正常";
-            this.statusLab.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // IpPortLab
+            // 
+            this.IpPortLab.AutoSize = true;
+            this.IpPortLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.IpPortLab.Location = new System.Drawing.Point(60, 47);
+            this.IpPortLab.Name = "IpPortLab";
+            this.IpPortLab.Size = new System.Drawing.Size(117, 28);
+            this.IpPortLab.TabIndex = 0;
+            this.IpPortLab.Text = "服务地址：";
+            // 
+            // SNDetails
+            // 
+            this.SNDetails.BorderColor = System.Drawing.Color.Black;
+            this.SNDetails.Controls.Add(this.tableLayoutPanel1);
+            this.SNDetails.Dock = System.Windows.Forms.DockStyle.Top;
+            this.SNDetails.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.SNDetails.Location = new System.Drawing.Point(0, 0);
+            this.SNDetails.Name = "SNDetails";
+            this.SNDetails.Size = new System.Drawing.Size(1600, 123);
+            this.SNDetails.TabIndex = 95;
+            this.SNDetails.TabStop = false;
+            this.SNDetails.Text = "产品序列信息";
+            this.SNDetails.TextColor = System.Drawing.Color.Black;
             // 
             // tableLayoutPanel1
             // 
-            this.tableLayoutPanel1.ColumnCount = 1;
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
-            this.tableLayoutPanel1.Controls.Add(this.Start, 0, 1);
-            this.tableLayoutPanel1.Controls.Add(this.statusLab, 0, 0);
-            this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 735);
+            this.tableLayoutPanel1.ColumnCount = 8;
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.451613F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.09677F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.451613F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.09677F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.451613F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 13.19F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 6.451613F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 36.81F));
+            this.tableLayoutPanel1.Controls.Add(this.productName, 7, 0);
+            this.tableLayoutPanel1.Controls.Add(this.productCode, 5, 0);
+            this.tableLayoutPanel1.Controls.Add(this.workOrder, 3, 0);
+            this.tableLayoutPanel1.Controls.Add(this.label4, 6, 0);
+            this.tableLayoutPanel1.Controls.Add(this.label1, 0, 0);
+            this.tableLayoutPanel1.Controls.Add(this.label3, 4, 0);
+            this.tableLayoutPanel1.Controls.Add(this.label2, 2, 0);
+            this.tableLayoutPanel1.Controls.Add(this.serialNumber, 1, 0);
+            this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 37);
             this.tableLayoutPanel1.Name = "tableLayoutPanel1";
-            this.tableLayoutPanel1.RowCount = 2;
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25.45455F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 74.54546F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(1600, 165);
-            this.tableLayoutPanel1.TabIndex = 94;
+            this.tableLayoutPanel1.RowCount = 1;
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 83F));
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(1594, 83);
+            this.tableLayoutPanel1.TabIndex = 0;
+            // 
+            // productName
+            // 
+            this.productName.AutoSize = true;
+            this.productName.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.productName.Location = new System.Drawing.Point(1005, 0);
+            this.productName.Name = "productName";
+            this.productName.Size = new System.Drawing.Size(586, 83);
+            this.productName.TabIndex = 7;
+            this.productName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // productCode
+            // 
+            this.productCode.AutoSize = true;
+            this.productCode.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.productCode.Location = new System.Drawing.Point(693, 0);
+            this.productCode.Name = "productCode";
+            this.productCode.Size = new System.Drawing.Size(204, 83);
+            this.productCode.TabIndex = 6;
+            this.productCode.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // workOrder
+            // 
+            this.workOrder.AutoSize = true;
+            this.workOrder.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.workOrder.Location = new System.Drawing.Point(399, 0);
+            this.workOrder.Name = "workOrder";
+            this.workOrder.Size = new System.Drawing.Size(186, 83);
+            this.workOrder.TabIndex = 5;
+            this.workOrder.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.label4.Location = new System.Drawing.Point(903, 0);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(96, 83);
+            this.label4.TabIndex = 3;
+            this.label4.Text = "产品名称: ";
+            this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.label1.Location = new System.Drawing.Point(3, 0);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(96, 83);
+            this.label1.TabIndex = 0;
+            this.label1.Text = "序列号: ";
+            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.label3.Location = new System.Drawing.Point(591, 0);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(96, 83);
+            this.label3.TabIndex = 2;
+            this.label3.Text = "产品编号: ";
+            this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.label2.Location = new System.Drawing.Point(297, 0);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(96, 83);
+            this.label2.TabIndex = 1;
+            this.label2.Text = "工单: ";
+            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // serialNumber
+            // 
+            this.serialNumber.AutoSize = true;
+            this.serialNumber.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.serialNumber.Location = new System.Drawing.Point(105, 0);
+            this.serialNumber.Name = "serialNumber";
+            this.serialNumber.Size = new System.Drawing.Size(186, 83);
+            this.serialNumber.TabIndex = 4;
+            this.serialNumber.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             // 
             // Make_ListenSocket
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1600, 900);
-            this.Controls.Add(this.tableLayoutPanel1);
-            this.Controls.Add(this.OperatResult);
+            this.Controls.Add(this.ContainerBox);
+            this.Controls.Add(this.SNDetails);
             this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "Make_ListenSocket";
             this.Text = "Make_ListenSocket";
-            this.tableLayoutPanel1.ResumeLayout(true);
+            this.ContainerBox.ResumeLayout(false);
+            this.SettingBox.ResumeLayout(false);
+            this.SettingBox.PerformLayout();
+            this.SNDetails.ResumeLayout(false);
+            this.tableLayoutPanel1.ResumeLayout(false);
             this.tableLayoutPanel1.PerformLayout();
-            this.ResumeLayout(true);
+            this.ResumeLayout(false);
 
         }
 
         #endregion
 
         private CustomControl.RichText.RichTextAutoBottom OperatResult;
-        private System.Windows.Forms.Button Start;
-        private System.Windows.Forms.Label statusLab;
+        private CustomControl.GroupBoxWithBorder.GroupBoxWithBorder SNDetails;
+        private System.Windows.Forms.Label productName;
+        private System.Windows.Forms.Label productCode;
+        private System.Windows.Forms.Label workOrder;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.Label serialNumber;
+        private System.Windows.Forms.Panel ContainerBox;
         private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
+        private System.Windows.Forms.Button Start;
+        private System.Windows.Forms.Panel SettingBox;
+        private System.Windows.Forms.Label IpPortLab;
+        private System.Windows.Forms.TextBox IpPort;
+        private System.Windows.Forms.Button Connet;
     }
 }

UAS_MES_HYSX/FunctionCode/Make/Make_ListenSocket.cs

@@ -64,7 +64,7 @@ namespace UAS_MES_NEW.Make
                 IpPort.Enabled = false;
 
                 string msg = await client.ConnectAsync();
-                if (msg.StartsWith("NG"))
+                if (!msg.StartsWith("OK"))
                 {
                     ShowMsg(0, msg);
                 }
@@ -72,7 +72,7 @@ namespace UAS_MES_NEW.Make
 
                 string savePath = @"C:\Users\MI\Desktop\testEquiment\ReceivedFiles\received_file.txt";
                 msg = await client.ReceiveFileAsync(savePath);
-                if (msg.StartsWith("NG"))
+                if (!msg.StartsWith("OK"))
                 {
                     ShowMsg(0, msg);
                 }
@@ -122,7 +122,6 @@ namespace UAS_MES_NEW.Make
             private int serverPort;
             private bool isConnected = false;
 
-            // 事件定义
             public event Action<string, string> OnFileReceived;
             public event Action<string> OnMessageReceived;
             public event Action<string> OnConnectionStatusChanged;
@@ -217,7 +216,7 @@ namespace UAS_MES_NEW.Make
             {
                 if (!isConnected)
                 {
-                    return "未连接到服务器";
+                    return "NG,未连接到服务器";
                 }
 
                 if (!File.Exists(filePath))
@@ -267,7 +266,7 @@ namespace UAS_MES_NEW.Make
             {
                 if (!isConnected)
                 {
-                    return "未连接到服务器";
+                    return "NG,未连接到服务器";
                 }
 
                 try
@@ -328,7 +327,7 @@ namespace UAS_MES_NEW.Make
             {
                 if (!isConnected)
                 {
-                    return "未连接到服务器";
+                    return "NG,未连接到服务器";
                 }
                 try
                 {