提料运算

yangle

2023-06-05 3552bcc7bc07052a80dce7fc3933d71ec6748341

 WebAPI/Controllers/MateOutController.cs

@@ -1361,20 +1361,20 @@
                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    int headLen = col.ColumnName.ToString().Length;        //列名的长度
                    int colLen = 0;
                    if (ds.Tables[1].Rows[0][col.ColumnName] != null)
                    {
                        string colLenStr=ds.Tables[1].Rows[0][col.ColumnName].ToString();
                        if(colLenStr != "")
                        {
                            colLen = int.Parse(colLenStr);   //列中最长数据的长度
                        }
                    //int headLen = col.ColumnName.ToString().Length;        //列名的长度
                    //int colLen = 0;
                    //if (ds.Tables[1].Rows[0][col.ColumnName] != null)
                    //{
                    //    string colLenStr=ds.Tables[1].Rows[0][col.ColumnName].ToString();
                    //    if(colLenStr != "")
                    //    {
                    //        colLen = int.Parse(colLenStr);   //列中最长数据的长度
                    //    }
                        
                    }
                    colLen = (headLen >= colLen) ? headLen : colLen;
                    //}
                    //colLen = (headLen >= colLen) ? headLen : colLen;
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\",\"width\":\"" + colLen + "\"}";
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name  + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

@@ -1422,20 +1422,20 @@
                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    int headLen = col.ColumnName.ToString().Length;        //列名的长度
                    int colLen = 0;
                    if (ds.Tables[1].Rows[0][col.ColumnName] != null)
                    {
                        string colLenStr = ds.Tables[1].Rows[0][col.ColumnName].ToString();
                        if (colLenStr != "")
                        {
                            colLen = int.Parse(colLenStr);   //列中最长数据的长度
                        }
                    //int headLen = col.ColumnName.ToString().Length;        //列名的长度
                    //int colLen = 0;
                    //if (ds.Tables[1].Rows[0][col.ColumnName] != null)
                    //{
                    //    string colLenStr = ds.Tables[1].Rows[0][col.ColumnName].ToString();
                    //    if (colLenStr != "")
                    //    {
                    //        colLen = int.Parse(colLenStr);   //列中最长数据的长度
                    //    }

                    }
                    colLen = (headLen >= colLen) ? headLen : colLen;
                    //}
                    //colLen = (headLen >= colLen) ? headLen : colLen;
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name +"\",\"width\":\"" + colLen + "\"}";
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name  + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }