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

YL

2021-08-27 656833a6a0ff459d5fb167474213dea798a3488c

 WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs

@@ -390,15 +390,15 @@
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Cj_StationOutBill/list")]
        [Route("Cj_StationOutBill/get_Display")]
        [HttpGet]
        public object list(string sWhere)
        public object get_Display(string sWhere)
        {
            try
            {
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_MES_StationOutBillList " + sWhere, "h_v_MES_StationOutBillList");
                    ds = oCN.RunProcReturn("select * from h_v_MES_StationOutBillList " + sWhere + " order by 出站时间 desc", "h_v_MES_StationOutBillList");
                }
                else
                {
@@ -499,7 +499,7 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "上传失败！";
                objJsonResult.Message = dyResult.returnval;
                objJsonResult.data = null;
                return objJsonResult;
            }