修改登录上线工单

UAS_MES_YDCY/FunctionCode/Make/Make_Repair.cs

@@ -190,7 +190,7 @@ namespace UAS_MES_NEW.Make
                 }
                 sql.Clear();
                 sql.Append("select ms_status,ms_outboxcode,ms_paststep,ms_reworkstatus,nvl(ms_ifrework,0)ms_ifrework from makeserial left join make ");
-                sql.Append("on ms_makecode=ma_code where ms_sncode = '" + GetSNCode.Text + "' order by ms_id desc");
+                sql.Append("on ms_makecode=ma_code where ms_sncode = '" + GetSNCode.Text + "' or ms_firstsn='"+GetSNCode.Text+"' order by ms_id desc");
                 dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                 string ms_paststep = "";
                 if (dt.Rows.Count > 0)

UAS_MES_YDCY/FunctionCode/Query/Query_LoadMake.Designer.cs

@@ -30,37 +30,36 @@
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Query_LoadMake));
             this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
-            this.ma_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SearchTextBox();
             this.ms_makecode_label = new System.Windows.Forms.Label();
-            this.searchTextBox1 = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SearchTextBox();
             this.label1 = new System.Windows.Forms.Label();
-            this.UpLoadMake = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
+            this.DGV = new System.Windows.Forms.DataGridView();
+            this.mancount = new System.Windows.Forms.NumericUpDown();
+            this.label2 = new System.Windows.Forms.Label();
+            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewCheckBoxColumn1 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.DownLoadMake = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
-            this.dataGridView1 = new System.Windows.Forms.DataGridView();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
+            this.UpLoadMake = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
+            this.li_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SearchTextBox();
+            this.ma_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SearchTextBox();
+            this.ChangeMan = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
+            this.lm_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.choose = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.lm_makecode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.lm_linecode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.lm_uptime = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.lm_downtime = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.lm_inman = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.lm_mannum = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            ((System.ComponentModel.ISupportInitialize)(this.DGV)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.mancount)).BeginInit();
             this.SuspendLayout();
             // 
-            // ma_code
-            // 
-            this.ma_code.AllPower = "IFALL";
-            this.ma_code.Caller = null;
-            this.ma_code.Condition = null;
-            this.ma_code.DBTitle = "";
-            this.ma_code.Font = new System.Drawing.Font("微软雅黑", 9F);
-            this.ma_code.FormName = null;
-            this.ma_code.Location = new System.Drawing.Point(131, 15);
-            this.ma_code.Margin = new System.Windows.Forms.Padding(6);
-            this.ma_code.Name = "ma_code";
-            this.ma_code.Power = "";
-            this.ma_code.ReturnData = null;
-            this.ma_code.SelectField = null;
-            this.ma_code.SetValueField = null;
-            this.ma_code.Size = new System.Drawing.Size(282, 46);
-            this.ma_code.TabIndex = 213;
-            this.ma_code.TableName = null;
-            this.ma_code.Tag = "msl_makecode";
-            this.ma_code.TextBoxEnable = true;
-            // 
             // ms_makecode_label
             // 
             this.ms_makecode_label.AutoSize = true;
@@ -72,27 +71,6 @@
             this.ms_makecode_label.TabIndex = 212;
             this.ms_makecode_label.Text = "工单号";
             // 
-            // searchTextBox1
-            // 
-            this.searchTextBox1.AllPower = "IFALL";
-            this.searchTextBox1.Caller = null;
-            this.searchTextBox1.Condition = null;
-            this.searchTextBox1.DBTitle = "";
-            this.searchTextBox1.Font = new System.Drawing.Font("微软雅黑", 9F);
-            this.searchTextBox1.FormName = null;
-            this.searchTextBox1.Location = new System.Drawing.Point(565, 15);
-            this.searchTextBox1.Margin = new System.Windows.Forms.Padding(6);
-            this.searchTextBox1.Name = "searchTextBox1";
-            this.searchTextBox1.Power = "";
-            this.searchTextBox1.ReturnData = null;
-            this.searchTextBox1.SelectField = null;
-            this.searchTextBox1.SetValueField = null;
-            this.searchTextBox1.Size = new System.Drawing.Size(282, 46);
-            this.searchTextBox1.TabIndex = 215;
-            this.searchTextBox1.TableName = null;
-            this.searchTextBox1.Tag = "msl_makecode";
-            this.searchTextBox1.TextBoxEnable = true;
-            // 
             // label1
             // 
             this.label1.AutoSize = true;
