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

jhz

2022-07-26 1f49f98a07ae1c31a1967c5c36b382d6c855becd

 WebAPI/Controllers/BaseSet/Gy_SourceController.cs

@@ -52,22 +52,23 @@
                    string sql = sql1 + sWhere+ " order by 生产资源代码 ";
                    ds = oCN.RunProcReturn(sql, "h_v_IF_SourceList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "false！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }

                //if (ds.Tables[0].Rows.Count != 0 || ds != null)
                //{
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
                //}
                //else
                //{
                //objJsonResult.code = "0";
                //objJsonResult.count = 0;
                //objJsonResult.Message = "无数据";
                //objJsonResult.data = null;
                //return objJsonResult;
                //}
            }
            catch (Exception e)
            {
@@ -90,18 +91,17 @@
        {
            DataSet ds;
            var _value = msg["msg"].ToString();
            string[] sArray = _value.ToString().Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg3 = _value.ToString();
            string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg1 = sArray[0].ToString();
            string user = sArray[1].ToString();
            //string msg2 = sArray[0].ToString();
            //string msg3 = sArray[1].ToString();
            string msg2 = sArray[1].ToString();

            //判断是否有编辑权限
            if (!DBUtility.ClsPub.Security_Log("Gy_Source_Edit", 1, false, user))
            //查看权限
            if (!DBUtility.ClsPub.Security_Log("Gy_Source_Edit", 1, false, msg2))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "无权限编辑!";
                objJsonResult.Message = "无保存权限！";
                objJsonResult.data = null;
                return objJsonResult;
            }
@@ -305,15 +305,14 @@
        public object DeltetGy_Source(string HItemID,string user)
        {
            DataSet ds;
            string ModRightNameCheck = "Gy_Source_Delete";
            try
            {
                //删除权限
                if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, user))
                if (!DBUtility.ClsPub.Security_Log("Gy_Source_Delete", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "审核失败！无权限！";
                    objJsonResult.Message = "无删除权限";
                    objJsonResult.data = null;
                    return objJsonResult;
                }