zrg
2024-07-30 67bfff895914fe3d56f1c1c4c5e39efb5fec2a06
设备工艺参数趋势图后端查询
2个文件已修改
174 ■■■■ 已修改文件
WebAPI/Controllers/品质管理/质量报表/QC_QualityReportsController.cs 138 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile16.pubxml.user 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/Æ·ÖʹÜÀí/ÖÊÁ¿±¨±í/QC_QualityReportsController.cs
@@ -574,5 +574,143 @@
        }
        #endregion
        #region è´¨é‡æ¨¡å—    å„工序质量趋势图 æŸ¥è¯¢
        [Route("QC_CustomerAppealReport/getSc_StationOutBill_HProc")]
        [HttpGet]
        public object getSc_HMaterYieldStatistics(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Sc_StationOutBillQuery_HProc order by æ—¥æœŸ desc", "h_v_Sc_StationOutBillQuery_HProc");
                }
                else
                {
                    string sql1 = "select * from h_v_Sc_StationOutBillQuery_HProc where 1 = 1 ";
                    string sql = sql1 + sWhere + " order by æ—¥æœŸ ";
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_StationOutBillQuery_HProc");
                }
                //添加列名
                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)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region è´¨é‡æ¨¡å—    è®¾å¤‡å·¥è‰ºå‚数趋势图 æ ¹æ®æµè½¬å¡èŽ·å–è®¾å¤‡
        [Route("QC_CustomerAppealReport/Get_EquipList")]
        [HttpGet]
        public object Get_EquipList(string HProcExchBillNo, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                ds = oCN.RunProcReturn("select distinct b.HInterID HItemID,b.HName HName  from SB_EquipICMOTechParamBillMain a left join Gy_EquipFileBillMain  b on a.HEquipID=b.HInterID where HProcExchBillNo='" + HProcExchBillNo + "'", "SB_EquipICMOTechParamBillMain");
                //添加列名
                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)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region è´¨é‡æ¨¡å— è®¾å¤‡å·¥è‰ºå‚数趋势图
        [Route("QC_CustomerAppealReport/SB_EquipICMOTechParamList")]
        [HttpGet]
        public object SB_EquipICMOTechParamList(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
                string HProcExchBillNo = dic["HProcExchBillNo"].ToString();
                string HProcName = dic["HProcName"].ToString();
                string HTechParamName = dic["HTechParamName"].ToString();
                string HEquipName = dic["HEquipName"].ToString();
                if ((HProcExchBillNo == null || HProcExchBillNo == "")&&(HProcName == null || HProcName == "") && (HTechParamName == null || HTechParamName == "") && (HEquipName == null || HEquipName == ""))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查询条件!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                ds = oCN.RunProcReturn("exec h_p_SB_EquipICMOTechParamBillList '" + HProcExchBillNo + "','" + HProcName + "','" + HTechParamName + "',"+HEquipName, "h_p_SB_EquipICMOTechParamBillList");
                //添加列名
                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)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}
WebAPI/Properties/PublishProfiles/FolderProfile16.pubxml.user
@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <History>True|2024-07-29T01:30:44.3113957Z;True|2024-07-26T13:27:05.3100287+08:00;True|2024-07-25T12:57:25.7827986+08:00;True|2024-07-25T12:48:25.8401673+08:00;True|2024-07-25T12:25:00.9066053+08:00;True|2024-07-25T12:09:48.5121840+08:00;True|2024-07-25T12:07:16.8901099+08:00;True|2024-07-25T11:47:55.2038773+08:00;True|2024-07-25T11:32:21.7937362+08:00;False|2024-07-25T11:30:05.1250197+08:00;</History>
    <History>True|2024-07-30T05:46:38.2809487Z;True|2024-07-30T13:44:15.6042609+08:00;True|2024-07-30T13:41:03.9794489+08:00;True|2024-07-30T13:39:44.3877816+08:00;True|2024-07-30T13:03:34.9002627+08:00;True|2024-07-29T15:32:50.8660913+08:00;True|2024-07-29T15:30:34.1315708+08:00;True|2024-07-29T09:30:44.3113957+08:00;True|2024-07-26T13:27:05.3100287+08:00;True|2024-07-25T12:57:25.7827986+08:00;True|2024-07-25T12:48:25.8401673+08:00;True|2024-07-25T12:25:00.9066053+08:00;True|2024-07-25T12:09:48.5121840+08:00;True|2024-07-25T12:07:16.8901099+08:00;True|2024-07-25T11:47:55.2038773+08:00;True|2024-07-25T11:32:21.7937362+08:00;False|2024-07-25T11:30:05.1250197+08:00;</History>
    <_PublishTargetUrl>D:\网站发布\智云MESWMS\API</_PublishTargetUrl>
  </PropertyGroup>
  <ItemGroup>
@@ -21,28 +21,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>07/29/2024 09:30:25</publishTime>
      <publishTime>07/30/2024 13:46:27</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>07/29/2024 09:30:25</publishTime>
      <publishTime>07/30/2024 13:46:27</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>07/29/2024 09:30:24</publishTime>
      <publishTime>07/30/2024 13:46:25</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>07/29/2024 09:30:24</publishTime>
      <publishTime>07/30/2024 13:46:25</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>07/29/2024 09:30:21</publishTime>
      <publishTime>07/30/2024 13:46:23</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>07/29/2024 09:30:21</publishTime>
      <publishTime>07/30/2024 13:46:23</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 13:17:26</publishTime>
@@ -87,10 +87,10 @@
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>07/29/2024 09:30:22</publishTime>
      <publishTime>07/30/2024 13:46:23</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>07/29/2024 09:30:22</publishTime>
      <publishTime>07/30/2024 13:46:23</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>05/25/2024 09:46:41</publishTime>
@@ -123,25 +123,25 @@
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>07/29/2024 09:30:19</publishTime>
      <publishTime>07/30/2024 13:46:22</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>07/29/2024 09:30:19</publishTime>
      <publishTime>07/30/2024 13:46:22</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>07/29/2024 09:30:20</publishTime>
      <publishTime>07/30/2024 13:46:22</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>07/29/2024 09:30:20</publishTime>
      <publishTime>07/30/2024 13:46:22</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>07/29/2024 09:30:20</publishTime>
      <publishTime>07/30/2024 13:46:22</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>07/29/2024 09:30:20</publishTime>
      <publishTime>07/30/2024 13:46:22</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
@@ -255,10 +255,10 @@
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>07/29/2024 09:30:34</publishTime>
      <publishTime>07/30/2024 13:46:30</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>07/29/2024 09:30:34</publishTime>
      <publishTime>07/30/2024 13:46:30</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>
@@ -453,7 +453,7 @@
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>07/29/2024 09:30:43</publishTime>
      <publishTime>07/30/2024 13:46:37</publishTime>
    </File>
  </ItemGroup>
</Project>