@@ -104,24 +82,106 @@
             this.label1.TabIndex = 214;
             this.label1.Text = "线别";
             // 
-            // UpLoadMake
+            // DGV
             // 
-            this.UpLoadMake.AllPower = null;
-            this.UpLoadMake.BackColor = System.Drawing.Color.Transparent;
-            this.UpLoadMake.DownImage = ((System.Drawing.Image)(resources.GetObject("UpLoadMake.DownImage")));
-            this.UpLoadMake.Image = null;
-            this.UpLoadMake.IsShowBorder = true;
-            this.UpLoadMake.Location = new System.Drawing.Point(902, 11);
-            this.UpLoadMake.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.UpLoadMake.MoveImage = ((System.Drawing.Image)(resources.GetObject("UpLoadMake.MoveImage")));
-            this.UpLoadMake.Name = "UpLoadMake";
-            this.UpLoadMake.NormalImage = ((System.Drawing.Image)(resources.GetObject("UpLoadMake.NormalImage")));
-            this.UpLoadMake.Power = null;
-            this.UpLoadMake.Size = new System.Drawing.Size(112, 45);
-            this.UpLoadMake.TabIndex = 216;
-            this.UpLoadMake.Text = "上线";
-            this.UpLoadMake.UseVisualStyleBackColor = false;
-            this.UpLoadMake.Click += new System.EventHandler(this.UpLoadMake_Click);
+            this.DGV.AllowUserToAddRows = false;
+            this.DGV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.DGV.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.lm_id,
+            this.choose,
+            this.lm_makecode,
+            this.lm_linecode,
+            this.lm_uptime,
+            this.lm_downtime,
+            this.lm_inman,
+            this.lm_mannum});
+            this.DGV.Location = new System.Drawing.Point(26, 79);
+            this.DGV.Name = "DGV";
+            this.DGV.RowHeadersWidth = 82;
+            this.DGV.RowTemplate.Height = 37;
+            this.DGV.Size = new System.Drawing.Size(1922, 971);
+            this.DGV.TabIndex = 218;
+            // 
+            // mancount
+            // 
+            this.mancount.Location = new System.Drawing.Point(976, 19);
+            this.mancount.Name = "mancount";
+            this.mancount.Size = new System.Drawing.Size(120, 35);
+            this.mancount.TabIndex = 219;
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label2.Location = new System.Drawing.Point(873, 15);
+            this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(82, 41);
+            this.label2.TabIndex = 220;
+            this.label2.Text = "人数";
+            // 
+            // dataGridViewTextBoxColumn1
+            // 
+            this.dataGridViewTextBoxColumn1.DataPropertyName = "lm_id";
+            this.dataGridViewTextBoxColumn1.HeaderText = "ID";
+            this.dataGridViewTextBoxColumn1.MinimumWidth = 10;
+            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
+            this.dataGridViewTextBoxColumn1.Width = 10;
+            // 
+            // dataGridViewCheckBoxColumn1
+            // 
+            this.dataGridViewCheckBoxColumn1.HeaderText = "勾选";
+            this.dataGridViewCheckBoxColumn1.MinimumWidth = 10;
+            this.dataGridViewCheckBoxColumn1.Name = "dataGridViewCheckBoxColumn1";
+            this.dataGridViewCheckBoxColumn1.Width = 200;
+            // 
+            // dataGridViewTextBoxColumn2
+            // 
+            this.dataGridViewTextBoxColumn2.DataPropertyName = "lm_makecode";
+            this.dataGridViewTextBoxColumn2.HeaderText = "工单号";
+            this.dataGridViewTextBoxColumn2.MinimumWidth = 10;
+            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
+            this.dataGridViewTextBoxColumn2.Width = 200;
+            // 
+            // dataGridViewTextBoxColumn3
+            // 
+            this.dataGridViewTextBoxColumn3.DataPropertyName = "lm_linecode";
+            this.dataGridViewTextBoxColumn3.HeaderText = "线别";
+            this.dataGridViewTextBoxColumn3.MinimumWidth = 10;
+            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
+            this.dataGridViewTextBoxColumn3.Width = 200;
+            // 
+            // dataGridViewTextBoxColumn4
+            // 
+            this.dataGridViewTextBoxColumn4.DataPropertyName = "lm_uptime";
+            this.dataGridViewTextBoxColumn4.HeaderText = "上线时间";
+            this.dataGridViewTextBoxColumn4.MinimumWidth = 10;
+            this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
+            this.dataGridViewTextBoxColumn4.Width = 200;
+            // 
+            // dataGridViewTextBoxColumn5
+            // 
+            this.dataGridViewTextBoxColumn5.DataPropertyName = "lm_downtime";
+            this.dataGridViewTextBoxColumn5.HeaderText = "下线时间";
+            this.dataGridViewTextBoxColumn5.MinimumWidth = 10;
+            this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
+            this.dataGridViewTextBoxColumn5.Width = 200;
+            // 
+            // dataGridViewTextBoxColumn6
+            // 
+            this.dataGridViewTextBoxColumn6.DataPropertyName = "lm_inman";
+            this.dataGridViewTextBoxColumn6.HeaderText = "录入人";
+            this.dataGridViewTextBoxColumn6.MinimumWidth = 10;
+            this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
+            this.dataGridViewTextBoxColumn6.Width = 200;
+            // 
+            // dataGridViewTextBoxColumn7
+            // 
+            this.dataGridViewTextBoxColumn7.DataPropertyName = "lm_mannum";
+            this.dataGridViewTextBoxColumn7.HeaderText = "拉线人数";
+            this.dataGridViewTextBoxColumn7.MinimumWidth = 10;
+            this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
+            this.dataGridViewTextBoxColumn7.Width = 200;
             // 
             // DownLoadMake
             // 
