修改测试采集不良的保存按钮

UAS-MES/FunctionCode/Make/Make_TestCollection.Designer.cs

@@ -161,6 +161,7 @@
             this.GoodProduct.TabStop = true;
             this.GoodProduct.Text = "良品";
             this.GoodProduct.UseVisualStyleBackColor = true;
+            this.GoodProduct.CheckedChanged += new System.EventHandler(this.GoodProduct_CheckedChanged);
             // 
             // Reject
             // 

UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -199,7 +199,6 @@ namespace UAS_MES.Make
                                 return;
                             }
                         }
-                        bc_code.Focus();
                         SetCollectResult();
                     }
                     else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
@@ -292,6 +291,7 @@ namespace UAS_MES.Make
             if (Reject.Checked)
             {
                 LoadBadCodeListView();
+                bc_code.Focus();
                 //勾选了自动产生代码
                 if (AutoBadCode.Checked)
                     Save_Click(new object(), new EventArgs());
@@ -340,15 +340,36 @@ namespace UAS_MES.Make
                 ms_code_KeyDown(sender, new KeyEventArgs(Keys.Enter));
             else if (Reject.Checked)
             {
+                if (LogicHandler.CheckStepAttribute(Tag.ToString(), User.UserSourceCode, out ErrorMessage))
+                {
+                    //判断界面工单是否为空时的序列号是否自动归属工单
+                    if (!LogicHandler.GetMakeInfo(ms_sncode.Text, out oMakeCode, out ErrorMessage))
+                    {
+                        if (ma_code.Text == "")
+                        {
+                            OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
+                            return;
+                        }
+                    }
+                    if (LogicHandler.CheckStepSNAndMacode(ma_code.Text == "" ? oMakeCode : ma_code.Text, User.UserSourceCode, ms_sncode.Text, User.UserCode, out oMakeCode, out oMSID, out ErrorMessage))
+                    {
+                        dt = (DataTable)dh.ExecuteSql("select ma_code,ma_prodcode,pr_detail,ma_qty from make left join product on ma_prodcode=pr_code where ma_code='" + oMakeCode + "'", "select");
+                        if (dt.Rows.Count > 0)
+                        {
+                            BaseUtil.SetFormValue(this.Controls, dt);
+                            LockMakeCode.Checked = true;
+                        }
+                    }
+                    else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
+                }
+                else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
                 int RejectCount = ChoosedRejectList.Items.Count;
                 string[] bccode = new string[bc_code.Text == "" ? RejectCount : RejectCount + 1];
                 string[] bcremark = new string[bc_code.Text == "" ? RejectCount : RejectCount + 1];
                 string[] bgcode = new string[bc_code.Text == "" ? RejectCount : RejectCount + 1];
-                string ErrorMessage = "";
                 if (AutoBadCode.Checked)
                 {
                     string defaultvalue = Properties.Settings.Default.DefaultCollectionValue;
-                    Console.WriteLine(defaultvalue);
                     bccode = new string[] { defaultvalue };
                     bcremark = new string[] { defaultvalue };
                     bgcode = new string[] { defaultvalue };
@@ -406,8 +427,6 @@ namespace UAS_MES.Make
                 {
                     OperateResult.AppendText(">>" + ms_sncode.Text + "已采集为不良\n", Color.Green, ms_sncode);
                     //清除不良信息
-                    bc_groupcode.DataSource = null;
-                    bc_groupcode.Text = "";
                     bc_code.Text = "";
                     WaitRejectList.Items.Clear();
                     ChoosedRejectList.Items.Clear();
@@ -451,5 +470,21 @@ namespace UAS_MES.Make
             LoadBadGroupData();
             LoadCollectedNum();
         }
+
+        private void GoodProduct_CheckedChanged(object sender, EventArgs e)
+        {
+            if (GoodProduct.Checked)
+            {
+                bc_code.Enabled = false;
+                WaitReject.Enabled = false;
+                ChooseedReject.Enabled = false;
+            }
+            else
+            {
+                bc_code.Enabled = true;
+                WaitReject.Enabled = true;
+                ChooseedReject.Enabled = true;
+            }
+        }
     }
 }

UAS-MES/UAS-MES.csproj

@@ -41,7 +41,7 @@
     <MinimumRequiredVersion>1.0.0.201</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
-    <ApplicationRevision>214</ApplicationRevision>
+    <ApplicationRevision>217</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>true</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>