1

duhe

2025-03-24 2609bffee3a8de0d1e08b1b2c3fa3cfe13064f4e

 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));//获取到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

        #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));//获取到DataColumn列对象的列名
                }

                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)