@@ -130,7 +190,7 @@
             this.DownLoadMake.DownImage = ((System.Drawing.Image)(resources.GetObject("DownLoadMake.DownImage")));
             this.DownLoadMake.Image = null;
             this.DownLoadMake.IsShowBorder = true;
-            this.DownLoadMake.Location = new System.Drawing.Point(1060, 11);
+            this.DownLoadMake.Location = new System.Drawing.Point(1331, 11);
             this.DownLoadMake.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.DownLoadMake.MoveImage = ((System.Drawing.Image)(resources.GetObject("DownLoadMake.MoveImage")));
             this.DownLoadMake.Name = "DownLoadMake";
@@ -142,25 +202,168 @@
             this.DownLoadMake.UseVisualStyleBackColor = false;
             this.DownLoadMake.Click += new System.EventHandler(this.DownLoadMake_Click);
             // 
-            // dataGridView1
+            // UpLoadMake
+            // 
+            this.UpLoadMake.AllPower = null;
+            this.UpLoadMake.BackColor = System.Drawing.Color.Transparent;
+            this.UpLoadMake.DownImage = ((System.Drawing.Image)(resources.GetObject("UpLoadMake.DownImage")));
+            this.UpLoadMake.Image = null;
+            this.UpLoadMake.IsShowBorder = true;
+            this.UpLoadMake.Location = new System.Drawing.Point(1173, 11);
+            this.UpLoadMake.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.UpLoadMake.MoveImage = ((System.Drawing.Image)(resources.GetObject("UpLoadMake.MoveImage")));
+            this.UpLoadMake.Name = "UpLoadMake";
+            this.UpLoadMake.NormalImage = ((System.Drawing.Image)(resources.GetObject("UpLoadMake.NormalImage")));
+            this.UpLoadMake.Power = null;
+            this.UpLoadMake.Size = new System.Drawing.Size(112, 45);
+            this.UpLoadMake.TabIndex = 216;
+            this.UpLoadMake.Text = "上线";
+            this.UpLoadMake.UseVisualStyleBackColor = false;
+            this.UpLoadMake.Click += new System.EventHandler(this.UpLoadMake_Click);
+            // 
+            // li_code
+            // 
+            this.li_code.AllPower = "IFALL";
+            this.li_code.Caller = null;
+            this.li_code.Condition = null;
+            this.li_code.DBTitle = "";
+            this.li_code.Font = new System.Drawing.Font("微软雅黑", 9F);
+            this.li_code.FormName = null;
+            this.li_code.Location = new System.Drawing.Point(565, 15);
+            this.li_code.Margin = new System.Windows.Forms.Padding(6);
+            this.li_code.Name = "li_code";
+            this.li_code.Power = "";
+            this.li_code.ReturnData = null;
+            this.li_code.SelectField = null;
+            this.li_code.SetValueField = null;
+            this.li_code.Size = new System.Drawing.Size(282, 46);
+            this.li_code.TabIndex = 215;
+            this.li_code.TableName = null;
+            this.li_code.Tag = "msl_makecode";
+            this.li_code.TextBoxEnable = true;
+            // 
+            // ma_code
+            // 
+            this.ma_code.AllPower = "IFALL";
+            this.ma_code.Caller = null;
+            this.ma_code.Condition = null;
+            this.ma_code.DBTitle = "";
+            this.ma_code.Font = new System.Drawing.Font("微软雅黑", 9F);
+            this.ma_code.FormName = null;
+            this.ma_code.Location = new System.Drawing.Point(131, 15);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(6);
+            this.ma_code.Name = "ma_code";
+            this.ma_code.Power = "";
+            this.ma_code.ReturnData = null;
+            this.ma_code.SelectField = null;
+            this.ma_code.SetValueField = null;
+            this.ma_code.Size = new System.Drawing.Size(282, 46);
+            this.ma_code.TabIndex = 213;
+            this.ma_code.TableName = null;
+            this.ma_code.Tag = "msl_makecode";
+            this.ma_code.TextBoxEnable = true;
+            // 
+            // ChangeMan
+            // 
+            this.ChangeMan.AllPower = null;
+            this.ChangeMan.BackColor = System.Drawing.Color.Transparent;
+            this.ChangeMan.DownImage = ((System.Drawing.Image)(resources.GetObject("ChangeMan.DownImage")));
+            this.ChangeMan.Image = null;
+            this.ChangeMan.IsShowBorder = true;
+            this.ChangeMan.Location = new System.Drawing.Point(1492, 11);
+            this.ChangeMan.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.ChangeMan.MoveImage = ((System.Drawing.Image)(resources.GetObject("ChangeMan.MoveImage")));
+            this.ChangeMan.Name = "ChangeMan";
+            this.ChangeMan.NormalImage = ((System.Drawing.Image)(resources.GetObject("ChangeMan.NormalImage")));
+            this.ChangeMan.Power = null;
+            this.ChangeMan.Size = new System.Drawing.Size(112, 45);
+            this.ChangeMan.TabIndex = 221;
+            this.ChangeMan.Text = "修改人数";
+            this.ChangeMan.UseVisualStyleBackColor = false;
+            this.ChangeMan.Click += new System.EventHandler(this.ChangeMan_Click);
+            // 
+            // lm_id
+            // 
+            this.lm_id.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.lm_id.DataPropertyName = "lm_id";
+            this.lm_id.HeaderText = "ID";
+            this.lm_id.MinimumWidth = 10;
+            this.lm_id.Name = "lm_id";
+            this.lm_id.Visible = false;
+            this.lm_id.Width = 10;
+            // 
+            // choose
+            // 
+            this.choose.HeaderText = "勾选";
+            this.choose.MinimumWidth = 10;
+            this.choose.Name = "choose";
+            this.choose.Width = 80;
+            // 
+            // lm_makecode
+            // 
+            this.lm_makecode.DataPropertyName = "lm_makecode";
+            this.lm_makecode.HeaderText = "工单号";
+            this.lm_makecode.MinimumWidth = 10;
+            this.lm_makecode.Name = "lm_makecode";
+            this.lm_makecode.ReadOnly = true;
+            this.lm_makecode.Width = 150;
+            // 
+            // lm_linecode
+            // 
+            this.lm_linecode.DataPropertyName = "lm_linecode";
+            this.lm_linecode.HeaderText = "线别";
+            this.lm_linecode.MinimumWidth = 10;
+            this.lm_linecode.Name = "lm_linecode";
+            this.lm_linecode.ReadOnly = true;
+            this.lm_linecode.Width = 200;
+            // 
+            // lm_uptime
+            // 
+            this.lm_uptime.DataPropertyName = "lm_uptime";
+            this.lm_uptime.HeaderText = "上线时间";
+            this.lm_uptime.MinimumWidth = 10;
+            this.lm_uptime.Name = "lm_uptime";
+            this.lm_uptime.ReadOnly = true;
+            this.lm_uptime.Width = 200;
+            // 
+            // lm_downtime
+            // 
+            this.lm_downtime.DataPropertyName = "lm_downtime";
+            this.lm_downtime.HeaderText = "下线时间";
+            this.lm_downtime.MinimumWidth = 10;
+            this.lm_downtime.Name = "lm_downtime";
+            this.lm_downtime.ReadOnly = true;
+            this.lm_downtime.Width = 200;
+            // 
+            // lm_inman
+            // 
+            this.lm_inman.DataPropertyName = "lm_inman";
+            this.lm_inman.HeaderText = "录入人";
+            this.lm_inman.MinimumWidth = 10;
+            this.lm_inman.Name = "lm_inman";
+            this.lm_inman.ReadOnly = true;
+            this.lm_inman.Width = 80;
+            // 
+            // lm_mannum
             // 
