WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/CJGL/Cj_SingleStationController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll | 补丁 | 查看 | 原始文档 | blame | 历史 | |
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb | 补丁 | 查看 | 原始文档 | blame | 历史 | |
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache | 补丁 | 查看 | 原始文档 | blame | 历史 | |
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll | 补丁 | 查看 | 原始文档 | blame | 历史 | |
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb | 补丁 | 查看 | 原始文档 | blame | 历史 |
WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs
@@ -1,4 +1,5 @@ using Newtonsoft.Json.Linq; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Pub_Class; using System; using System.Collections; @@ -68,8 +69,41 @@ } } #region 车间管理 热处理温度曲线图 [Route("Cj_NoPassProc/HeatTreatmentTemperatureCurveChart")] [HttpGet] public object HeatTreatmentTemperatureCurveChart(string sWhere,string user) { try { List<object> columnNameList = new List<object>(); ds = oCN.RunProcReturn("exec h_p_Cj_HeatTreatmentTemperatureCurveChart '"+ sWhere + "'", "h_p_Cj_HeatTreatmentTemperatureCurveChart"); // //添加列名 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 = ""; objJsonResult.data = ds.Tables[0]; objJsonResult.list = columnNameList; return objJsonResult; } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "Exception!" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion } } WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
@@ -2073,5 +2073,85 @@ } #endregion #region 工序单品过站 单品过站查询 [Route("Cj_SingleStation/SingleItemTransitList")] [HttpGet] public object SingleItemTransitList(string HProcExchBillNo, string user) { try { List<object> columnNameList = new List<object>(); string sql = @"exec h_p_SingleItemTransitList '" + HProcExchBillNo + "'"; ds = oCN.RunProcReturn(sql, "h_p_SingleItemTransitList"); //添加列名 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.data = ds.Tables[0]; objJsonResult.list = columnNameList; return objJsonResult; } catch (Exception e) { oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "Exception!" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion #region 工序单品过站 单品过站查询 查询具体条码 [Route("Cj_SingleStation/SingleItemTransit_SN_List")] [HttpGet] public object SingleItemTransit_SN_List(string sWhere, string TableName) { try { List<object> columnNameList = new List<object>(); string sql = @"exec h_p_SingleItemTransit_SN_List '" + sWhere + "','"+ TableName + "'"; ds = oCN.RunProcReturn(sql, "h_p_SingleItemTransit_SN_List"); //添加列名 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.data = ds.Tables[0]; objJsonResult.list = columnNameList; return objJsonResult; } catch (Exception e) { oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "Exception!" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion } } sdk_dingding/TopSdk/bin/Debug/TopSdk.dllBinary files differ
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdbBinary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cacheBinary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -19,3 +19,9 @@ D:\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache D:\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll D:\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb E:\智云mes\mes\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll E:\智云mes\mes\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb E:\智云mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache E:\智云mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache E:\智云mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll E:\智云mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb sdk_dingding/TopSdk/obj/Debug/TopSdk.dllBinary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdbBinary files differ