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

YL

2022-01-22 7dce710c21f02c3434cb7db21bb29f7a0426d59c

 WebAPI/Controllers/SBGL/Sb_EquipDotCheckPlanBillController.cs

@@ -20,10 +20,19 @@
        /// <returns></returns>
        [Route("Sb_EquipDotCheckPlanBill/GetEquipDotCheckPlanBillList")]
        [HttpGet]
        public object GetEquipDotCheckPlanBillList(string sWhere)
        public object GetEquipDotCheckPlanBillList(string sWhere,string user)
        {
            try
            {
                if (!DBUtility.ClsPub.Security_Log("Sb_EquipDotCheckPlanBillList", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Sb_EquipDotCheckPlanBillList " + sWhere + " order by hmainid desc", "h_v_Sb_EquipDotCheckPlanBillList");
@@ -91,12 +100,21 @@
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();
            string msg3 = sArray[1].ToString();
            string msg4 = sArray[2].ToString();


            string UserName = "";
            ListModels oListModels = new ListModels();
            try
            {
                if (!DBUtility.ClsPub.Security_Log("Sb_EquipDotCheckPlanBill_Edit", 1, false, msg4))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无保存权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                DAL.ClsSb_EquipDotCheckPlanBill oBill = new DAL.ClsSb_EquipDotCheckPlanBill();
                List<Model.ClsSb_EquipDotCheckPlanBillMain> lsmain = new List<Model.ClsSb_EquipDotCheckPlanBillMain>();
                msg2 = msg2.Replace("\\", "");
@@ -215,17 +233,17 @@
        /// <returns></returns>
        [Route("Sb_EquipDotCheckPlanBill/DeltetEquipDotCheckPlanBillList")]
        [HttpGet]
        public object DeltetEquipDotCheckPlanBillList(string HInterID)
        public object DeltetEquipDotCheckPlanBillList(string HInterID,string user)
        {
            //编辑权限
            //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, false, DBUtility.ClsPub.CurUserName))
            //{
            //    objJsonResult.code = "0";
            //    objJsonResult.count = 0;
            //    objJsonResult.Message = "无删除权限！";
            //    objJsonResult.data = null;
            //    return objJsonResult;
            //}
            if (!DBUtility.ClsPub.Security_Log("Sb_EquipDotCheckPlanBill_Delete", 1, false, user))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "无删除权限！";
                objJsonResult.data = null;
                return objJsonResult;
            }


            Int64 lngBillKey = 0;