-            this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dataGridView1.Location = new System.Drawing.Point(26, 79);
-            this.dataGridView1.Name = "dataGridView1";
-            this.dataGridView1.RowHeadersWidth = 82;
-            this.dataGridView1.RowTemplate.Height = 37;
-            this.dataGridView1.Size = new System.Drawing.Size(1437, 971);
-            this.dataGridView1.TabIndex = 218;
+            this.lm_mannum.DataPropertyName = "lm_mannum";
+            this.lm_mannum.HeaderText = "拉线人数";
+            this.lm_mannum.MinimumWidth = 10;
+            this.lm_mannum.Name = "lm_mannum";
+            this.lm_mannum.Width = 80;
             // 
             // Query_LoadMake
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1494, 1075);
-            this.Controls.Add(this.dataGridView1);
+            this.ClientSize = new System.Drawing.Size(1960, 1075);
+            this.Controls.Add(this.ChangeMan);
+            this.Controls.Add(this.label2);
+            this.Controls.Add(this.mancount);
+            this.Controls.Add(this.DGV);
             this.Controls.Add(this.DownLoadMake);
             this.Controls.Add(this.UpLoadMake);
-            this.Controls.Add(this.searchTextBox1);
+            this.Controls.Add(this.li_code);
             this.Controls.Add(this.label1);
             this.Controls.Add(this.ma_code);
             this.Controls.Add(this.ms_makecode_label);
