parent: 8f24e47d | 补丁 | 提交 | ignore whitespace
yangle
2022-05-30 c7484c4ce600f47a4fe7862acf7ea8098bdbe64e 
Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
3个文件已修改
79 ■■■■■ 已修改文件
BLL/公用模块/FrmLogin.cs 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WarM/条码打印/Sc_ICMOToBarCode.cs 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 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.查找数据库操作员管理表里面是否有对应这个加密字符串对应的记录




 WarM/ÌõÂë´òÓ¡/Sc_ICMOToBarCode.cs


@@ -228,7 +228,7 @@




            DataSet DSet;




            DSet = oCn.RunProcReturn("Select * from gy_czygl Where czymc='" + HUserName + "'", "gy_czygl", ref DBUtility.ClsPub.sExeReturnInfo);


            DSet = oCn.RunProcReturn("Select HEmpID from gy_czygl Where czymc='" + HUserName + "'", "gy_czygl", ref DBUtility.ClsPub.sExeReturnInfo);


            


            if (DSet == null)


            //if (DSet == null|| DSet.Tables[0].Rows.Count == 0)


@@ -244,7 +244,7 @@


                {






                    txtHEmpID.Tag = DBUtility.ClsPub.isInt(DSet.Tables[0].Rows[0]["HEmpID"]);


                    txtHEmpID.Tag = DBUtility.ClsPub.isStrNull(DSet.Tables[0].Rows[0]["HEmpID"]);


                }


                else


                {


@@ -1022,18 +1022,19 @@


                {


                    if (HZXQty > DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells["生产订单数量"].Value))


                    {


                        //HZXQty = HZXQty - DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells["生产订单数量"].Value);


                        //grdMain.Rows[i].Cells["本次数量"].Value = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells["生产订单数量"].Value);


                        MessageBox.Show("请点击超额生产按钮生成条码！");


                        return;


                        HZXQty = HZXQty - DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells["生产订单数量"].Value);


                        grdMain.Rows[i].Cells["本次数量"].Value = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells["生产订单数量"].Value);




                        //MessageBox.Show("请点击超额生产按钮生成条码！");


                        //return;


                    }


                    else


                    {


                        //grdMain.Rows[i].Cells["本次数量"].Value = HZXQty;


                        grdMain.Rows[i].Cells["本次数量"].Value = HZXQty;


                        //




                        HZXQty = HZXQty - DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells["生产订单数量"].Value);


                        grdMain.Rows[i].Cells["本次数量"].Value = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells["生产订单数量"].Value);


                        //HZXQty = HZXQty - DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells["生产订单数量"].Value);


                        //grdMain.Rows[i].Cells["本次数量"].Value = DBUtility.ClsPub.isDoule(grdMain.Rows[i].Cells["生产订单数量"].Value);


                    }


                }


                else


@@ -1700,14 +1701,17 @@


        private void cmdHSourceID_Click(object sender, EventArgs e)


        {


            Int64 HEmpID = 0;


            HEmpID = ClsPub.isLong(txtHEmpID.Tag);


            HEmpID = Convert.ToInt64(txtHEmpID.Tag);




           


            //MessageBox.Show(ClsPub.isStrNull(HEmpID));


            //string HEmpName = "";


            //HEmpName = ClsPub.isStrNull(txtHEmpID.Text);




            DAL.ClsGy_Source_View oSource = new DAL.ClsGy_Source_View();


            if (HEmpID != 0)


            {


                if (oSource.GetInfoByID(HEmpID))


                if (oSource.GetInfoByID_AoBang(HEmpID))


                {


                    this.txtHSourceID.Text = oSource.oModel.HName;


                    this.txtHSourceID.Tag = oSource.oModel.HItemID.ToString();


@@ -1925,6 +1929,7 @@


            grdList.DataSource = null;


            grdSub.DataSource = null;


            grdMain.DataSource = null;


            txtHEmpID.Tag = 0;


        }




        private void button2_Click(object sender, EventArgs e)




 WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs


@@ -34,6 +34,7 @@


            string msg2 = sArray[0].ToString();


            string msg3 = sArray[1].ToString();


            string msg4 = sArray[2].ToString();


            string msg5 = sArray[3].ToString();




            string UserName = "";


            ListModels oListModels = new ListModels();


@@ -93,7 +94,7 @@


                //保存


                //保存完毕后处理


                bool bResult;


                if (oBill.omodel.HInterID == 0)


                if (msg5 == "xz")


                {


                    // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);


                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);