添加人员资料

UAS_MES_BG/FunctionCode/Make/Make_TestCollection.Designer.cs

@@ -84,6 +84,9 @@
             this.new_softversion = new System.Windows.Forms.TextBox();
             this.label11 = new System.Windows.Forms.Label();
             this.SoftVersion = new System.Windows.Forms.DataGridView();
+            this.bd_soncode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pr_spec1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.version = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -115,9 +118,8 @@
             this.bc_remark = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.bc_groupcode = new UAS_MES_NEW.CustomControl.ComBoxWithFocus.ComBoxWithFocus();
             this.ms_sncode = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
-            this.bd_soncode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pr_spec1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.version = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.label13 = new System.Windows.Forms.Label();
+            this.em_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
             ((System.ComponentModel.ISupportInitialize)(this.BadInfSource)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.XmlWatcher)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.SoftVersion)).BeginInit();
@@ -685,6 +687,31 @@
             this.SoftVersion.Size = new System.Drawing.Size(615, 174);
             this.SoftVersion.TabIndex = 246;
             // 
+            // bd_soncode
+            // 
+            this.bd_soncode.DataPropertyName = "bd_soncode";
+            this.bd_soncode.HeaderText = "料号";
+            this.bd_soncode.MinimumWidth = 10;
+            this.bd_soncode.Name = "bd_soncode";
+            this.bd_soncode.ReadOnly = true;
+            this.bd_soncode.Width = 200;
+            // 
+            // pr_spec1
+            // 
+            this.pr_spec1.DataPropertyName = "pr_spec";
+            this.pr_spec1.HeaderText = "规格";
+            this.pr_spec1.MinimumWidth = 10;
+            this.pr_spec1.Name = "pr_spec1";
+            this.pr_spec1.ReadOnly = true;
+            this.pr_spec1.Width = 200;
+            // 
+            // version
+            // 
+            this.version.HeaderText = "版本";
+            this.version.MinimumWidth = 10;
+            this.version.Name = "version";
+            this.version.Width = 200;
+            // 
             // dataGridViewTextBoxColumn1
             // 
             this.dataGridViewTextBoxColumn1.HeaderText = "料号";
@@ -716,7 +743,7 @@
             this.device.Margin = new System.Windows.Forms.Padding(5);
             this.device.Name = "device";
             this.device.Power = null;
-            this.device.Size = new System.Drawing.Size(294, 40);
+            this.device.Size = new System.Drawing.Size(150, 40);
             this.device.Str = null;
             this.device.Str1 = null;
             this.device.Str2 = null;
@@ -1022,7 +1049,7 @@
             this.CleanInfo.DownImage = ((System.Drawing.Image)(resources.GetObject("CleanInfo.DownImage")));
             this.CleanInfo.Image = ((System.Drawing.Image)(resources.GetObject("CleanInfo.Image")));
             this.CleanInfo.IsShowBorder = true;
-            this.CleanInfo.Location = new System.Drawing.Point(1440, 985);
+            this.CleanInfo.Location = new System.Drawing.Point(1564, 989);
             this.CleanInfo.Margin = new System.Windows.Forms.Padding(5);
             this.CleanInfo.MoveImage = ((System.Drawing.Image)(resources.GetObject("CleanInfo.MoveImage")));
             this.CleanInfo.Name = "CleanInfo";
@@ -1102,30 +1129,33 @@
             this.ms_sncode.Tag = "IfRead";
             this.ms_sncode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ms_code_KeyDown_one);
             // 
-            // bd_soncode
-            // 
-            this.bd_soncode.DataPropertyName = "bd_soncode";
-            this.bd_soncode.HeaderText = "料号";
-            this.bd_soncode.MinimumWidth = 10;
-            this.bd_soncode.Name = "bd_soncode";
-            this.bd_soncode.ReadOnly = true;
-            this.bd_soncode.Width = 200;
-            // 
-            // pr_spec1
-            // 
-            this.pr_spec1.DataPropertyName = "pr_spec";
-            this.pr_spec1.HeaderText = "规格";
-            this.pr_spec1.MinimumWidth = 10;
-            this.pr_spec1.Name = "pr_spec1";
-            this.pr_spec1.ReadOnly = true;
-            this.pr_spec1.Width = 200;
-            // 
-            // version
-            // 
-            this.version.HeaderText = "版本";
-            this.version.MinimumWidth = 10;
-            this.version.Name = "version";
-            this.version.Width = 200;
+            // label13
+            // 
+            this.label13.AutoSize = true;
+            this.label13.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label13.Location = new System.Drawing.Point(1280, 985);
+            this.label13.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.label13.Name = "label13";
+            this.label13.Size = new System.Drawing.Size(82, 41);
+            this.label13.TabIndex = 248;
+            this.label13.Text = "人员";
+            // 
+            // em_code
+            // 
+            this.em_code.AllPower = "ifall";
+            this.em_code.BackColor = System.Drawing.Color.White;
+            this.em_code.Font = new System.Drawing.Font("宋体", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.em_code.ID = null;
+            this.em_code.Location = new System.Drawing.Point(1376, 986);
+            this.em_code.Margin = new System.Windows.Forms.Padding(5);
+            this.em_code.Name = "em_code";
+            this.em_code.Power = null;
+            this.em_code.Size = new System.Drawing.Size(150, 40);
+            this.em_code.Str = null;
+            this.em_code.Str1 = null;
+            this.em_code.Str2 = null;
+            this.em_code.TabIndex = 247;
+            this.em_code.Tag = "IfRead";
             // 
             // Make_TestCollection
             // 
@@ -1133,6 +1163,8 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.Control;
             this.ClientSize = new System.Drawing.Size(1721, 1051);
+            this.Controls.Add(this.label13);
+            this.Controls.Add(this.em_code);
             this.Controls.Add(this.SoftVersion);
             this.Controls.Add(this.label11);
             this.Controls.Add(this.device);
@@ -1215,7 +1247,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.BadInfSource)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.XmlWatcher)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.SoftVersion)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }
@@ -1309,5 +1341,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn bd_soncode;
         private System.Windows.Forms.DataGridViewTextBoxColumn pr_spec1;
         private System.Windows.Forms.DataGridViewTextBoxColumn version;