@@ -170,7 +373,8 @@
             this.Tag = "Query!SpecialReport";
             this.Text = "Query_SpecialReport";
             this.Load += new System.EventHandler(this.Query_LoadMake_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.DGV)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.mancount)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -180,10 +384,29 @@
         private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1;
         private CustomControl.TextBoxWithIcon.SearchTextBox ma_code;
         private System.Windows.Forms.Label ms_makecode_label;
-        private CustomControl.TextBoxWithIcon.SearchTextBox searchTextBox1;
+        private CustomControl.TextBoxWithIcon.SearchTextBox li_code;
         private System.Windows.Forms.Label label1;
         private CustomControl.ButtonUtil.NormalButton UpLoadMake;
         private CustomControl.ButtonUtil.NormalButton DownLoadMake;
-        private System.Windows.Forms.DataGridView dataGridView1;
+        private System.Windows.Forms.DataGridView DGV;
+        private System.Windows.Forms.NumericUpDown mancount;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7;
+        private CustomControl.ButtonUtil.NormalButton ChangeMan;
+        private System.Windows.Forms.DataGridViewTextBoxColumn lm_id;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn choose;
+        private System.Windows.Forms.DataGridViewTextBoxColumn lm_makecode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn lm_linecode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn lm_uptime;
+        private System.Windows.Forms.DataGridViewTextBoxColumn lm_downtime;
+        private System.Windows.Forms.DataGridViewTextBoxColumn lm_inman;
+        private System.Windows.Forms.DataGridViewTextBoxColumn lm_mannum;
     }
 }

UAS_MES_YDCY/FunctionCode/Query/Query_LoadMake.cs

@@ -1,4 +1,5 @@
-using LabelManager2;
+using DevExpress.XtraMap.Native;
+using LabelManager2;
 using System;
 using System.Data;
 using System.Linq;
@@ -38,12 +39,13 @@ namespace UAS_MES_NEW.Query
             ma_code.Condition = "ma_statuscode='STARTED'";
             ma_code.DbChange += Ma_code_DbChange;
 
