修改批结果判断取值字段

UAS-MES/FunctionCode/Make/Make_NewMatainInf.cs

@@ -125,7 +125,7 @@ namespace UAS_MES.Make
             return CheckedNum;
         }
 
-        private string GetListViewSelectedItemText(ListView lsv,int ItemIndex)
+        private string GetListViewSelectedItemText(ListView lsv, int ItemIndex)
         {
             for (int i = lsv.Items.Count - 1; i >= 0; i--)
             {
@@ -159,18 +159,19 @@ namespace UAS_MES.Make
             if (ErrorMessage == "")
             {
                 ErrorMessage = "";
-                string mbccomponent = GetListViewSelectedItemText(mbc_component_lsv,0);
-                string nrgcode = GetListViewSelectedItemText(nrg_name_lsv,0);
-                string nrcode = GetListViewSelectedItemText(nr_name_lsv,0);
-                string nrname= GetListViewSelectedItemText(nr_name_lsv, 1);
-                string mbrdutycode = GetListViewSelectedItemText(mbr_dutycode_lsv,0);
-                string mbrsolutioncode = GetListViewSelectedItemText(mbr_solutioncode_lsv,0);
+                string mbccomponent = GetListViewSelectedItemText(mbc_component_lsv, 0);
+                string nrgcode = GetListViewSelectedItemText(nrg_name_lsv, 0);
+                string nrcode = GetListViewSelectedItemText(nr_name_lsv, 0);
+                string nrname = GetListViewSelectedItemText(nr_name_lsv, 1);
+                string mbrdutycode = GetListViewSelectedItemText(mbr_dutycode_lsv, 0);
+                string mbrsolutioncode = GetListViewSelectedItemText(mbr_solutioncode_lsv, 0);
                 dt = (DataTable)dh.ExecuteSql("select ms_makecode from makeserial where ms_id='" + msid + "' and ms_sncode='" + sncode + "' and ms_status=3", "select");
                 if (dt.Rows.Count > 0)
                 {
                     string macode = dt.Rows[0]["ms_makecode"].ToString();
                     string mbr_id = dh.GetSEQ("makebadreason_seq");
-                    if (!dh.CheckExist("makebadreason", "mbr_badcode='"+bccode+ "' and mbr_sncode='"+sncode+"' and mbr_brcode='"+nrcode+"'")) {
+                    if (!dh.CheckExist("makebadreason", "mbr_badcode='" + bccode + "' and mbr_sncode='" + sncode + "' and mbr_brcode='" + nrcode + "'"))
+                    {
                         sql.Clear();
                         sql.Append("insert into makebadreason (mbr_mbid,mbr_id,mbr_brcode,mbr_solutioncode,");
                         sql.Append("mbr_dutycode,mbr_brgcode,mbr_badcode,mbr_sncode,mbr_makecode,mbr_indate,");
@@ -180,7 +181,7 @@ namespace UAS_MES.Make
                         dh.ExecuteSql(sql.GetString(), "insert");
                         MessageBox.Show("不良原因保存成功");
                     }
-                    else MessageBox.Show("不良代码"+bc_name.Text+"已存在不良原因"+ nrname);
+                    else MessageBox.Show("不良代码【" + bc_name.Text + "】已存在不良原因【" + nrname+"】");
                     if (mbccomponent != "" || mbccomponent != null)
                     {
                         if (!dh.CheckExist("makebadrscom", "mbc_sncode='" + sncode + "' and mbc_component='" + mbccomponent + "'"))
@@ -192,12 +193,11 @@ namespace UAS_MES.Make
                             sql.Append("'" + bccode + "','" + nrcode + "','" + sncode + "','" + macode + "',sysdate,'" + User.UserCode + "')");
                             dh.ExecuteSql(sql.GetString(), "insert");
                         }
-                        else ErrorMessage += "序列号" + sncode + "已存在不良组件" + mbccomponent;
+                        else ErrorMessage += "序列号【" + sncode + "】已存在不良组件【" + mbccomponent+"】";
                     }
                     if (ErrorMessage != "")
                         MessageBox.Show(ErrorMessage);
-                    else
-                        Close();
+                    Close();
                 }
                 else MessageBox.Show("序列号错误，不存在或者不处于维修状态");
             }

UAS-MES/FunctionCode/OQC/OQC_BatchResultJudge.cs

@@ -40,7 +40,6 @@ namespace UAS_MES.OQC
                 BaseUtil.CleanForm(this);
                 OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
             }
-            Console.WriteLine(ob_result.Text);
             switch (ob_result.Text)
             {
                 case "OK":

UAS-MES/FunctionCode/OQC/OQC_SamplingDataCollection.Designer.cs

@@ -46,7 +46,6 @@
             this.ob_status = new System.Windows.Forms.Label();
             this.ob_aqlcode_label = new System.Windows.Forms.Label();
             this.ob_maxngacceptqty_label = new System.Windows.Forms.Label();
-            this.ChooseAll = new System.Windows.Forms.CheckBox();
             this.ob_projectcode_label = new System.Windows.Forms.Label();
             this.ob_maxngacceptqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ob_aqlcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
@@ -282,17 +281,6 @@
             this.ob_maxngacceptqty_label.TabIndex = 216;
             this.ob_maxngacceptqty_label.Text = "最大不合格通过数";
             // 
-            // ChooseAll
-            // 
-            this.ChooseAll.AutoSize = true;
-            this.ChooseAll.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ChooseAll.Location = new System.Drawing.Point(16, 502);
-            this.ChooseAll.Name = "ChooseAll";
-            this.ChooseAll.Size = new System.Drawing.Size(61, 25);
-            this.ChooseAll.TabIndex = 199;
-            this.ChooseAll.Text = "全选";
-            this.ChooseAll.UseVisualStyleBackColor = true;
-            // 
             // ob_projectcode_label
             // 
             this.ob_projectcode_label.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
@@ -891,7 +879,6 @@
             this.Controls.Add(this.ob_remark_label);
             this.Controls.Add(this.sncode);
             this.Controls.Add(this.label10);
-            this.Controls.Add(this.ChooseAll);
             this.Controls.Add(this.CheckTypeDGV);
             this.Controls.Add(this.ChooseedReject);
             this.Controls.Add(this.WaitReject);
@@ -983,7 +970,6 @@
         private System.Windows.Forms.Label ob_maxngacceptqty_label;
         private System.Windows.Forms.DataGridViewTextBoxColumn bg_code1;
         private System.Windows.Forms.DataGridViewTextBoxColumn bg_name1;
-        private System.Windows.Forms.CheckBox ChooseAll;
         private System.Windows.Forms.DataGridViewCheckBoxColumn Column3;
         private System.Windows.Forms.DataGridViewTextBoxColumn bg_code;
         private System.Windows.Forms.DataGridViewTextBoxColumn bg_name;

UAS-MES/PublicMethod/LogicHandler.cs

@@ -898,7 +898,7 @@ namespace UAS_MES.PublicMethod
                     dh.ExecuteSql(sql.ToString(), "update");
                     //查询Form数据
                     sql.Clear();
-                    sql.Append("select ob_id,ob_makecode,ob_status,ob_prodcode,(select max(oi_checkqty)from OQCItems where oi_checkno='" + iCheckNo + "') oi_checkqty,");
+                    sql.Append("select ob_id,ob_aqlcode,ob_makecode,ob_status,ob_prodcode,(select max(oi_checkqty)from OQCItems where oi_checkno='" + iCheckNo + "') oi_checkqty,");
                     sql.Append("ob_batchqty,nvl(ob_okqty,0) ob_okqty,nvl(ob_ngqty,0) ob_ngqty,ob_maxngacceptqty,ob_source,ob_checkno,ob_result from OQCBatch where ob_checkno='" + iCheckNo + "'");
                     Form = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
                     if (Form.Rows.Count == 0)
@@ -918,9 +918,9 @@ namespace UAS_MES.PublicMethod
         /// <param name="iSnCode"></param>
         /// <param name="iMakeCode"></param>
         /// <param name="iMPKind"></param>
-        /// <param name="iResult"></param>
+        /// <param name="result"></param>
         /// <param name="iUserCode"></param>
-        public static void InsertMakeProcess(string iSnCode, string iMakeCode,string iSourceCode, string iMPKind, string iResult, string iUserCode)
+        public static void InsertMakeProcess(string iSnCode, string iMakeCode,string iSourceCode, string iMPKind, string result, string iUserCode)
         {
             string CurrentStep = "";
             string LineCode = "";
@@ -930,7 +930,7 @@ namespace UAS_MES.PublicMethod
             sql.Append("insert into MakeProcess(mp_id,mp_makecode,mp_maid, mp_mscode,mp_sncode,mp_stepcode,mp_stepname,");
             sql.Append("mp_craftcode,mp_craftname,mp_kind,mp_result,mp_indate,mp_inman,mp_wccode,mp_linecode,mp_sourcecode,mp_snstatus,mp_sncheckno,mp_snoutboxcode)");
             sql.Append("select MakeProcess_seq.nextval, ma_code,ma_id,ms_code,ms_sncode,mcd_stepcode,mcd_stepname,");
-            sql.Append("ma_craftcode,ma_craftname,'" + iMPKind + "','" + iResult + "',sysdate,'" + iUserCode + "',ma_wccode,'"+ LineCode + "','"+ iSourceCode + "',");
+            sql.Append("ma_craftcode,ma_craftname,'" + iMPKind + "','" + result + "',sysdate,'" + iUserCode + "',ma_wccode,'"+ LineCode + "','"+ iSourceCode + "',");
             sql.Append("ms_status,ms_checkno,ms_outboxcode from make left join makecraftdetail on mcd_macode=ma_code left join makeserial on ms_makecode=ma_code ");
             sql.Append("where ms_sncode='" + iSnCode + "' and ma_code='" + iMakeCode + "' and mcd_stepcode='"+ CurrentStep + "'");
             dh.ExecuteSql(sql.ToString(), "insert");