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

YL

2022-01-19 7f7c137e8c1d26bb777f3d5abd13866ad6fde28b

 WebAPI/Controllers/生产管理/报工台工序/Sc_MESReturnStepWorkBillController.cs

@@ -101,7 +101,7 @@
        {
            DBUtility.ClsPub.CurUserName = UserName;
            //缂栬緫鏉冮檺
            if (!DBUtility.ClsPub.Security_Log_second("Sc_ProcessPlan_Drop", 1, true, DBUtility.ClsPub.CurUserName))
            if (!DBUtility.ClsPub.Security_Log_second("Sc_ProcessPlan_Drop", 1, false, DBUtility.ClsPub.CurUserName))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
@@ -188,7 +188,7 @@
            try
            {
                //瀹℃牳鏉冮檺
                if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
                if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -330,7 +330,7 @@
            DBUtility.ClsPub.CurUserName = UserName;
            
            //淇濆瓨鏉冮檺
            if (!DBUtility.ClsPub.Security_Log_second("Sc_ProcessPlan_Edit", 1, true, DBUtility.ClsPub.CurUserName))
            if (!DBUtility.ClsPub.Security_Log_second("Sc_ProcessPlan_Edit", 1, false, DBUtility.ClsPub.CurUserName))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;