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

ch

2022-01-19 a09ff1d01aeebae9037118035f10e06c570b092e

 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs

@@ -283,7 +283,7 @@
            try
            {
                //删除权限
                //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
                //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
@@ -353,7 +353,7 @@
        {
            try
            {
                if (!DBUtility.ClsPub.Security_Log(ModRightNameSelect, 1, true, user))
                if (!DBUtility.ClsPub.Security_Log(ModRightNameSelect, 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -517,7 +517,7 @@
            string msg4 = sArray[2].ToString();//当前人

            oCN.BeginTran();
            if (!DBUtility.ClsPub.Security_Log(msg3, 1, true, msg4))
            if (!DBUtility.ClsPub.Security_Log(msg3, 1, false, msg4))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
@@ -675,7 +675,7 @@
            string msg4 = sArray[2].ToString();//当前人
            try
            {
                if (!DBUtility.ClsPub.Security_Log(msg3, 1, true, msg4))
                if (!DBUtility.ClsPub.Security_Log(msg3, 1, false, msg4))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -855,7 +855,7 @@
            DAL.ClsGy_MouldFile oBill = new DAL.ClsGy_MouldFile();
            try
            {
                if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, user))
                if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -972,7 +972,7 @@
            try
            {
                //审核权限
                if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
                if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;