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

沈泽

2021-10-19 0b9e075066b540c5452b667afe617d4463c1cbca

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

 Pub_Class/CustomerCls/ClsPub.cs

@@ -814,6 +814,116 @@
            }
        }

        public static bool Security_Log_second(string gnsy, int LogTF, bool Msg, string CurUserName)
        {
            //gnsy 功能索引,模块
            //usercode 当前用户代码
            //LogTF 1判断权限并写日志，2只写日志，3只判断权限
            //Msg 没有权限时 是否提示框
            string UserID = CurUserName;
            try
            {
                ClsSqlHelper oCn = new ClsSqlHelper();
                DataSet Ds = new DataSet();
                DataSet DsUser = new DataSet();
                DataSet DsJS = new DataSet();//角色
                long ModID = 0;
                bool HavRight = false;
                //找到模块权限
                Ds = oCn.RunProcReturn("select * from xt_xtgnb where gnsy='" + gnsy.Trim() + "'", "xt_xtgnb");
                if (Ds.Tables[0].Rows.Count == 0)
                {
                    if (Msg == true)
                    {
                        return false;
                        //MessageBox.Show("没有找到该功能模块！", "提示");
                    }
                    return false;
                }
                else
                {
                    ModID = ClsPub.isLong(Ds.Tables[0].Rows[0]["ID"].ToString());  //返回模块
                }
                if (LogTF == 1 || LogTF == 3)//需要判断权限
                {
                    //根据用户名称判断权限
                    DsUser = oCn.RunProcReturn("select * from gy_czygl where czymc='" + UserID.Trim() + "'", "gy_czygl");
                    if (DsUser.Tables[0].Rows.Count == 0)
                    {
                        if (Msg == true)
                        {
                            return false;
                            //MessageBox.Show("没有找到当前操作员！", "提示");
                        }
                        return false;
                    }
                    //根据用户名称判断权限
                    if ((bool)DsUser.Tables[0].Rows[0]["ManagerFlag"])  //是否管理员
                    {
                        HavRight = true;
                    }
                    else
                    {
                        if (DsUser.Tables[0].Rows[0]["AuthorityID"].ToString().Trim().Substring((int)ModID - 1, 1) == "1")
                        {
                            HavRight = true;
                        }
                        else
                        {
                            //获取用户组  并循环判断权限
                            //判断角色是否有权限
                            DsJS = oCn.RunProcReturn("select isnull(AuthorityID,'') AuthorityID from System_UserGroupinfo a inner join System_UserGroup b on a.GroupID=b.GroupID " +
                                " Where a.USERID='" + UserID.Trim() + "'", "gy_czygl");
                            if (DsJS == null)
                            {
                                HavRight = false;
                            }
                            else
                            {
                                HavRight = false;
                                for (int i = 0; i < DsJS.Tables[0].Rows.Count; i++)
                                {
                                    if (ClsPub.isStrNull(DsJS.Tables[0].Rows[i]["AuthorityID"]).Length > ModID)
                                    {
                                        if (DsJS.Tables[0].Rows[i]["AuthorityID"].ToString().Trim().Substring((int)ModID - 1, 1) == "1")
                                        {
                                            HavRight = true;
                                            break;
                                        }
                                    }
                                }

                            }
                        }
                    }

                    if (HavRight == false)
                    {
                        if (Msg == true)
                        {
                            return false;
                            //MessageBox.Show("您没有权限,请与管理员联系！", "提示");
                        }
                    }
                }
                //需要写入日志
                if ((LogTF == 1 && HavRight) || LogTF == 2)
                {
                    Add_Log(Ds.Tables[0].Rows[0]["id"].ToString().Trim(), gnsy + "," + Ds.Tables[0].Rows[0]["gnmc"].ToString().Trim(), CurUserName);
                }
                return HavRight;
            }
            catch (Exception e)
            {
                if (Msg == true)
                {
                    return false;
                    //MessageBox.Show("判断权限时发现错误,请与管理员联系！", "提示");
                }
                return false;
            }
        }

        //判断是都存在权限,并写入日志
        public static bool Security_Log(string gnsy, int LogTF, bool Msg, string CurUserName, ClsSqlHelper oCn)
        {

 WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs

@@ -481,7 +481,7 @@
                //}

                //判断权限
                if (!ClsPub.Security_Log("MES_StationEntrustInBill_Edit", 1, true, CurUserName))
                if (!ClsPub.Security_Log_second("MES_StationEntrustInBill_Edit", 1, true, CurUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -745,7 +745,7 @@
            {

                //编辑权限
                if (!DBUtility.ClsPub.Security_Log("MES_StationEntrustInBill_Delete", 1, true, HDeleteMan))
                if (!DBUtility.ClsPub.Security_Log_second("MES_StationEntrustInBill_Delete", 1, true, HDeleteMan))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;

 WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs

@@ -88,7 +88,7 @@
            try
            {
                //编辑权限 
                if (!DBUtility.ClsPub.Security_Log("Sc_MouldMoveStockStepInBillList", 1, true, user))
                if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepInBillList", 1, true, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -219,7 +219,7 @@
            ListModels oListModels = new ListModels();
            try
            {
                if (!DBUtility.ClsPub.Security_Log("Sc_MouldMoveStockStepInBill_Edit", 1, true, msg4))
                if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepInBill_Edit", 1, true, msg4))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -352,7 +352,7 @@
        public object DeltetMouldMoveStockStepInBill(string HInterID,string user)
        {
            //编辑权限
            if (!DBUtility.ClsPub.Security_Log("Sc_MouldMoveStockStepInBill_Delete", 1, true, user))
            if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepInBill_Delete", 1, true, user))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;

 WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs

@@ -88,7 +88,7 @@
            try
            {
                //编辑权限 
                if (!DBUtility.ClsPub.Security_Log("Sc_MouldMoveStockStepOutBillList", 1, true, user))
                if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepOutBillList", 1, true, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -220,7 +220,7 @@
            ListModels oListModels = new ListModels();
            try
            {
                if (!DBUtility.ClsPub.Security_Log("Sc_MouldMoveStockStepOutBill_Edit", 1, true, msg4))
                if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepOutBill_Edit", 1, true, msg4))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -353,7 +353,7 @@
        public object DeltetMouldMoveStockStepOutBil(string HInterID,string user)
        {
            //编辑权限 
            if (!DBUtility.ClsPub.Security_Log("Sc_MouldMoveStockStepOutBill_Delete", 1, true, user))
            if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepOutBill_Delete", 1, true, user))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;

 WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs

@@ -88,7 +88,7 @@
            try
            {
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log("Sc_MouldOtherOutBillList", 1, true, user))
                if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldOtherOutBillList", 1, true, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -218,7 +218,7 @@
            try
            {
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log("Sc_MouldOtherOutBill_Edit", 1, true, msg4))
                if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldOtherOutBill_Edit", 1, true, msg4))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -351,7 +351,7 @@
        public object DeltetMouldOtherOutBill(string HInterID,string user)
        {
            //编辑权限
            if (!DBUtility.ClsPub.Security_Log("Sc_MouldOtherInBill_Delete", 1, true,user))
            if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldOtherInBill_Delete", 1, true,user))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;

 WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs

@@ -28,7 +28,7 @@
            try
            {
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdInBillList", 1, true, user))
                if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBillList", 1, true, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -92,7 +92,7 @@
        public object set_DeleteBill(string HInterID,string user)
        {
            //编辑权限
            if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdInBill_Delete", 1, true, user))
            if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBill_Delete", 1, true, user))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
@@ -186,7 +186,7 @@
            try
            {
                //审核权限
                if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
                if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -293,7 +293,7 @@
            try
            {
                //审核权限
                if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
                if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -478,7 +478,7 @@
            try
            {
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdInBill_Edit", 1, true, msg4))
                if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBill_Edit", 1, true, msg4))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;

 WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs

@@ -88,7 +88,7 @@
            try
            {
                //编辑权限 
                if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdMoveBillList", 1, true, user))
                if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdMoveBillList", 1, true, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -220,7 +220,7 @@
            ListModels oListModels = new ListModels();
            try
            {
                if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdMoveBill_Edit", 1, true, msg4))
                if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdMoveBill_Edit", 1, true, msg4))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -353,7 +353,7 @@
        public object DeltetMouldProdMoveBilll(string HInterID,string user)
        {
            //编辑权限
            if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdMoveBill_Delete", 1, true, user))
            if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdMoveBill_Delete", 1, true, user))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;

 WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs

@@ -28,7 +28,7 @@
            try
            {
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairChangeBillList", 1, true, user))
                if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairChangeBillList", 1, true, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -92,7 +92,7 @@
        public object set_DeleteBill(string HInterID,string user)
        {
            //编辑权限
            if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairChangeBill_Delete", 1, true, user))
            if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairChangeBill_Delete", 1, true, user))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
@@ -186,7 +186,7 @@
            try
            {
                ////审核权限
                //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
                //if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
@@ -293,7 +293,7 @@
            try
            {
                ////审核权限
                //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
                //if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
@@ -426,7 +426,7 @@
            try
            {
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairChangeBill_Edit", 1, true, msg3))
                if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairChangeBill_Edit", 1, true, msg3))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;

 WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs

@@ -31,7 +31,7 @@
                if (ds == null)
                {
                    //编辑权限
                    if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairOut_SingleBillList", 1, true, user))
                    if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairOut_SingleBillList", 1, true, user))
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
@@ -91,7 +91,7 @@
        public object set_DeleteBill(string HInterID,string user)
        {
            //编辑权限
            if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairOut_SingleBill_Delete", 1, true, user))
            if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairOut_SingleBill_Delete", 1, true, user))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
@@ -192,7 +192,7 @@
            try
            {
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairOut_SingleBill_Edit", 1, true, msg4))
                if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairOut_SingleBill_Edit", 1, true, msg4))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -380,7 +380,7 @@
            try
            {
                //审核权限
                if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
                if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -487,7 +487,7 @@
            try
            {
                //审核权限
                if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
                if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;

 WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs

@@ -28,7 +28,7 @@
            try
            {
                //审核权限
                if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
                if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -135,7 +135,7 @@
            try
            {
                //审核权限
                if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
                if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -238,7 +238,7 @@
        public object set_DeleteBill(string HInterID,string user)
        {
            //编辑权限
            if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapInBill_Delete", 1, true, user))
            if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldScrapInBill_Delete", 1, true, user))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
@@ -324,7 +324,7 @@
            try
            {
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapRequestBillList", 1, true, user))
                if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldScrapRequestBillList", 1, true, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;

 WebAPI/Controllers/SBGL/Sb_EquipDotCheckBillController.cs

@@ -223,7 +223,7 @@
        public object DeltetEquipDotCheckBillList(string HInterID)
        {
            //编辑权限
            //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
            //if (!DBUtility.ClsPub.Security_Log_second("Sb_MouldRepairWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
            //{
            //    objJsonResult.code = "0";
            //    objJsonResult.count = 0;

 WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs

@@ -326,7 +326,7 @@
        public object DeltetMouldLifeChangeBill(string HInterID)
        {
            //编辑权限
            //if (!DBUtility.ClsPub.Security_Log("Sc_ICMOReportBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
            //if (!DBUtility.ClsPub.Security_Log_second("Sc_ICMOReportBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
            //{
            //    objJsonResult.code = "0";
            //    objJsonResult.count = 0;
@@ -420,7 +420,7 @@
            try
            {
                //审核权限
                if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
                if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;

 WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs

@@ -205,7 +205,7 @@
        {
            DBUtility.ClsPub.CurUserName = UserName;
            //编辑权限
            if (!DBUtility.ClsPub.Security_Log("MES_MESBeginWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
            if (!DBUtility.ClsPub.Security_Log_second("MES_MESBeginWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
@@ -292,7 +292,7 @@
            try
            {
                //审核权限
                if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
                if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -476,7 +476,7 @@
            string refSav = sArray[2].ToString();
            DBUtility.ClsPub.CurUserName = UserName;
            //保存权限
            if (!DBUtility.ClsPub.Security_Log("MES_MESBeginWorkBill_Edit", 1, true, DBUtility.ClsPub.CurUserName))
            if (!DBUtility.ClsPub.Security_Log_second("MES_MESBeginWorkBill_Edit", 1, true, DBUtility.ClsPub.CurUserName))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;

 WebAPI/Controllers/SCGL/Sc_MESEndWorkBillController.cs

@@ -200,7 +200,7 @@
        {
            DBUtility.ClsPub.CurUserName = UserName;
            //编辑权限
            if (!DBUtility.ClsPub.Security_Log("MES_MESEndWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
            if (!DBUtility.ClsPub.Security_Log_second("MES_MESEndWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
@@ -287,7 +287,7 @@
            try
            {
                //审核权限
                if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
                if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -432,7 +432,7 @@
            DBUtility.ClsPub.CurUserName = UserName;

            //保存权限
            if (!DBUtility.ClsPub.Security_Log("MES_MESEndWorkBill_Edit", 1, true, DBUtility.ClsPub.CurUserName))
            if (!DBUtility.ClsPub.Security_Log_second("MES_MESEndWorkBill_Edit", 1, true, DBUtility.ClsPub.CurUserName))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;

 WebAPI/Controllers/SCGL/Sc_MESStopWorkBillController.cs

@@ -192,7 +192,7 @@
        {
            DBUtility.ClsPub.CurUserName = UserName;
            //编辑权限
            if (!DBUtility.ClsPub.Security_Log("MES_MESStopWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
            if (!DBUtility.ClsPub.Security_Log_second("MES_MESStopWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
@@ -280,7 +280,7 @@
            try
            {
                //审核权限
                if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
                if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -425,7 +425,7 @@
            DBUtility.ClsPub.CurUserName = UserName;

            //保存权限
            if (!DBUtility.ClsPub.Security_Log("MES_MESStopWorkBill_Edit", 1, true, DBUtility.ClsPub.CurUserName))
            if (!DBUtility.ClsPub.Security_Log_second("MES_MESStopWorkBill_Edit", 1, true, DBUtility.ClsPub.CurUserName))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;