From 1c3a5fd0f49506c1ef68a4dbf3a44ef2ef3600d8 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 21 十一月 2024 16:43:09 +0800
Subject: [PATCH] 优化热处理/干燥机从 全程报表跳转获取开始结束时间,增加PDA开工单保存,增加设备工艺参数趋势图 增加根据物料+设备+工序 获取 产品工艺参数清单 工艺参数 增加 根据流转卡+工序 获取设备
---
WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs b/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs
index f8d185c..5c0eccf 100644
--- a/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs
+++ b/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs
@@ -1257,7 +1257,7 @@
{
List<object> columnNameListSum = new List<object>();
List<object> columnNameList0 = new List<object>();
- //List<object> columnNameList1 = new List<object>();
+ List<object> columnNameList1 = new List<object>();
//List<object> columnNameList2 = new List<object>();
//List<object> columnNameList3 = new List<object>();
//List<object> columnNameList4 = new List<object>();
@@ -1273,13 +1273,13 @@
columnNameList0.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
}
- ////娣诲姞 鐢熶骇璁㈠崟 鍒楀悕
- //foreach (DataColumn col in ds.Tables[1].Columns)
- //{
- // Type dataType = col.DataType;
- // string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
- // columnNameList1.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
- //}
+ //娣诲姞 鐢熶骇璁㈠崟 鍒楀悕
+ foreach (DataColumn col in ds.Tables[1].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList1.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
////娣诲姞 鐗规壒鐢宠鍗� 鍒楀悕
//foreach (DataColumn col in ds.Tables[2].Columns)
@@ -1306,7 +1306,7 @@
//}
columnNameListSum.Add(columnNameList0);
- //columnNameListSum.Add(columnNameList1);
+ columnNameListSum.Add(columnNameList1);
//columnNameListSum.Add(columnNameList2);
//columnNameListSum.Add(columnNameList3);
//columnNameListSum.Add(columnNameList4);
--
Gitblit v1.9.1