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

jhz

2022-09-22 81456046161696d3e1e31a8d9eb428f3b7a3442f

 WebAPI/Controllers/BaseSet/Gy_StockPlaceController.cs

@@ -17,84 +17,34 @@
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        DataSet ds;


        /// <summary>
        /// 返回部门列表
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Gy_Department/list")]
        [HttpGet]
        public object list(string sWhere)
        {
            try
            {
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_IF_DepartmentList " + sWhere, "h_v_IF_DepartmentList");
                }
                else
                {
                    string sql1 = "select * from h_v_IF_DepartmentList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    ds = oCN.RunProcReturn(sql, "h_v_IF_DepartmentList");
                }
                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;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }


        /// <summary>
        /// 根据基础资料ID 查找记录
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Gy_Department/cx")]
        [HttpGet]
        public object cx(long HInterID)
        {
            try
            {
                ds = oCN.RunProcReturn("select * from Gy_Department where hitemid =  " + HInterID, "Gy_Department");
        ///// <summary>
        ///// 根据基础资料ID 查找记录
        /////参数：string sql。
        /////返回值：object。
        ///// </summary>
        //[Route("Gy_Department/cx")]
        //[HttpGet]
        //public object cx(long HInterID)
        //{
        //    try
        //    {
        //        ds = oCN.RunProcReturn("select * from Gy_Department where hitemid =  " + HInterID, "Gy_Department");
                
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        //            objJsonResult.code = "1";
        //            objJsonResult.count = 1;
        //            objJsonResult.Message = "Sucess！";
        //            objJsonResult.data = ds.Tables[0];
        //            return objJsonResult;
        //    }
        //    catch (Exception e)
        //    {
        //        objJsonResult.code = "0";
        //        objJsonResult.count = 0;
        //        objJsonResult.Message = "Exception！" + e.ToString();
        //        objJsonResult.data = null;
        //        return objJsonResult;
        //    }
        //}

        /// <summary>
        /// 部门列表删除按钮
@@ -109,7 +59,7 @@
            DAL.ClsGy_Department_View oDeptHlp = new DAL.ClsGy_Department_View();
            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;
@@ -338,7 +288,7 @@
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Gy_Department/AddBill1")]
        [Route("Gy_StockPlaceController/AddBill1")]
        [HttpPost]
        public object AddBill1([FromBody] JObject oMain)
        {
@@ -382,7 +332,7 @@


                //判断权限
                if (!ClsPub.Security_Log(msg5, 1, true, msg4))
                if (!ClsPub.Security_Log(msg5, 1, false, msg4))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;