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

zzr99

2022-08-22 7d860d3718eaf73e26fefa91dbe4bea58ca30183

 WebAPI/Controllers/SCGL/Sc_ProductionReturnBillController.cs

@@ -23,28 +23,46 @@
        /// <returns></returns>
        [Route("Sc_ProductionReturnBill/list")]
        [HttpGet]
        public object list(string sWhere)
        public object list(string sWhere,string user)
        {
            try
            {

                ds = Sc_GetProductInBill(sWhere);
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                //判断是否有查询的权限
                if (!DBUtility.ClsPub.Security_Log("Kf_ProductionReturnBill_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录！";
                    objJsonResult.Message = "无权限查询!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_IF_ProductionReturnList where 1=1  order by hmainid desc", "h_v_IF_ProductionReturnList");
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "返回记录成功！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                    string sql = "select * from h_v_IF_ProductionReturnList where 1 = 1 " + sWhere + " order by hmainid desc";
                    ds = oCN.RunProcReturn(sql, "h_v_IF_ProductionReturnList");
                }

                //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 ex)
            {
@@ -55,14 +73,5 @@
                return objJsonResult;
            }
        }

        #region sql语句


        public static DataSet Sc_GetProductInBill(string sWhere)
        {
            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_ProductionReturnList order by 日期 desc", "h_v_IF_ProductionReturnList");
        }
        #endregion
    }
}