测试采集BUG修复

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

@@ -283,7 +283,7 @@
             this.mbl_loc_label.AutoSize = true;
             this.mbl_loc_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.mbl_loc_label.ForeColor = System.Drawing.Color.Black;
-            this.mbl_loc_label.Location = new System.Drawing.Point(176, 295);
+            this.mbl_loc_label.Location = new System.Drawing.Point(176, 298);
             this.mbl_loc_label.Name = "mbl_loc_label";
             this.mbl_loc_label.Size = new System.Drawing.Size(74, 21);
             this.mbl_loc_label.TabIndex = 103;

UAS-MES/FunctionCode/Make/Make_Repair.cs

@@ -165,7 +165,7 @@ namespace UAS_MES.Make
         {
             BadCodeTree.Nodes.Clear();
             sql.Clear();
-            sql.Append("select mb_id,mb_sncode,mb_badcode,mb_bgcode,bc_name,bg_name,");
+            sql.Append("select mb_id,mb_sncode,mb_badcode,mb_bgcode,nvl(bc_name,mb_badcode) bc_name,nvl(bg_name,mb_bgcode) bg_name,");
             sql.Append("mb_badremark from makebad left join badcode on bc_code=mb_badcode left join badgroup ");
             sql.Append("on bg_code=mb_bgcode where mb_sncode='" + (GetSNCode.Text == "" ? ms_sncode.Text : GetSNCode.Text) + "' and mb_makecode='" + macode + "'");
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
@@ -316,40 +316,47 @@ namespace UAS_MES.Make
         {
             //保存不良零件
             DataTable dt = (DataTable)mbp_partdgv.DataSource;
-            List<string> prodcode = new List<string>();
-            for (int i = 0; i < dt.Rows.Count; i++)
-            {
-                if (dt.Rows[i]["mbp_id"].ToString() == "")
-                    prodcode.Add(dt.Rows[i]["mbp_part"].ToString());
-            }
-            if (prodcode.Count > 0)
+            if (dt != null &&dt.Rows.Count>0)
             {
-                sql.Clear();
-                sql.Append("insert into makebadrspart(mbp_id,mbp_mbrid,mbp_part,mbp_badcode,");
-                sql.Append("mbp_brcode,mbp_sncode,mbp_makecode,mbp_indate,mbp_inman)");
-                sql.Append("select makebadrspart_seq.nextval," + mbr_id + ",:prodcode,");
-                sql.Append("'" + bc_code.Text + "','" + nr_code.Text + "','" + GetSNCode.Text + "','" + macode + "',");
-                sql.Append("sysdate,'" + User.UserCode + "' from dual");
-                dh.BatchInsert(sql.GetString(), new string[] { "prodcode" }, prodcode.ToArray());
+                List<string> prodcode = new List<string>();
+                for (int i = 0; i < dt.Rows.Count; i++)
+                {
+                    if (dt.Rows[i]["mbp_id"].ToString() == "")
+                        prodcode.Add(dt.Rows[i]["mbp_part"].ToString());
+                }
+                if (prodcode.Count > 0)
+                {
+                    sql.Clear();
+                    sql.Append("insert into makebadrspart(mbp_id,mbp_mbrid,mbp_part,mbp_badcode,");
+                    sql.Append("mbp_brcode,mbp_sncode,mbp_makecode,mbp_indate,mbp_inman)");
+                    sql.Append("select makebadrspart_seq.nextval," + mbr_id + ",:prodcode,");
+                    sql.Append("'" + bc_code.Text + "','" + nr_code.Text + "','" + GetSNCode.Text + "','" + macode + "',");
+                    sql.Append("sysdate,'" + User.UserCode + "' from dual");
+                    dh.BatchInsert(sql.GetString(), new string[] { "prodcode" }, prodcode.ToArray());
+                }
+                OperatResult.AppendText(">>不良零件保存成功\n", Color.Green);
             }
             //保存不良位置
             dt = (DataTable)mbl_locdgv.DataSource;
-            List<string> location = new List<string>();
-            for (int i = 0; i < dt.Rows.Count; i++)
-            {
-                if (dt.Rows[i]["mbl_id"].ToString() == "")
-                    location.Add(dt.Rows[i]["mbl_loc"].ToString());
-            }
-            if (location.Count > 0)
+            if (dt != null &&dt.Rows.Count>0)
             {
-                sql.Clear();
-                sql.Append("insert into makebadrsloc(mbl_id,mbl_mbrid,mbl_loc,mbl_badcode,mbl_brcode,");
-                sql.Append("mbl_sncode,mbl_makecode,mbl_indate ,mbl_inman) select makebadrsloc_seq.nextval," + mbr_id);
-                sql.Append(",:location,'" + bc_code.Text + "','" + nr_code.Text + "','" + GetSNCode.Text + "','" + macode + "',");
-                sql.Append("sysdate,'" + User.UserCode + "' from dual");
-                dh.BatchInsert(sql.GetString(), new string[] { "location" }, location.ToArray());
+                List<string> location = new List<string>();
+                for (int i = 0; i < dt.Rows.Count; i++)
+                {
+                    if (dt.Rows[i]["mbl_id"].ToString() == "")
+                        location.Add(dt.Rows[i]["mbl_loc"].ToString());
+                }
+                if (location.Count > 0)
+                {
+                    sql.Clear();
+                    sql.Append("insert into makebadrsloc(mbl_id,mbl_mbrid,mbl_loc,mbl_badcode,mbl_brcode,");
+                    sql.Append("mbl_sncode,mbl_makecode,mbl_indate ,mbl_inman) select makebadrsloc_seq.nextval," + mbr_id);
+                    sql.Append(",:location,'" + bc_code.Text + "','" + nr_code.Text + "','" + GetSNCode.Text + "','" + macode + "',");
+                    sql.Append("sysdate,'" + User.UserCode + "' from dual");
+                    dh.BatchInsert(sql.GetString(), new string[] { "location" }, location.ToArray());
+                }
+                OperatResult.AppendText(">>不良位置保存成功\n", Color.Green);
             }
-            OperatResult.AppendText(">>保存成功\n", Color.Green);
         }
 
         private void DeleteRepairInf_Click(object sender, EventArgs e)

UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -236,7 +236,7 @@ namespace UAS_MES.Make
         private void LoadBadCodeListView()
         {
             sql.Clear();
-            sql.Append("select nvl(bg_code,mb_bgcode)||':'||nvl(bg_name,mb_badcode) bg_code,bc_code,mb_badremark from makebad  ");
+            sql.Append("select nvl(bg_code,mb_bgcode)||':'||nvl(bg_name,mb_badcode) bg_code,nvl(mb_badcode,bc_code) bc_code,mb_badremark from makebad  ");
             sql.Append("left join badgroup on mb_bgcode=bg_code left join badcode on mb_badcode=bc_code ");
             sql.Append(" where mb_sncode='" + ms_sncode.Text + "' and mb_makecode='" + ma_code.Text + "'");
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");