zrg
2024-08-20 6fdc62bef1255647019e750e586073b649ce2d88
增加 设备工艺参数趋势分析图
2个文件已修改
96 ■■■■ 已修改文件
WebAPI/Controllers/品质管理/质量报表/QC_QualityReportsController.cs 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile15.pubxml.user 40 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/Æ·ÖʹÜÀí/ÖÊÁ¿±¨±í/QC_QualityReportsController.cs
@@ -1371,5 +1371,61 @@
        }
        #endregion
        #region è´¨é‡æ¨¡å— è®¾å¤‡å·¥è‰ºå‚数趋势分析图
        [Route("QC_CustomerAppealReport/Get_QC_EquipMentCollectionTechParamList")]
        [HttpGet]
        public object Get_QC_EquipMentCollectionTechParamList(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 HEquipName = dic["HEquipName"].ToString();
                string HProcName = dic["HProcName"].ToString();
                string HTechParamName = dic["HTechParamName"].ToString();
                string HDate = dic["HDate"].ToString();
                if ((HEquipNumber == null || HEquipNumber == "") && (HEquipName == null || HEquipName == "") && (HProcName == null || HProcName == "") && (HTechParamName == null || HTechParamName == "") && (HDate == null || HDate == ""))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查询条件!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                ds = oCN.RunProcReturn("select HSourceCode è®¾å¤‡ç¼–码,CONVERT(VARCHAR, HDate, 120) é‡‡é›†æ—¥æœŸ,HTechParamName å·¥è‰ºäº§æ•°,HResult æ•°é‡‡å€¼ from Sb_EquipMentCollectionTechParam_Temp where HSourceCode='" + HEquipNumber + "' and HTechParamName='"+ HTechParamName + "' and CONVERT(date, HDate) <='"+HDate+"'", "Sb_EquipMentCollectionTechParam_Temp");
                //添加列名
                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/FolderProfile15.pubxml.user
@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <History>True|2024-08-19T03:32:14.9720932Z;True|2024-07-17T13:18:07.5448501+08:00;True|2024-07-17T12:53:35.8246446+08:00;True|2024-07-17T10:34:20.6073593+08:00;True|2024-07-17T09:54:04.5489967+08:00;True|2024-07-16T16:30:18.3627034+08:00;True|2024-07-15T18:25:56.8513970+08:00;True|2024-07-15T18:09:06.8846250+08:00;True|2024-07-15T16:43:30.5405561+08:00;True|2024-07-15T15:21:21.1227016+08:00;True|2024-07-15T15:17:39.9283465+08:00;True|2024-07-15T14:54:11.3495767+08:00;True|2024-07-15T13:59:09.4243337+08:00;True|2024-07-15T13:54:34.1993714+08:00;True|2024-07-15T13:50:18.8921152+08:00;True|2024-07-15T13:48:52.6793990+08:00;True|2024-07-15T13:41:38.7896562+08:00;True|2024-07-15T12:07:43.8834464+08:00;True|2024-07-15T12:03:36.2859286+08:00;True|2024-07-15T11:31:11.9462854+08:00;True|2024-07-12T11:12:48.2429052+08:00;True|2024-07-12T11:00:40.3954752+08:00;True|2024-07-12T10:59:20.7895441+08:00;True|2024-07-12T10:23:59.9903863+08:00;True|2024-07-12T10:23:38.3456675+08:00;False|2024-07-11T20:05:30.6369108+08:00;False|2024-07-11T20:04:21.0285923+08:00;</History>
    <History>True|2024-08-19T07:51:06.3264524Z;True|2024-08-19T11:32:14.9720932+08:00;True|2024-07-17T13:18:07.5448501+08:00;True|2024-07-17T12:53:35.8246446+08:00;True|2024-07-17T10:34:20.6073593+08:00;True|2024-07-17T09:54:04.5489967+08:00;True|2024-07-16T16:30:18.3627034+08:00;True|2024-07-15T18:25:56.8513970+08:00;True|2024-07-15T18:09:06.8846250+08:00;True|2024-07-15T16:43:30.5405561+08:00;True|2024-07-15T15:21:21.1227016+08:00;True|2024-07-15T15:17:39.9283465+08:00;True|2024-07-15T14:54:11.3495767+08:00;True|2024-07-15T13:59:09.4243337+08:00;True|2024-07-15T13:54:34.1993714+08:00;True|2024-07-15T13:50:18.8921152+08:00;True|2024-07-15T13:48:52.6793990+08:00;True|2024-07-15T13:41:38.7896562+08:00;True|2024-07-15T12:07:43.8834464+08:00;True|2024-07-15T12:03:36.2859286+08:00;True|2024-07-15T11:31:11.9462854+08:00;True|2024-07-12T11:12:48.2429052+08:00;True|2024-07-12T11:00:40.3954752+08:00;True|2024-07-12T10:59:20.7895441+08:00;True|2024-07-12T10:23:59.9903863+08:00;True|2024-07-12T10:23:38.3456675+08:00;False|2024-07-11T20:05:30.6369108+08:00;False|2024-07-11T20:04:21.0285923+08:00;</History>
    <_PublishTargetUrl>D:\网站发布\智云MESWMS\API</_PublishTargetUrl>
  </PropertyGroup>
  <ItemGroup>
@@ -45,28 +45,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>08/19/2024 11:24:07</publishTime>
      <publishTime>08/19/2024 15:50:50</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>08/19/2024 11:24:07</publishTime>
      <publishTime>08/19/2024 15:50:50</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>08/19/2024 11:24:06</publishTime>
      <publishTime>08/19/2024 15:50:48</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>08/19/2024 11:24:06</publishTime>
      <publishTime>08/19/2024 15:50:48</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>08/19/2024 11:24:04</publishTime>
      <publishTime>08/19/2024 15:50:46</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>08/19/2024 11:24:04</publishTime>
      <publishTime>08/19/2024 15:50:46</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 13:17:26</publishTime>
@@ -111,10 +111,10 @@
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>08/19/2024 11:24:04</publishTime>
      <publishTime>08/19/2024 15:50:46</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>08/19/2024 11:24:04</publishTime>
      <publishTime>08/19/2024 15:50:46</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>05/25/2024 09:46:41</publishTime>
@@ -147,25 +147,25 @@
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>08/19/2024 11:24:02</publishTime>
      <publishTime>08/19/2024 15:50:44</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>08/19/2024 11:24:02</publishTime>
      <publishTime>08/19/2024 15:50:44</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>08/19/2024 11:24:03</publishTime>
      <publishTime>08/19/2024 15:50:45</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>08/19/2024 11:24:03</publishTime>
      <publishTime>08/19/2024 15:50:45</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>08/19/2024 11:24:03</publishTime>
      <publishTime>08/19/2024 15:50:45</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>08/19/2024 11:24:03</publishTime>
      <publishTime>08/19/2024 15:50:45</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
@@ -279,19 +279,19 @@
      <publishTime>05/09/2023 10:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
      <publishTime>08/19/2024 11:27:20</publishTime>
      <publishTime>08/19/2024 15:50:46</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>08/19/2024 11:27:17</publishTime>
      <publishTime>08/19/2024 15:50:46</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>08/19/2024 11:32:13</publishTime>
      <publishTime>08/19/2024 15:50:55</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>08/19/2024 11:32:13</publishTime>
      <publishTime>08/19/2024 15:50:55</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>
@@ -486,7 +486,7 @@
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>08/19/2024 11:32:14</publishTime>
      <publishTime>08/19/2024 15:51:05</publishTime>
    </File>
  </ItemGroup>
</Project>