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

yusijie

2024-12-05 8c7d0e365d20f5f7d05e59afc1c39daeb0dfd690

 WebAPI/Controllers/XSGL/Xs_OutDoorBillController.cs

@@ -1216,5 +1216,55 @@
            }
        }
        #endregion

        #region  出门确认单报表
        [Route("Xs_OutDoorBill/Xs_OutDoorBillReport")]
        [HttpGet]
        public object Xs_OutDoorBillReport(string HBeginDate, string HEndDate, string sWhere, string user,int HOperationType)
        {
            try
            {
                if (!DBUtility.ClsPub.Security_Log("Xs_OutDoorBillReport", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                string sql = "exec h_p_Xs_OutDoorBillReport '" + HBeginDate + "','" + HEndDate + "','" + sWhere + "'," + HOperationType;

                ds = oCN.RunProcReturn(sql, "h_p_Xs_OutDoorBillReport");

                DataTable dt = ds.Tables[0];

                //获取列名
                List<object> columnNameList = new List<object>();
                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.list = columnNameList;
                objJsonResult.data = ds.Tables;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}