-            ma_code.TableName = "line";
-            ma_code.SelectField = "li_code # 线别编号,li_name # 线别名称";
-            ma_code.FormName = Name;
-            ma_code.SetValueField = new string[] { "li_code" };
-            ma_code.Condition = "li_statuscode='STARTED'";
-            ma_code.DbChange += Ma_code_DbChange;
+            li_code.TableName = "line";
+            li_code.SelectField = "li_code # 线别编号,li_name # 线别名称";
+            li_code.FormName = Name;
+            li_code.SetValueField = new string[] { "li_code" };
+            li_code.Condition = "li_statuscode='AUDITED'";
+            li_code.DbChange += Ma_code_DbChange;
+            LoadGridData();
         }
 
         private void Ma_code_DbChange(object sender, EventArgs e)
@@ -55,12 +57,82 @@ namespace UAS_MES_NEW.Query
 
         private void UpLoadMake_Click(object sender, EventArgs e)
         {
-
+            if (ma_code.Text == "" || li_code.Text == "")
+            {
+                MessageBox.Show("工单和线别不允许为空");
+                return;
+            }
+            if (mancount.Value == 0)
+            {
+                MessageBox.Show("人数必须大于0");
+                return;
+            }
+            if (dh.CheckExist("loadmake", "lm_linecode='" + li_code.Text + "' and lm_downtime is null"))
+            {
+                MessageBox.Show("线别" + li_code.Text + "存在在线工单,不允许上线");
+                return;
+            }
+            dh.ExecuteSql("insert into loadmake(lm_id,lm_makecode,lm_linecode,lm_uptime,lm_inman,lm_mannum)" +
+                "values(loadmake_seq.nextval,'" + ma_code.Text + "','" + li_code.Text + "',sysdate,'" + User.UserName + "','" + mancount.Value + "')", "insert");
+            LoadGridData();
         }
 
         private void DownLoadMake_Click(object sender, EventArgs e)
         {
+            if (!ifcheckrow())
+            {
+                MessageBox.Show("请勾选需要操作的行");
+                return;
+            }
+            for (int i = 0; i < DGV.Rows.Count; i++)
+            {
+                if (DGV.Rows[i].Cells["Choose"].Value != null && DGV.Rows[i].Cells["Choose"].FormattedValue.ToString() == "True")
+                {
+                    dh.ExecuteSql("update loadmake set lm_downtime=sysdate where lm_id='" + DGV.Rows[i].Cells["lm_id"].Value.ToString() + "'", "update");
+                }
+            }
+            LoadGridData();
+        }
+
+
+        private void LoadGridData()
+        {
+            DataTable dt = (DataTable)dh.ExecuteSql("select * from loadmake where lm_downtime is  null", "select");
+            BaseUtil.FillDgvWithDataTable(DGV, dt);
+        }
+
+        private void ChangeMan_Click(object sender, EventArgs e)
+        {
+            if (!ifcheckrow())
+            {
+                MessageBox.Show("请勾选需要操作的行");
+                return;
+            }
+            for (int i = 0; i < DGV.Rows.Count; i++)
+            {
+                if (DGV.Rows[i].Cells["Choose"].Value != null && DGV.Rows[i].Cells["Choose"].FormattedValue.ToString() == "True")
+                {
+                    dh.ExecuteSql("update loadmake set lm_downtime=sysdate where lm_id='" + DGV.Rows[i].Cells["lm_id"].Value.ToString() + "'", "update");
+                    string makecode = DGV.Rows[i].Cells["lm_makecode"].Value.ToString();
+                    string licode = DGV.Rows[i].Cells["lm_linecode"].Value.ToString();
+                    string mannum = DGV.Rows[i].Cells["LM_MANNUM"].Value.ToString();
+                    dh.ExecuteSql("insert into loadmake(lm_id,lm_makecode,lm_linecode,lm_uptime,lm_inman,lm_mannum)" +
+                    "values(loadmake_seq.nextval,'" + makecode + "','" + licode + "',sysdate,'" + User.UserName + "','" + mannum + "')", "insert");
+                }
+            }
+            LoadGridData();
+        }
 
+        private bool ifcheckrow()
+        {
+            for (int i = 0; i < DGV.Rows.Count; i++)
+            {
+                if (DGV.Rows[i].Cells["Choose"].Value != null && DGV.Rows[i].Cells["Choose"].FormattedValue.ToString() == "True")
+                {
+                    return true;
+                }
+            }
+            return false;
         }
     }
 }

