修改组件和原因不能重复

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

@@ -214,7 +214,7 @@
             this.badgroup.Location = new System.Drawing.Point(123, 134);
             this.badgroup.Margin = new System.Windows.Forms.Padding(2);
             this.badgroup.Name = "badgroup";
-            this.badgroup.Size = new System.Drawing.Size(153, 20);
+            this.badgroup.Size = new System.Drawing.Size(226, 20);
             this.badgroup.TabIndex = 95;
             this.badgroup.SelectedIndexChanged += new System.EventHandler(this.badgroup_SelectedIndexChanged);
             // 

UAS-MES/FunctionCode/Make/Make_NewBadCode.cs

@@ -60,7 +60,7 @@ namespace UAS_MES.Make
             ms_sncode.Text = sncode;
             string pr_code = dh.getFieldDataByCondition("makeserial", "ms_prodcode", "ms_sncode='" + sncode + "' and ms_makecode='" + macode + "'").ToString();
             sql.Clear();
-            sql.Append("select bg_code,bg_name from product left join productkind  on pr_kind =pk_name ");
+            sql.Append("select bg_code||':'||bg_name bg_code,bg_name from product left join productkind  on pr_kind =pk_name ");
             sql.Append("left join productbadgroup  on  pb_kindcode= pk_code left join badgroup on ");
             sql.Append("bg_code=pb_badgroup  where pr_code='" + pr_code + "' and nvl(pb_kindcode,'')<>''");
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
@@ -68,7 +68,7 @@ namespace UAS_MES.Make
             if (dt.Rows.Count == 0)
             {
                 sql.Clear();
-                sql.Append("select bg_code from badgroup where bg_statuscode='AUDITED'");
+                sql.Append("select bg_code||':'||bg_name bg_code from badgroup where bg_statuscode='AUDITED'");
                 dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                 badgroup.DataSource = dt;
                 badgroup.DisplayMember = "bg_code";
@@ -251,7 +251,7 @@ namespace UAS_MES.Make
         private void LoadBadCodeListView()
         {
             sql.Clear();
-            sql.Append("select bg_code,bg_name,bc_code,bc_name,bc_note from badcode left join badgroup on bc_groupcode=bg_code where bc_groupcode='" + badgroup.Text + "' and bg_code is not null");
+            sql.Append("select bg_code,bg_name,bc_code,bc_name,bc_note from badcode left join badgroup on bc_groupcode=bg_code where bc_groupcode='" + badgroup.Text.Split(':')[0] + "' and bg_code is not null");
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
             //往listview中添加数据
             WaitRejectList.Items.Clear();

UAS-MES/FunctionCode/Make/Make_NewMatainInf.cs

@@ -141,12 +141,12 @@ namespace UAS_MES.Make
             return CheckedNum;
         }
 
-        private string GetListViewSelectedItemText(ListView lsv)
+        private string GetListViewSelectedItemText(ListView lsv, int ItemIndex)
         {
             for (int i = lsv.Items.Count - 1; i >= 0; i--)
             {
                 if (lsv.Items[i].Selected)
-                    return lsv.Items[i].SubItems[0].Text;
+                    return lsv.Items[i].SubItems[ItemIndex].Text;
             }
             return null;
         }
@@ -175,26 +175,34 @@ namespace UAS_MES.Make
             if (ErrorMessage == "")
             {
                 ErrorMessage = "";
-                string mbccomponent = GetListViewSelectedItemText(mbc_component_lsv);
-                string nrgcode = GetListViewSelectedItemText(nrg_name_lsv);
-                string nrcode = GetListViewSelectedItemText(nr_name_lsv);
-                string mbrdutycode = GetListViewSelectedItemText(mbr_dutycode_lsv);
-                string mbrsolutioncode = GetListViewSelectedItemText(mbr_solutioncode_lsv);
+                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");
-                    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,");
-                    sql.Append("mbr_inman) select '" + mbid + "','" + mbr_id + "','" + nrcode + "',");
-                    sql.Append("'" + mbrsolutioncode + "','" + mbrdutycode + "','" + nrgcode + "','" + bccode + "',");
-                    sql.Append("'" + sncode + "','" + macode + "',sysdate,'" + User.UserCode + "' from dual");
-                    dh.ExecuteSql(sql.GetString(), "insert");
+                    if (!dh.CheckExist("makebadreason", "mbr_sncode='" + sncode + "' and mbr_brcode='" + nrcode + "' and mbr_badcode='" + bccode + "'"))
+                    {
+                        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,");
+                        sql.Append("mbr_inman) select '" + mbid + "','" + mbr_id + "','" + nrcode + "',");
+                        sql.Append("'" + mbrsolutioncode + "','" + mbrdutycode + "','" + nrgcode + "','" + bccode + "',");
+                        sql.Append("'" + sncode + "','" + macode + "',sysdate,'" + User.UserCode + "' from dual");
+                        dh.ExecuteSql(sql.GetString(), "insert");
+                        MessageBox.Show("不良原因保存成功");
+                    }
+                    else {
+                        ErrorMessage = "不良代码【" + bc_name.Text + "】已存在不良原因【" + nrname + "】";
+                    }
                     if (mbccomponent != "" || mbccomponent != null)
                     {
-                        if (!dh.CheckExist("makebadrscom", "mbc_sncode='" + sncode + "' and mbc_component='" + mbccomponent + "'"))
+                        if (!dh.CheckExist("makebadrscom", "mbc_badcode='" + bccode + "' and mbc_sncode='" + sncode + "' and mbc_component='" + mbccomponent + "'"))
                         {
                             sql.Clear();
                             sql.Append("insert into makebadrscom (mbc_id,mbc_mbrid,mbc_component,mbc_badcode,");
@@ -207,14 +215,11 @@ namespace UAS_MES.Make
                     }
                     if (ErrorMessage != "")
                         MessageBox.Show(ErrorMessage);
-                    else
-                        Close();
+                    else Close();
                 }
-                else
-                    MessageBox.Show("序列号错误，不存在或者不处于维修状态");
+                else MessageBox.Show("序列号错误，不存在或者不处于维修状态");
             }
-            else
-                MessageBox.Show(ErrorMessage + "未勾选");
+            else MessageBox.Show(ErrorMessage + "未勾选");
         }
 
         private void ListView_ItemSelectionChanged(object sender, ListViewItemSelectionChangedEventArgs e)

UAS-MES/FunctionCode/Make/Make_Repair.cs

@@ -236,7 +236,7 @@ namespace UAS_MES.Make
                     dic1.Add("nrg_name", dt1.Rows[j]["nrg_name"].ToString());
                     dic1.Add("nr_name", dt1.Rows[j]["nr_name"].ToString());
                     dic1.Add("nr_code", dt1.Rows[j]["nr_code"].ToString());
-                    tnode_1.Text = dt1.Rows[j]["mbr_brgcode"].ToString();
+                    tnode_1.Text = dt1.Rows[j]["nr_name"].ToString();
                     if (!BadInf_2.ContainsKey(mbr_id))
                         BadInf_2.Add(mbr_id, dic1);
                     tnode_0.Nodes.Add(tnode_1);

UAS-MES/UAS-MES.csproj

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