From 4b2a2f346b1467bc0de90e2e87a33b8ede2a8a72 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期二, 29 七月 2025 12:54:22 +0800
Subject: [PATCH] 1.页面过滤条件：开始时间和结束时间(根据检验信息中的创建时间进行过滤)、站台(检验信息中的检验工序)、料号(PNL布局信息名称)、批次(lot号) 2.柱状图 3.饼状图 4.根据仓库、物料，维护物料的价格 2.根据表结构增加维护页面、列表页面
---
WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 103 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs b/WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs
index 367d73d..b399ad4 100644
--- a/WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs
@@ -77,8 +77,110 @@
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)
+ {
+ 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.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
+
+ #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
+
+ #region 杞﹂棿绠＄悊 鐑鐞嗘俯搴︽洸绾垮浘
+ [Route("Cj_NoPassProc/GetHProcHBillNoId")]
+ [HttpGet]
+ public object GetHProcHBillNoId(string linterid, string num)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ if (num=="1")
+ {
+ ds = oCN.RunProcReturn("select b.HEquipFileNumber 璁惧缂栫爜,b.HName 璁惧鍚嶇О,c.HProjectNum 椤圭洰缂栧彿,d.HRelBeginDate 寮�濮嬫椂闂�,d.HRelEndDate 缁撴潫鏃堕棿 from Sc_ICMOBillStatus_Tmp a " +
+ "left join Gy_EquipFileBillMain b on a.HSourceID=b.HSourceID " +
+ "left join Sc_ProcessExchangeBillMain c on a.HSourceInterID=c.HInterID " +
+ "left join Sc_ProcessExchangeBillSub d on c.HInterID=d.HInterID and a.HSourceEntryID=d.HEntryID " +
+ "where a.HSourceInterID='" + linterid + "' and a.HProcID='85'", "Gy_EquipFileBillMain");
+ }
+ else if (num=="2")
+ {
+ ds = oCN.RunProcReturn("SELECT ef1.HEquipFileNumber AS 璁惧缂栫爜,ef1.HName AS 璁惧鍚嶇О,d.HRelBeginDate 寮�濮嬫椂闂�,d.HRelEndDate 缁撴潫鏃堕棿 FROM Gy_EquipFileBillMain ef " +
+ "JOIN Sc_ICMOBillStatus_Tmp tmp ON ef.HSourceID = tmp.HSourceID " +
+ "left join Gy_EquipFileBillMain ef1 on ef1.HMainSourceID=ef.HInterID " +
+ "left join Sc_ProcessExchangeBillMain c on tmp.HSourceInterID=c.HInterID " +
+ "left join Sc_ProcessExchangeBillSub d on c.HInterID=d.HInterID and tmp.HSourceEntryID=d.HEntryID " +
+ "where tmp.HSourceInterID='" + linterid + "' and tmp.HProcID='186'", "Gy_EquipFileBillMain");
+ }
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
--
Gitblit v1.9.1