修改BUG

UAS-MES/DataOperate/DataHelper.cs

@@ -32,7 +32,7 @@ namespace UAS_MES.DataOperate
                     connection = new OracleConnection(DBConnectionString);
                 connection.Open();
             }
-            catch (Exception e) { /*OracleConnection.ClearPool(connection);*/ LogManager.DoLog(e.Message); }
+            catch (Exception e) { LogManager.DoLog(e.Message); }
         }
 
         /// <summary>
@@ -1092,7 +1092,10 @@ namespace UAS_MES.DataOperate
         private void Reconnect(OracleCommand cmd)
         {
             if (cmd.Connection.State == ConnectionState.Closed)
+            {
                 cmd.Connection.Open();
+                LogManager.DoLog("超时重连");
+            }
         }
     }
 }

UAS-MES/FunctionCode/Make/Make_NewMatainInf.cs

@@ -125,12 +125,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;
         }
@@ -159,23 +159,28 @@ 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_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,");
+                        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 MessageBox.Show("不良代码"+bc_name.Text+"已存在不良原因"+ nrname);
                     if (mbccomponent != "" || mbccomponent != null)
                     {
                         if (!dh.CheckExist("makebadrscom", "mbc_sncode='" + sncode + "' and mbc_component='" + mbccomponent + "'"))
@@ -194,11 +199,9 @@ namespace UAS_MES.Make
                     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

@@ -165,6 +165,13 @@ namespace UAS_MES.Make
             }
             if (e.Node.Level == 1)
             {
+                //展示父节点信息
+                mb_id = e.Node.Parent.Tag.ToString();
+                bc_name.Text = BadInf_1[mb_id]["bc_name"];
+                bc_code.Text = BadInf_1[mb_id]["mb_badcode"];
+                bg_name.Text = BadInf_1[mb_id]["bg_name"];
+                bg_code.Text = BadInf_1[mb_id]["mb_bgcode"];
+                //展示子节点信息
                 mbr_id = e.Node.Tag.ToString();
                 nrg_name.Text = BadInf_2[mbr_id]["nrg_name"];
                 nr_name.Text = BadInf_2[mbr_id]["nr_name"];
@@ -236,7 +243,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);
@@ -287,7 +294,7 @@ namespace UAS_MES.Make
                 else
                 {
                     dh.UpdateByCondition("makeserial", "ms_nextstepcode='" + cd_stepcode.Text + "',ms_craftcode='" + cr_code.Text + "',ms_stepcode='" + User.CurrentStepCode + "',ms_status=1", "ms_sncode='" + ms_sncode.Text + "'");
-                    dh.ExecuteSql(insert_makeprocess.Replace("#", "完成维修"), "insert", ms_sncode.Text, User.CurrentStepCode);
+                    LogicHandler.InsertMakeProcess(ms_sncode.Text,ms_makecode.Text,User.UserSourceCode,"回流工序","完成维修回流",User.UserCode);
                     OperatResult.AppendText(">>" + ms_sncode.Text + " 序列号回流成功\n", Color.Green);
                     BaseUtil.CleanForm(this);
                     BadCodeTree.Nodes.Clear();

UAS-MES/Login.cs

@@ -98,7 +98,7 @@ namespace UAS_MES
                 {
                     this.Hide();
                     SetInf();//设置User的全局变量
-                    LogManager.DoLog("登陆成功" + User.UserName + ",超级用户");
+                    LogManager.DoLog("登陆成功" + User.UserName +"  "+User.UserAccountType);
                     Main dialog = new Main();
                     dialog.ShowDialog();
                     this.Close();

UAS-MES/PublicMethod/LogicHandler.cs

@@ -918,9 +918,9 @@ namespace UAS_MES.PublicMethod
         /// <param name="iSnCode"></param>
         /// <param name="iMakeCode"></param>
         /// <param name="iMPKind"></param>
-        /// <param name="result"></param>
-        /// <param name="iUserName"></param>
-        public static void InsertMakeProcess(string iSnCode, string iMakeCode,string iSourceCode, string iMPKind, string result, string iUserName)
+        /// <param name="iResult"></param>
+        /// <param name="iUserCode"></param>
+        public static void InsertMakeProcess(string iSnCode, string iMakeCode,string iSourceCode, string iMPKind, string iResult, 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 + "','" + result + "',sysdate,'" + iUserName + "',ma_wccode,'"+ LineCode + "','"+ iSourceCode + "',");
+            sql.Append("ma_craftcode,ma_craftname,'" + iMPKind + "','" + iResult + "',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");