+        private System.Windows.Forms.Label label13;
+        private CustomControl.TextBoxWithIcon.SnCollectionBox em_code;
     }
 }

UAS_MES_BG/FunctionCode/Make/Make_TestCollection.cs

@@ -600,7 +600,7 @@ namespace UAS_MES_NEW.Make
                     else
                     {
                         //良品信息采集
-                        if (LogicHandler.SetStepResult1(ma_code.Text, User.UserSourceCode, ms_sncode.Text, "良品采集", "检测合格", User.UserCode, device.Text, out ErrorMessage))
+                        if (LogicHandler.SetStepResult1(ma_code.Text, User.UserSourceCode, ms_sncode.Text, "良品采集", "检测合格", User.UserCode, device.Text,em_code.Text, out ErrorMessage))
                         {
                             LastSncode = ms_sncode.Text;
                             //提示正确返回时传递的信息
@@ -633,7 +633,7 @@ namespace UAS_MES_NEW.Make
                 {
                     if (reworkstatus != "3")
                     {
-                        if (LogicHandler.SetStepResult1(ma_code.Text, User.UserSourceCode, ms_sncode.Text, "良品采集", "检测合格", User.UserCode, device.Text, out ErrorMessage))
+                        if (LogicHandler.SetStepResult1(ma_code.Text, User.UserSourceCode, ms_sncode.Text, "良品采集", "检测合格", User.UserCode, device.Text,em_code.Text, out ErrorMessage))
                         {
                             //提示正确返回时传递的信息
                             if (ErrorMessage.Contains("AFTERSUCCESS"))

UAS_MES_BG/FunctionCode/Make/Make_TestCollection.resx

@@ -271,7 +271,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDgAACw4BQL7hQQAACdNJREFUeF7t3dtOW4cW
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDQAACw0B7QfALAAACdNJREFUeF7t3dtOW4cW
         heFe9VUibakv1/eoVGk/TFedps2hnCGAjTnYnAlgbGNzJpUqza2xgL2zmSlL4oqV8V98Fx2q190/YxwC
         30XEdwA8pQGAjzQA8JEGAD7SAMBHGgD4SAMAH2kA4CMNAHykAYCPNADwkQYAPtIAwEcaAPhIAwAfaQDg
         Iw0AfKQBgI80APCRBgA+0gDARxoA+EgDAB9pAOAjDQB8pAGAjzQA8JEGAD7SAMBHGgD4SAMAH2kA4CMN

UAS_MES_BG/PublicMethod/LogicHandler.cs

@@ -754,17 +754,17 @@ namespace UAS_MES_NEW.PublicMethod
             return CS_SetResult(iMakeCode, iSourceCode, iSN, iUserCode, iResult, out oErrorMessage);
         }
 
-        public static bool SetStepResult1(string iMakeCode, string iSourceCode, string iSN, string iMPKind, string iResult, string iUserCode, string iDevice, out string oErrorMessage)
+        public static bool SetStepResult1(string iMakeCode, string iSourceCode, string iSN, string iMPKind, string iResult, string iUserCode, string iDevice,string iEmcode, out string oErrorMessage)
         {
-            return CS_SetResult1(iMakeCode, iSourceCode, iSN, iUserCode, iResult, iDevice, out oErrorMessage);
+            return CS_SetResult1(iMakeCode, iSourceCode, iSN, iUserCode, iResult, iDevice,iEmcode, out oErrorMessage);
         }
 
-        public static bool CS_SetResult1(string iMakeCode, string iSourceCode, string iSN, string iUserCode, string iResult, string iDevice, out string oErrorMessage)
+        public static bool CS_SetResult1(string iMakeCode, string iSourceCode, string iSN, string iUserCode, string iResult, string iDevice,string iEmcode, out string oErrorMessage)
         {
             oErrorMessage = "";
-            string[] param = new string[] { iMakeCode, iSourceCode, iSN, iUserCode, iResult, iDevice, oErrorMessage };
-            dh.CallProcedure("CS_SETSTEPRESULT_NEW", ref param);
-            oErrorMessage = param[6];
+            string[] param = new string[] { iMakeCode, iSourceCode, iSN, iUserCode, iResult, iDevice, iEmcode, oErrorMessage };
+            dh.CallProcedure("CS_SETSTEPRESULT_NEW2", ref param);
+            oErrorMessage = param[7];
             if (oErrorMessage == "" || oErrorMessage == null || oErrorMessage == "null" || oErrorMessage.Contains("AFTERSUCCESS"))
                 return true;
             else