Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

zzr99

2022-06-07 cdc0ee4c7019f8466327e713153a1cd147a152c0

 BLL/¹«ÓÃÄ£¿é/FrmLogin.cs

@@ -22,7 +22,7 @@
        private void SetCmbAccount(string sServer)//cmb中设置帐套  //Lock
        {
            ClsCNmaster oCn = new ClsCNmaster();
            DataSet DS ;
            DataSet DS;
            try
            {
                DS = oCn.RunProcReturn("select * from HDSystem_DataBases where YNuse=1 ", "HDSystem_DataBases", ref ClsPub.sExeReturnInfo);
@@ -40,7 +40,7 @@
                {
                    cmbAccount.SelectedIndex = 0;
                    ClsIni oIni = new ClsIni();
                    string sNumber = ClsIni.ReadIni("Erp", "DataBaseNumber",DBUtility.ClsPub.AppPath + @"/HXErp.ini");
                    string sNumber = ClsIni.ReadIni("Erp", "DataBaseNumber", DBUtility.ClsPub.AppPath + @"/HXErp.ini");
                    for (int j = 0; j < cmbAccount.Items.Count; j++)
                    {
                        if (sNumber.Trim() == cmbAccount.Items[j].ToString().Trim())
@@ -56,7 +56,7 @@

        private bool CheckServer()//检查服务器名正确性  //Lock
        {
            ClsCN oCn=new ClsCN(); 
            ClsCN oCn = new ClsCN();
            if (oCn.CheckOpen())
            {
                lblStatus.Text = "服务器连接成功";
@@ -109,19 +109,19 @@
            string sDataBase_K3 = "";
            string sDataBase_K32 = "";
            string sDataBase_K33 = "";
            sDataBase = oCn.GetDataBase(cmbAccount.Text.Trim(),ref sDataBase_K3);       
            sDataBase = oCn.GetDataBase(cmbAccount.Text.Trim(), ref sDataBase_K3);
            ClsIni oIni = new ClsIni();
            ClsIni.WriteIni("Erp", "DataBase", sDataBase.Trim(), DBUtility.ClsPub.AppPath + @"/HXERP.ini");
            ClsIni.WriteIni("K3Erp", "DataBase", sDataBase_K3.Trim(), DBUtility.ClsPub.AppPath + @"/HXERP.ini");
            DAL.ClsUser oUser = new DAL.ClsUser();
            
            ds = oUser.CheckCzymc(cmbUser.Text.Trim(),ClsPub.StrToPsd( txtPsd.Text.Trim()));
            if (ds ==null)

            ds = oUser.CheckCzymc(cmbUser.Text.Trim(), ClsPub.StrToPsd(txtPsd.Text.Trim()));
            if (ds == null)
            {
                MessageBox.Show("选择的帐套不存在！", "提示");
                return;
            }
            if (ds.Tables[0].Rows.Count >0)
            if (ds.Tables[0].Rows.Count > 0)
            {
                ClsPub.CurUserID = ds.Tables[0].Rows[0]["Czybm"].ToString();
                this.Close();
@@ -135,7 +135,7 @@
            //得到当前会计期间
            int sYear = 0;
            int sPeriod = 0;
            if (!ClsPub.Sub_GetCurPeriod(ref sYear,ref sPeriod))
            if (!ClsPub.Sub_GetCurPeriod(ref sYear, ref sPeriod))
            {
                MessageBox.Show("得到当前会计期间失败！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Error);
                isOk = false;
@@ -162,18 +162,18 @@
            }
            foreach (string eachStr in listStr)
            {
                UserName = UserName+eachStr + ",";
                UserName = UserName + eachStr + ",";
            }
            UserName = UserName.Remove(UserName.LastIndexOf(","), 1);
            //
            ClsIni.WriteIni("UserInfo", "UserName", UserName, DBUtility.ClsPub.AppPath + @"/HXERP.ini"); 
            ClsIni.WriteIni("UserInfo", "UserName", UserName, DBUtility.ClsPub.AppPath + @"/HXERP.ini");
            ClsIni.WriteIni("UserInfo", "HOrgName", cmbHOrg.Text.ToString(), DBUtility.ClsPub.AppPath + @"/HXERP.ini");
            ClsPub.CurUserName = cmbUser.Text.Trim();
            ClsPub.AppPath = System.Environment.CurrentDirectory;
            ClsPub.HOrgID = ClsPub.get_ORGANIZATIONSIDByName(ClsPub.isStrNull(cmbHOrg.Text));
            ClsPub.HOrgNumber = ClsPub.get_ORGANIZATIONSNOByName(ClsPub.isStrNull(cmbHOrg.Text));
            ClsPub.HOrgName = ClsPub.isStrNull(cmbHOrg.Text);
            if(chkRemember.Checked==true  ) 
            if (chkRemember.Checked == true)
            {
                ClsIni.WriteIni("UserInfo", "UserPsd", "", DBUtility.ClsPub.AppPath + @"/HXERP.ini");
                ClsIni.WriteIni("UserInfo", "Remember", "1", DBUtility.ClsPub.AppPath + @"/HXERP.ini");
@@ -183,7 +183,7 @@
                ClsIni.WriteIni("UserInfo", "UserPsd", "", DBUtility.ClsPub.AppPath + @"/HXERP.ini");
                ClsIni.WriteIni("UserInfo", "Remember", "0", DBUtility.ClsPub.AppPath + @"/HXERP.ini");
            }
            

        }

        private void txtUser_KeyUp(object sender, KeyEventArgs e)
@@ -194,8 +194,8 @@

        private void txtPsd_KeyUp(object sender, KeyEventArgs e)
        {
            if (e.KeyValue == 13)  
            this.btnOK_Click(sender,e);
            if (e.KeyValue == 13)
                this.btnOK_Click(sender, e);
        }

        private void timer1_Tick(object sender, EventArgs e)
@@ -207,7 +207,7 @@
            }
            ClsIni oIni = new ClsIni();
            //
            UserName = ClsIni.ReadIni("UserInfo", "UserName",DBUtility.ClsPub.AppPath +  @"/HXERP.ini");
            UserName = ClsIni.ReadIni("UserInfo", "UserName", DBUtility.ClsPub.AppPath + @"/HXERP.ini");

            string[] strArr = UserName.Split(',');
            foreach (string str in strArr)
@@ -216,7 +216,7 @@
            }
            cmbUser.SelectedIndex = 0;
            //
            txtUser.Text = ClsIni.ReadIni("UserInfo", "UserName", DBUtility.ClsPub.AppPath +  @"/HXERP.ini");
            txtUser.Text = ClsIni.ReadIni("UserInfo", "UserName", DBUtility.ClsPub.AppPath + @"/HXERP.ini");
            if (ClsIni.ReadIni("UserInfo", "Remember", DBUtility.ClsPub.AppPath + @"/HXERP.ini") == "1")
            {
                txtPsd.Text = ClsIni.ReadIni("UserInfo", "UserPsd", DBUtility.ClsPub.AppPath + @"/HXERP.ini");
@@ -224,8 +224,8 @@
            }
            else
            {
                txtPsd.Text ="";
                chkRemember.Checked = false ;
                txtPsd.Text = "";
                chkRemember.Checked = false;
            }
        }

@@ -319,8 +319,8 @@
        public DataSet get_ORGANIZATIONSList()
        {
            try
            { 
                return  ClsPub.get_ORGANIZATIONSList();
            {
                return ClsPub.get_ORGANIZATIONSList();
            }
            catch (Exception e)
            {
@@ -335,7 +335,7 @@

        private void label4_Click(object sender, EventArgs e)
        {
            if (MessageBox.Show("确定要手动更新程序吗？本程序将自动关闭！","提示",MessageBoxButtons.OKCancel)==DialogResult.OK)
            if (MessageBox.Show("确定要手动更新程序吗？本程序将自动关闭！", "提示", MessageBoxButtons.OKCancel) == DialogResult.OK)
            {
                string strFileName = ClsPub.AppPath + @"/HX_Update.exe";
                System.Diagnostics.Process.Start(strFileName);
@@ -347,6 +347,11 @@
        {
            //textBox1.Focus();
            string HPassWord = textBox1.Text.Trim().ToString();
            if (HPassWord == null || HPassWord == "")
            {
                MessageBox.Show("请刷卡");
                return;
            }
            //MessageBox.Show(HPassWord);
            SQLHelper.ClsCN oCn1 = new SQLHelper.ClsCN();
            //1.查找数据库操作员管理表里面是否有对应这个加密字符串对应的记录