记录登陆IP，版本号，维修作业保存不良代码提示

UAS-MES/FunctionCode/Make/Make_NewBadCode.cs

@@ -184,6 +184,7 @@ namespace UAS_MES.Make
             }
             int RejectCount = ChoosedRejectList.Items.Count;
             List<string> bccode = new List<string>();
+            List<string> bcname = new List<string>();
             List<string> bcremark = new List<string>();
             List<string> bgcode = new List<string>();
             List<string> id = new List<string>();
@@ -196,6 +197,8 @@ namespace UAS_MES.Make
                 for (int i = 0; i < RejectCount; i++)
                 {
                     bgcode.Add(ChoosedRejectList.Items[i].SubItems[1].Text);
+                    //获取不良代码的名称
+                    bcname.Add(ChoosedRejectList.Items[i].SubItems[4].Text);
                     //获取所有的不良代码
                     bccode.Add(ChoosedRejectList.Items[i].SubItems[3].Text);
                     //获取所有的不良备注
@@ -208,29 +211,33 @@ namespace UAS_MES.Make
             {
                 for (int j = 0; j < bgcode.Count; j++)
                 {
-                    if (dt.Rows[i][0].ToString() == bgcode[i])
+                    if (dt.Rows[i][0].ToString() == bccode[j])
                     {
-                        ErrorMessage += " " + bgcode[i] + " ";
-                        bgcode.Remove(bgcode[i]);
-                        bccode.Remove(bccode[i]);
-                        bcremark.Remove(bcremark[i]);
-                        id.Remove(id[i]);
+                        ErrorMessage += " " + bcname[j] + " ";
+                        bgcode.Remove(bgcode[j]);
+                        bccode.Remove(bccode[j]);
+                        bcremark.Remove(bcremark[j]);
+                        id.Remove(id[j]);
                     }
                 }
             }
             if (ErrorMessage != "")
             {
                 ErrorMessage += "重复";
+                MessageBox.Show(ErrorMessage);
+            }
+            if (bgcode.Count > 0)
+            {
+                sql.Clear();
+                sql.Append("insert into makebad(mb_id,mb_makecode,mb_mscode,mb_sncode,mb_inman,");
+                sql.Append("mb_indate,mb_stepcode,mb_sourcecode,mb_badcode,mb_bgcode,mb_badtable,mb_soncode,mb_status,mb_badremark)");
+                sql.Append("select makebad_seq.nextval,ma_code,ms_code,ms_sncode,'" + User.UserName + "',sysdate,'" + User.CurrentStepCode + "',ms_sourcecode,:bc_code,:bg_code,'',");
+                sql.Append("sp_soncode,'0',:bc_remark from make left join makeSerial on ms_makecode=ma_code left join stepProduct on ");
+                sql.Append("sp_mothercode=ma_prodcode and sp_stepcode=ms_nextstepcode where ms_sncode='" + sncode + "'");
+                dh.BatchInsert(sql.GetString(), new string[] { "bc_code", "bg_code", "bc_remark" }, bccode.ToArray(), bgcode.ToArray(), bcremark.ToArray());
+                MessageBox.Show("保存成功");
+                Close();
             }
-            sql.Clear();
-            sql.Append("insert into makebad(mb_id,mb_makecode,mb_mscode,mb_sncode,mb_inman,");
-            sql.Append("mb_indate,mb_stepcode,mb_sourcecode,mb_badcode,mb_bgcode,mb_badtable,mb_soncode,mb_status,mb_badremark)");
-            sql.Append("select :id,ma_code,ms_code,ms_sncode,'" + User.UserName + "',sysdate,'" + User.CurrentStepCode + "',ms_sourcecode,:bc_code,:bg_code,'',");
-            sql.Append("sp_soncode,'0',:bc_remark from make left join makeSerial on ms_makecode=ma_code left join stepProduct on ");
-            sql.Append("sp_mothercode=ma_prodcode and sp_stepcode=ms_nextstepcode where ms_sncode='" + sncode + "'");
-            dh.BatchInsert(sql.GetString(), new string[] { "bc_code", "id", "bc_code", "bg_code", "bc_remark" }, bccode.ToArray(), id.ToArray(), bccode.ToArray(), bgcode.ToArray(), bcremark.ToArray());
-            MessageBox.Show("保存成功");
-            Close();
         }
 
         private void badgroup_SelectedIndexChanged(object sender, EventArgs e)

