|
|
@@ -14,6 +14,7 @@ namespace UAS_LabelMachine
|
|
|
DataHelper dh;
|
|
|
SqliteDBHelper sdh;
|
|
|
DataTable dt;
|
|
|
+ DataTable Masterdt;
|
|
|
|
|
|
public Login()
|
|
|
{
|
|
|
@@ -33,21 +34,21 @@ namespace UAS_LabelMachine
|
|
|
SystemInf.dh = dh = new DataHelper();
|
|
|
SystemInf.sdh = sdh = new SqliteDBHelper("LabelPrint.db3");
|
|
|
//获取账套信息
|
|
|
- dt = (DataTable)dh.ExecuteSql("select ma_function,ms_pwd,ma_user from master ", "select");
|
|
|
- DataTable MasterDB = dt.Clone();
|
|
|
- for (int i = 0; i < dt.Rows.Count; i++)
|
|
|
+ Masterdt = (DataTable)dh.ExecuteSql("select ma_function,ms_pwd,ma_user from master ", "select");
|
|
|
+ DataTable MasterDB = Masterdt.Clone();
|
|
|
+ for (int i = 0; i < Masterdt.Rows.Count; i++)
|
|
|
{
|
|
|
- if (DataHelper.Masters.Contains(dt.Rows[i]["ma_user"].ToString()))
|
|
|
+ if (DataHelper.Masters.Contains(Masterdt.Rows[i]["ma_user"].ToString()))
|
|
|
{
|
|
|
DataRow dr = MasterDB.NewRow();
|
|
|
- dr["ma_user"] = dt.Rows[i]["ma_user"];
|
|
|
- dr["ma_function"] = dt.Rows[i]["ma_function"];
|
|
|
+ dr["ma_user"] = Masterdt.Rows[i]["ma_user"];
|
|
|
+ dr["ma_function"] = Masterdt.Rows[i]["ma_function"];
|
|
|
MasterDB.Rows.Add(dr);
|
|
|
}
|
|
|
}
|
|
|
MasterCombox.DisplayMember = "ma_function";
|
|
|
MasterCombox.ValueMember = "ma_user";
|
|
|
- MasterCombox.DataSource = dt;
|
|
|
+ MasterCombox.DataSource = Masterdt;
|
|
|
//读取上次登陆时的用户名和选择的账套
|
|
|
UserName.Text = Properties.Settings.Default.LastLoginUser;
|
|
|
MasterCombox.Text = Properties.Settings.Default.LastLoginMaster;
|
|
|
@@ -67,10 +68,10 @@ namespace UAS_LabelMachine
|
|
|
{
|
|
|
//根据匹配的账套在DataTable查找到对应的密码
|
|
|
string Ms_Pwd = "";
|
|
|
- for (int i = 0; i < dt.Rows.Count; i++)
|
|
|
+ for (int i = 0; i < Masterdt.Rows.Count; i++)
|
|
|
{
|
|
|
- if (MasterCombox.SelectedValue == dt.Rows[i]["ma_user"])
|
|
|
- Ms_Pwd = dt.Rows[i]["ms_pwd"].ToString();
|
|
|
+ if (MasterCombox.SelectedValue == Masterdt.Rows[i]["ma_user"])
|
|
|
+ Ms_Pwd = Masterdt.Rows[i]["ms_pwd"].ToString();
|
|
|
}
|
|
|
//切换至用户选择的数据源
|
|
|
string ConnectionString = "Connection Timeout=0;Pooling=false;Password=" + Ms_Pwd + ";User ID=" + MasterCombox.SelectedValue.ToString() + ";Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=" + IP.Text + ")(PORT=" + DataHelper.OraclePort + ")))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
|
|
|
@@ -80,7 +81,7 @@ namespace UAS_LabelMachine
|
|
|
string oMsg = "";
|
|
|
if (HttpHandler.CheckUserLogin(UserName.Text, PassWord.Text, MasterCombox.SelectedValue.ToString(), out oMsg))
|
|
|
{
|
|
|
- dt = (DataTable)dh.ExecuteSql("select em_name,em_type from employee where em_code='" + UserName.Text + "'", "select");
|
|
|
+ dt = (DataTable)dh.ExecuteSql("select em_name,em_type from employee where upper(em_code)='" + UserName.Text.ToUpper() + "'", "select");
|
|
|
User.UserName = dt.Rows[0]["em_name"].ToString();
|
|
|
User.UserCode = UserName.Text;
|
|
|
User.UserAccountType = dt.Rows[0]["em_type"].ToString();
|