合并

ch

2022-02-07 f440eeb72f93587ae29089209710582cda9f384e

 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs

@@ -457,10 +457,20 @@
        /// </summary>
        [Route("Gy_BarCodeBillList/GetBarCodeBillList")]
        [HttpGet]
        public object GetBarCodeBillList(string sWhere)
        public object GetBarCodeBillList(string sWhere,string user)
        {
            try
            {
                //判断是否有查询权限
                if (!DBUtility.ClsPub.Security_Log("Gy_BarCodeBill_Query", 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_IF_BarCodeBillList " + sWhere + "order by 日期 desc", "h_v_IF_BarCodeBillList");