1

yangle

2023-09-20 67aad437a7ed836a1d6e865d8529d52e08585ddd

 WebAPI/Controllers/ÌõÂë¹ÜÀí/WEBSController.cs

@@ -2066,51 +2066,17 @@
                }
                else
                {
                    //添加物料明细列表列名
                    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列对象的列名
                    }
                    //添加模治具列表列名
                    List<object> MouldcolumnNameList = new List<object>();
                    foreach (DataColumn col in ds.Tables[1].Columns)
                    {
                        Type dataType = col.DataType;
                        string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                        MouldcolumnNameList.Add(JsonConvert.DeserializeObject(ColmString));  //获取到DataColumn列对象的列名
                    }
                    //添加先进先出列表列名
                    List<object> FIFOcolumnNameList = new List<object>();
                    foreach (DataColumn col in ds.Tables[2].Columns)
                    {
                        Type dataType = col.DataType;
                        string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                        FIFOcolumnNameList.Add(JsonConvert.DeserializeObject(ColmString));  //获取到DataColumn列对象的列名
                    }
                    //添加条码明细列表列名
                    List<object> BarCodecolumnNameList = new List<object>();
                    foreach (DataColumn col in ds.Tables[3].Columns)
                    {
                        Type dataType = col.DataType;
                        string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                        BarCodecolumnNameList.Add(JsonConvert.DeserializeObject(ColmString));  //获取到DataColumn列对象的列名
                    }
                    //添加源单生产汇报单条码明细列表列名
                    List<object> ICMOReportcolumnNameList = new List<object>();
                    foreach (DataColumn col in ds.Tables[4].Columns)
                    {
                        Type dataType = col.DataType;
                        string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                        ICMOReportcolumnNameList.Add(JsonConvert.DeserializeObject(ColmString));  //获取到DataColumn列对象的列名
                    }

                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取信息成功！";
                    objJsonResult.data = ds.Tables[0];
                    objJsonResult.data = new
                    {
                        Materlist = ds.Tables[0],           //返回物料明细列表信息（0）
@@ -2121,10 +2087,6 @@
                        BarCodeDetailslist = ds.Tables[5]   //返回当前所扫描条码明细信息（5）
                    };
                    objJsonResult.list = columnNameList;
                    objJsonResult.list = MouldcolumnNameList;
                    objJsonResult.list = FIFOcolumnNameList;
                    objJsonResult.list = BarCodecolumnNameList;
                    objJsonResult.list = ICMOReportcolumnNameList;
                    return objJsonResult;
                }
            }