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

jhz

2022-07-24 3efb1daac3a9d4b5c8436059f3480dd539979ba5

 WebAPI/Controllers/LMESController.cs

@@ -322,6 +322,49 @@
        }
        #endregion

        #region 工艺路线基础列表
        /// <summary>
        /// 返回工艺路线列表
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("LEMS/Gy_RoutingBillList")]
        [HttpGet]
        public object Gy_RoutingBillList(string sWhere, string user)
        {
            DataSet ds;
            try
            {
                //判断是否有查询权限
                if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无权限查询!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();

                string sql1 = "select * from h_v_Gy_RoutingBillList_Base where 1 = 1 ";
                string sql = sql1 + sWhere + " order by hmainid desc";
                ds = oCN.RunProcReturn(sql, "h_v_Gy_RoutingBillList_Base");

            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
            return GetObjectJson(ds);
        }

        #endregion

        #endregion

        /// <summary>