From ca64628fd251902851c319ebd98d898682e81951 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 08 十一月 2024 08:59:50 +0800
Subject: [PATCH] 单品过站,包装单增加配件 模具 穴号控制 热处理曲线图 干燥机曲线图
---
WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 51 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs b/WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs
index 367d73d..07a6398 100644
--- a/WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs
@@ -77,8 +77,14 @@
try
{
List<object> columnNameList = new List<object>();
+ Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
- ds = oCN.RunProcReturn("exec h_p_Cj_HeatTreatmentTemperatureCurveChart '"+ sWhere + "'", "h_p_Cj_HeatTreatmentTemperatureCurveChart");
+ string HEquipNumber = dic["HEquipNumber"].ToString();//璁惧缂栫爜
+ string HBeginDate = dic["HBeginDate"].ToString();//閲囬泦鏃ユ湡
+ string HEndDate = dic["HEndDate"].ToString();//閲囬泦鏃ユ湡
+ string HProcExchBillNo = dic["HProcExchBillNo"].ToString();//宸ュ簭娴佽浆鍗�
+
+ ds = oCN.RunProcReturn("exec h_p_Cj_HeatTreatmentTemperatureCurveChart '" + HEquipNumber + "','" + HBeginDate + "','" + HEndDate + "','" + HProcExchBillNo + "'", "h_p_Cj_HeatTreatmentTemperatureCurveChart");
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -105,5 +111,49 @@
}
}
#endregion
+
+ #region 杞﹂棿绠＄悊 骞茬嚗鏈烘俯搴︽洸绾垮浘
+ [Route("Cj_NoPassProc/Cj_TemperatureCurveDryingMachine")]
+ [HttpGet]
+ public object Cj_TemperatureCurveDryingMachine(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
+
+ string HEquipNumber = dic["HEquipNumber"].ToString();//璁惧缂栫爜
+ string HBeginDate = dic["HBeginDate"].ToString();//閲囬泦鏃ユ湡
+ string HEndDate = dic["HEndDate"].ToString();//閲囬泦鏃ユ湡
+ string HProcExchBillNo = dic["HProcExchBillNo"].ToString();//宸ュ簭娴佽浆鍗�
+
+ ds = oCN.RunProcReturn("exec h_p_Cj_TemperatureCurveDryingMachine '" + HEquipNumber + "','"+ HBeginDate + "','"+ HEndDate + "','" + HProcExchBillNo + "'", "h_p_Cj_TemperatureCurveDryingMachine");
+
+ //娣诲姞鍒楀悕
+ 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));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "";
+ objJsonResult.data = ds;
+ 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
}
}
\ No newline at end of file
--
Gitblit v1.9.1