From 9f6816fd0824aafc360bee29c9ec1eb76fa0aa16 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期四, 25 五月 2023 16:51:38 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/MateOutController.cs | 48 ++++++++++++++++++++++++------------------------
1 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/WebAPI/Controllers/MateOutController.cs b/WebAPI/Controllers/MateOutController.cs
index f5095f7..6e49379 100644
--- a/WebAPI/Controllers/MateOutController.cs
+++ b/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));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
}
@@ -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));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
}
--
Gitblit v1.9.1