Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

wtt

2024-11-08 454a4392efc09525ba2ef9921f7bd08bd14356fc

 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,91 @@
            }
        }

        #region 车间管理  热处理温度曲线图
        [Route("Cj_NoPassProc/HeatTreatmentTemperatureCurveChart")]
        [HttpGet]
        public object HeatTreatmentTemperatureCurveChart(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_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
    }
}