UAS-MES/Login.cs

@@ -82,7 +82,6 @@ namespace UAS_MES
                     SystemInf.ScreenWidth = Screen.PrimaryScreen.WorkingArea.Width;
                     SystemInf.ScreenHeight = Screen.PrimaryScreen.WorkingArea.Height;
                     SystemInf.ConnectionString = "Data Source=" + DbComboxData.Rows[i]["ma_address"] + ";User ID=" + DbComboxData.Rows[i]["ma_user"] + ";PassWord=" + DbComboxData.Rows[i]["ms_pwd"];
-                    Console.WriteLine(SystemInf.ConnectionString);
                     DataHelper.DBConnectionString = SystemInf.ConnectionString;
                     //重新执行一遍构造函数使得重置之后的链接字符串生效
                     dh = new DataHelper();
@@ -99,6 +98,8 @@ namespace UAS_MES
                     this.Hide();
                     SetInf();//设置User的全局变量
                     LogManager.DoLog("登陆成功" + User.UserName + ",超级用户");
+                    string Version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
+                    LogicHandler.RecordLogInf(User.UserCode,User.UserName, Version, BaseUtil.GetLocalIP());
                     Main dialog = new Main();
                     dialog.ShowDialog();
                     this.Close();

UAS-MES/Properties/AssemblyInfo.cs

@@ -16,7 +16,7 @@ using System.Runtime.InteropServices;
 //将 ComVisible 设置为 false 将使此程序集中的类型
 //对 COM 组件不可见。  如果需要从 COM 访问此程序集中的类型，
 //请将此类型的 ComVisible 特性设置为 true。
-[assembly: ComVisible(false)]
+[assembly: ComVisible(true)]
 
 // 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
 [assembly: Guid("411dee44-b893-47e0-a0c2-797a3dae2466")]
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.0.1")]
+[assembly: AssemblyFileVersion("1.0.0.1")]

UAS-MES/PublicMethod/BaseUtil.cs

@@ -3,6 +3,8 @@ using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
+using System.Net;
+using System.Net.Sockets;
 using System.Reflection;
 using System.Text;
 using System.Text.RegularExpressions;
@@ -56,6 +58,31 @@ namespace UAS_MES.PublicMethod
                 item.SortMode = DataGridViewColumnSortMode.NotSortable;
         }
 
+        public static string GetLocalIP()
+        {
+            try
+            {
+                string HostName = Dns.GetHostName(); //得到主机名  
+                IPHostEntry IpEntry = Dns.GetHostEntry(HostName);
+                for (int i = 0; i < IpEntry.AddressList.Length; i++)
+                {
+                    //从IP地址列表中筛选出IPv4类型的IP地址  
+                    //AddressFamily.InterNetwork表示此IP为IPv4,  
+                    //AddressFamily.InterNetworkV6表示此地址为IPv6类型  
+                    if (IpEntry.AddressList[i].AddressFamily == AddressFamily.InterNetwork)
+                    {
+                        return IpEntry.AddressList[i].ToString();
+                    }
+                }
+                return "";
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show("获取本机IP出错:" + ex.Message);
+                return "";
+            }
+        }
+
         /// <summary>
         /// 通过字段和其展示的中文值获取查询的内容
         /// </summary>

UAS-MES/PublicMethod/LogicHandler.cs

@@ -953,6 +953,18 @@ namespace UAS_MES.PublicMethod
             dh.ExecuteSql(sql.ToString(), "insert");
         }
 
+        /// <summary>
+        /// 记录登陆信息
+        /// </summary>
+        /// <param name="iUserCode"></param>
+        /// <param name="iIP"></param>
+        public static void RecordLogInf(string iUserCode,string iUserName,string iVersion, string iIP)
+        {
+            sql.Clear();
+            sql.Append("insert into LOGINFO(ID,SIP,USCODE,USNAME,VERSIONCODE,INDATE) values(LOGINFO_seq.nextval,'" + iIP + "','" + iUserCode + "','"+ iUserName + "','"+ iVersion + "',sysdate)");
+            dh.ExecuteSql(sql.ToString(), "insert");
+        }
+
         /// <summary>
         /// 保存Mac地址和BT地址
         /// </summary>

UAS-MES/UAS-MES.csproj

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