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

王 垚

2022-11-29 b4e78e5b10fd9777e44a9114aad3502edfd43037

 WebAPI/Controllers/CGGL/Kf_POStockInBackBillController.cs

@@ -20,19 +20,40 @@
        DataSet ds;

        #region 采购退料单列表

        [Route("Kf_POStockInBackBill/Get_POStockInBackBillList")]
        [HttpGet]
        public object Get_POStockInBackBillList(string sWhere)
        public object Get_POStockInBackBillList(string sWhere,string user)
        {
            try
            {
                //判断是否有查询权限
                if (!DBUtility.ClsPub.Security_Log("Cg_PurchaseReturnBill_Query", 1,false,user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查询权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                ds = oCN.RunProcReturn("select * from h_v_Kf_POStockInBackBillList " + sWhere + " order by 日期 desc", "h_v_Kf_POStockInBackBillList");

                //if (ds.Tables[0].Rows.Count != 0 || ds != null)
                //{
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "返回记录成功！";
                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 ex)
            {