UAS_MES_YDCY/FunctionCode/Query/Query_LoadMake.resx

@@ -120,7 +120,69 @@
   <metadata name="folderBrowserDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <metadata name="lm_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="choose.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="lm_makecode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="lm_linecode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="lm_uptime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="lm_downtime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="lm_inman.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="lm_mannum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="DownLoadMake.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
+        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
+        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
+        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
+        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
+        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
+        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="DownLoadMake.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
+        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
+        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
+        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
+        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
+        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
+        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
+        gg==
+</value>
+  </data>
+  <data name="DownLoadMake.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
+        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
+        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
+        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
+        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
+        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
+        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
+        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
+</value>
+  </data>
   <data name="UpLoadMake.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
@@ -159,7 +221,7 @@
         ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="DownLoadMake.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="ChangeMan.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
@@ -171,7 +233,7 @@
         oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="DownLoadMake.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="ChangeMan.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
@@ -184,7 +246,7 @@
         gg==
 </value>
   </data>
-  <data name="DownLoadMake.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="ChangeMan.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE

UAS_MES_YDCY/FunctionCode/Query/Query_SN.cs

@@ -181,11 +181,11 @@ namespace UAS_MES_NEW.Query
             }
         }
 
-        public string BarcodeMethod1(string Prefix, string Suffix, int Index, int Length, int radix)
+        public string BarcodeMethod1(string Prefix, string Suffix, int Index, int Length, int radix,string char_out)
         {
             string str = Prefix;
             //如果是流水则需要在前面加0
-            string serialcode = BaseUtil.DToAny(custserialnum, radix);
+            string serialcode = BaseUtil.DToAny(custserialnum, radix, char_out);
             for (int j = serialcode.ToString().Length; j < Length; j++)
             {
                 serialcode = "0" + serialcode;
@@ -257,10 +257,10 @@ namespace UAS_MES_NEW.Query
                 MessageBox.Show("工单号" + ma_code.Text + "生产序列号超出工单数");
                 return;
             }
-            DataTable Nr = (DataTable)dh.ExecuteSql("select nrd_detno,nrd_name,nrd_type,nrd_radix,nrd_sql,nrd_length from NoRuleDetail left join norule on nrd_nrid=nr_id where nr_code='" + pr_exbarcode + "' order by nrd_detno", "select");
+            DataTable Nr = (DataTable)dh.ExecuteSql("select nrd_detno,nrd_name,nrd_type,nrd_radix,nrd_sql,nrd_length,nrd_content from NoRuleDetail left join norule on nrd_nrid=nr_id where nr_code='" + pr_exbarcode + "' order by nrd_detno", "select");
             //如果没有则取公共规则
             if (Nr.Rows.Count == 0)
-                Nr = (DataTable)dh.ExecuteSql("select nrd_detno,nrd_name,nrd_radix,nrd_type,nrd_sql,nrd_length from NoRuleDetail left join norule on nrd_nrid=nr_id where nr_custcode is null and nr_isdefault <> 0 order by nrd_detno", "select");
+                Nr = (DataTable)dh.ExecuteSql("select nrd_detno,nrd_name,nrd_radix,nrd_type,nrd_sql,nrd_length,nrd_content from NoRuleDetail left join norule on nrd_nrid=nr_id where nr_custcode is null and nr_isdefault <> 0 order by nrd_detno", "select");
             //用于过滤参数的正则表达式
             Regex match = new Regex("{\\w+}");
             //用于存放每一项的明细的数据
@@ -272,6 +272,7 @@ namespace UAS_MES_NEW.Query
             //存放键值对
             int Radix = 10;
             string PrefixFixed = "";
+            string char_out = "";
             for (int m = 0; m < Nr.Rows.Count; m++)
             {
                 switch (Nr.Rows[m]["nrd_type"].ToString())
@@ -322,6 +323,7 @@ namespace UAS_MES_NEW.Query
                         SerialNumIndex = m;
                         SerialNumLength = int.Parse(Nr.Rows[m]["nrd_length"].ToString());
                         Radix = int.Parse(Nr.Rows[m]["nrd_radix"].ToString());
+                        char_out = Nr.Rows[m]["nrd_content"].ToString();
                         break;
                     default:
                         break;
@@ -344,7 +346,7 @@ namespace UAS_MES_NEW.Query
             ArrayList<string> custbarcode = new ArrayList<string>();
             for (int i = 0; i < int.Parse(ma_count.Text); i++)
             {
-                string data = BarcodeMethod1(PrefixFixed, Suffix, SerialNumIndex, SerialNumLength, Radix);
+                string data = BarcodeMethod1(PrefixFixed, Suffix, SerialNumIndex, SerialNumLength, Radix, char_out);
                 if (!custbarcode.Contains(data))
                     custbarcode.Add(data);
             }

UAS_MES_YDCY/Login.Designer.cs

@@ -125,6 +125,7 @@
             // 
             // Source
             // 
+            this.Source.Enabled = false;
             this.Source.Location = new System.Drawing.Point(94, 157);
             this.Source.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.Source.Name = "Source";

UAS_MES_YDCY/Login.cs

@@ -95,7 +95,7 @@ namespace UAS_MES_NEW
             //设置选中数据库的链接
             string DBUser = DB.SelectedValue.ToString().Split('#')[0];
             string Address = DB.SelectedValue.ToString().Split('#')[1];
-            DataHelper.DBConnectionString = "Password=select!#%*(;User ID=" + DBUser + ";Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=" + Address + ")(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
+            DataHelper.DBConnectionString = "Password=select!#%*(;User ID=" + DBUser + ";Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.0.85)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
             SystemInf.CurrentDB = DBUser;
             //设置屏幕的宽高信息
             SystemInf.ScreenWidth = Screen.PrimaryScreen.WorkingArea.Width;
@@ -285,7 +285,7 @@ namespace UAS_MES_NEW
 
         private void PassWord_TextChanged(object sender, EventArgs e)
         {
-            //if (dh.getFieldDataByCondition("employee", "em_type", "em_code='" + UserName.Text + "' and em_password='" + PassWord.Text + "'").ToString() == "admin")
+            //if (dh.getFieldDataByCondition("employee", "nvl(em_changesource,0)", "em_code='" + UserName.Text + "' and em_password='" + PassWord.Text + "'").ToString() != "0")
             //{
             //    Source.Enabled = true;
             //}

UAS_MES_YDCY/PublicMethod/BaseUtil.cs

@@ -42,11 +42,12 @@ namespace UAS_MES_NEW.PublicMethod
             return !((c.Client.Poll(1000, SelectMode.SelectRead) && (c.Client.Available == 0)) || !c.Client.Connected);
         }
 
-        public static Control GetControl(Control ctl,string Name) {
+        public static Control GetControl(Control ctl, string Name)
+        {
             if (ctl.Name == Name)
                 return ctl;
             else
-               return GetControl(ctl.Parent, Name);
+                return GetControl(ctl.Parent, Name);
         }
 
         public static string DToAny(double DB, int Type)
@@ -60,7 +61,8 @@ namespace UAS_MES_NEW.PublicMethod
             {
                 return GetRandomChar(H1);
             }
-            else {
+            else
+            {
                 D = (long)DB;
                 B = DB - D;
                 if (D == 0)
@@ -91,7 +93,52 @@ namespace UAS_MES_NEW.PublicMethod
                 }
             }
         }
-        
+
+        public static string DToAny(double DB, int Type, string char_out)
+        {
+            string H = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+            long D;
+            double B;
+            string tempD = "", tempB = "";
+            for (int i = 0; i < char_out.Length; i++)
+            {
+                H = H.Replace(char_out[i].ToString(), "");
+            }
+            if (Type != H.Length && Type != 10 && Type != 16)
+            {
+                ShowError("字符长度截取错误，请检查进制和去除字符");
+                return "";
+            }
+            D = (long)DB;
+            B = DB - D;
+            if (D == 0)
+            {
+                tempD = "0";
+            }
+            while (D != 0)
+            {
+                tempD = H[(((int)D % Type))] + tempD;
+                D = D / Type;
+            }
+            for (int i = 0; i < 7; i++)
+            {
+                if (B == 0)
+                {
+                    break;
+                }
+                tempB += H[((int)(B * Type))];
+                B = B * Type - (int)(B * Type);
+            }
+            if (tempB == "")
+            {
+                return tempD;
+            }
+            else
+            {
+                return tempD + "." + tempB;
+            }
+        }
+
         public static string GetRandomChar(string str)
         {
             byte[] buffer = Guid.NewGuid().ToByteArray();