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

zzr99

2022-01-20 5b0c45a5813e7cbff1cf4871dbeb239b7e3900bc

 WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs

@@ -1425,7 +1425,7 @@
        //public object DeltetMouldRepairWorkBill(string HInterID)
        //{
        //    //编辑权限
        //    //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
        //    //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
        //    //{
        //    //    objJsonResult.code = "0";
        //    //    objJsonResult.count = 0;
@@ -1512,7 +1512,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;
@@ -1844,7 +1844,7 @@
        //public object DeltetMouldRepairCheckBill(string HInterID)
        //{
        //    //编辑权限
        //    //if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairCheckBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
        //    //if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairCheckBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
        //    //{
        //    //    objJsonResult.code = "0";
        //    //    objJsonResult.count = 0;
@@ -2125,7 +2125,7 @@
        //public object DeltetMouldConkBookBill(string HInterID)
        //{
        //    //编辑权限
        //    //if (!DBUtility.ClsPub.Security_Log("Sc_MouldConkBookBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
        //    //if (!DBUtility.ClsPub.Security_Log("Sc_MouldConkBookBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
        //    //{
        //    //    objJsonResult.code = "0";
        //    //    objJsonResult.count = 0;
@@ -2396,7 +2396,7 @@
        //public object DeltetMouldMaintainPlanBill(string HInterID)
        //{
        //    //编辑权限
        //    //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
        //    //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
        //    //{
        //    //    objJsonResult.code = "0";
        //    //    objJsonResult.count = 0;
@@ -2997,7 +2997,7 @@
        //public object DeltetSc_MouldDotCheckBill(string HInterID)
        //{
        //    //编辑权限
        //    //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
        //    //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
        //    //{
        //    //    objJsonResult.code = "0";
        //    //    objJsonResult.count = 0;
@@ -3270,7 +3270,7 @@
        //public object DeltetSc_MouldDotCheckPlanBillBill(string HInterID)
        //{
        //    //编辑权限
        //    //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
        //    //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
        //    //{
        //    //    objJsonResult.code = "0";
        //    //    objJsonResult.count = 0;
@@ -3997,7 +3997,7 @@
        //public object DeltetMouldScrapOutHouseBill(string HInterID)
        //{
        //    //编辑权限
        //    //if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapOutBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
        //    //if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapOutBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
        //    //{
        //    //    objJsonResult.code = "0";
        //    //    objJsonResult.count = 0;
@@ -4084,7 +4084,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;
@@ -4219,7 +4219,7 @@
            try
            {
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairIn_SingleBillList", 1, true, user))
                if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairIn_SingleBillList", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -4341,7 +4341,7 @@
            try
            {
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairIn_SingleBill_Edit", 1, true, msg4))
                if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairIn_SingleBill_Edit", 1, false, msg4))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -4485,6 +4485,8 @@
                }
                if (bResult)
                {
                    string sql = $"exec h_p_Sc_MouldChangeFileStatus  'in','{oBill.omodel.HInterID.ToString()}' ";
                    oCn.RunProc(sql);
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "保存成功！";
@@ -4529,7 +4531,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;
@@ -4636,7 +4638,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;
@@ -4739,7 +4741,7 @@
        public object DeltetMouldRepairInBill(string HInterID,string user)
        {
            //编辑权限
            if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairIn_SingleBill_Delete", 1, true, user))
            if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairIn_SingleBill_Delete", 1, false, user))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
@@ -4833,7 +4835,7 @@
        {
            //flag=1 审核；  flag=2 反审核
            //编辑权限
            if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairIn_SingleBill_Check", 1, true, user))
            if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairIn_SingleBill_Check", 1, false, user))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
@@ -5167,7 +5169,7 @@
        //public object DeltetMouldProdOutBill(string HInterID)
        //{
        //    //编辑权限
        //    //if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdBackBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
        //    //if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdBackBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
        //    //{
        //    //    objJsonResult.code = "0";
        //    //    objJsonResult.count = 0;
@@ -5497,7 +5499,7 @@
        //public object DeltetMouldLifeChangeBill(string HInterID)
        //{
        //    //编辑权限
        //    //if (!DBUtility.ClsPub.Security_Log("Sc_MouldLifeChangeBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
        //    //if (!DBUtility.ClsPub.Security_Log("Sc_MouldLifeChangeBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
        //    //{
        //    //    objJsonResult.code = "0";
        //    //    objJsonResult.count = 0;