MES-WEB-API.git

parent: 1df6fb7d | 补丁 | 提交 | show whitespace

zrg

2024-07-29 9b754ddc20b4fbdc8e2bfbd77ac9143984d5551c

良率统计,任务单通过率后端查询

2个文件已修改

	WebAPI/Controllers/生产管理/质量汇报单/Sc_QualityReportBillController.cs	111 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Properties/PublishProfiles/FolderProfile16.pubxml.user	36 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebAPI/Controllers/Éú²ú¹ÜÀí/ÖÊÁ¿»ã±¨µ¥/Sc_QualityReportBillController.cs

@@ -1825,6 +1825,117 @@
        }
        #endregion

        #region ç©æçäº§è¯çç»è®¡(æ¯è«å°) æ¥è¯¢

        [Route("Sc_QualityReportBill/getSc_HMater_Yield_Statistics")]
        [HttpGet]
        public object getSc_HMater_Yield_Statistics(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //æ¥çæé
                if (!DBUtility.ClsPub.Security_Log("Sc_QualityReportBill_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "æ æ¥çæéï¼";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Sc_HMater_Yield_Statistics_Query order by åæ®å· desc", "h_v_Sc_HMater_Yield_Statistics_Query");
                }
                else
                {
                    string sql1 = "select * from h_v_Sc_HMater_Yield_Statistics_Query where 1 = 1 ";
                    string sql = sql1 + sWhere + " order by æ¥æ desc";
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_HMater_Yield_Statistics_Query");
                }

                //æ·»å åå
                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("Sc_QualityReportBill/getSc_HICMMater_Statistics")]
        [HttpGet]
        public object getSc_HICMMater_Statistics(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //æ¥çæé
                if (!DBUtility.ClsPub.Security_Log("Sc_QualityReportBill_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "æ æ¥çæéï¼";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Sc_HICMMater_Statistics_Query order by åæ®å· desc", "h_v_Sc_HICMMater_Statistics_Query");
                }
                else
                {
                    string sql1 = "select * from h_v_Sc_HICMMater_Statistics_Query where 1 = 1 ";
                    string sql = sql1 + sWhere + " order by æ¥æ desc";
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_HICMMater_Statistics_Query");
                }

                //æ·»å åå
                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-25T04:57:25.7827986Z;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-26T05:27:05.3100287Z;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/25/2024 12:57:00</publishTime>
      <publishTime>07/26/2024 13:26:43</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>07/25/2024 12:57:00</publishTime>
      <publishTime>07/26/2024 13:26:43</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>07/25/2024 12:56:59</publishTime>
      <publishTime>07/26/2024 13:26:41</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>07/25/2024 12:56:59</publishTime>
      <publishTime>07/26/2024 13:26:41</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>07/25/2024 12:56:56</publishTime>
      <publishTime>07/26/2024 13:26:39</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>07/25/2024 12:56:56</publishTime>
      <publishTime>07/26/2024 13:26:39</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/25/2024 12:56:57</publishTime>
      <publishTime>07/26/2024 13:26:39</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>07/25/2024 12:56:57</publishTime>
      <publishTime>07/26/2024 13:26:39</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/25/2024 12:56:55</publishTime>
      <publishTime>07/26/2024 13:26:37</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>07/25/2024 12:56:55</publishTime>
      <publishTime>07/26/2024 13:26:37</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>07/25/2024 12:56:56</publishTime>
      <publishTime>07/26/2024 13:26:38</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>07/25/2024 12:56:56</publishTime>
      <publishTime>07/26/2024 13:26:38</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>07/25/2024 12:56:56</publishTime>
      <publishTime>07/26/2024 13:26:38</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>07/25/2024 12:56:56</publishTime>
      <publishTime>07/26/2024 13:26:38</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/25/2024 12:57:05</publishTime>
      <publishTime>07/26/2024 13:26:50</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>07/25/2024 12:57:05</publishTime>
      <publishTime>07/26/2024 13:26:50</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/25/2024 12:57:25</publishTime>
      <publishTime>07/26/2024 13:27:04</publishTime>
    </File>
  </ItemGroup>
</Project>

			@@ -1825,6 +1825,117 @@
			}
			#endregion

			#region ç©æçäº§è¯çç»è®¡(æ¯è«å°) æ¥è¯¢

			[Route("Sc_QualityReportBill/getSc_HMater_Yield_Statistics")]
			[HttpGet]
			public object getSc_HMater_Yield_Statistics(string sWhere, string user)
			{
			try
			{
			List<object> columnNameList = new List<object>();
			//æ¥çæé
			if (!DBUtility.ClsPub.Security_Log("Sc_QualityReportBill_Query", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ æ¥çæéï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select * from h_v_Sc_HMater_Yield_Statistics_Query order by åæ®å· desc", "h_v_Sc_HMater_Yield_Statistics_Query");
			}
			else
			{
			string sql1 = "select * from h_v_Sc_HMater_Yield_Statistics_Query where 1 = 1 ";
			string sql = sql1 + sWhere + " order by æ¥æ desc";
			ds = oCN.RunProcReturn(sql, "h_v_Sc_HMater_Yield_Statistics_Query");
			}

			//æ·»å åå
			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("Sc_QualityReportBill/getSc_HICMMater_Statistics")]
			[HttpGet]
			public object getSc_HICMMater_Statistics(string sWhere, string user)
			{
			try
			{
			List<object> columnNameList = new List<object>();
			//æ¥çæé
			if (!DBUtility.ClsPub.Security_Log("Sc_QualityReportBill_Query", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "æ æ¥çæéï¼";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select * from h_v_Sc_HICMMater_Statistics_Query order by åæ®å· desc", "h_v_Sc_HICMMater_Statistics_Query");
			}
			else
			{
			string sql1 = "select * from h_v_Sc_HICMMater_Statistics_Query where 1 = 1 ";
			string sql = sql1 + sWhere + " order by æ¥æ desc";
			ds = oCN.RunProcReturn(sql, "h_v_Sc_HICMMater_Statistics_Query");
			}

			//æ·»å åå
			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

			}
			}

			@@ -4,7 +4,7 @@
			-->
			<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
			<PropertyGroup>
			<History>True\|2024-07-25T04:57:25.7827986Z;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-26T05:27:05.3100287Z;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/25/2024 12:57:00</publishTime>
			<publishTime>07/26/2024 13:26:43</publishTime>
			</File>
			<File Include="bin/BLL.pdb">
			<publishTime>07/25/2024 12:57:00</publishTime>
			<publishTime>07/26/2024 13:26:43</publishTime>
			</File>
			<File Include="bin/BouncyCastle.Crypto.dll">
			<publishTime>12/18/2020 05:32:28</publishTime>
			</File>
			<File Include="bin/DAL.dll">
			<publishTime>07/25/2024 12:56:59</publishTime>
			<publishTime>07/26/2024 13:26:41</publishTime>
			</File>
			<File Include="bin/DAL.pdb">
			<publishTime>07/25/2024 12:56:59</publishTime>
			<publishTime>07/26/2024 13:26:41</publishTime>
			</File>
			<File Include="bin/Dapper.dll">
			<publishTime>07/22/2016 22:52:40</publishTime>
			</File>
			<File Include="bin/DBUtility.dll">
			<publishTime>07/25/2024 12:56:56</publishTime>
			<publishTime>07/26/2024 13:26:39</publishTime>
			</File>
			<File Include="bin/DBUtility.pdb">
			<publishTime>07/25/2024 12:56:56</publishTime>
			<publishTime>07/26/2024 13:26:39</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/25/2024 12:56:57</publishTime>
			<publishTime>07/26/2024 13:26:39</publishTime>
			</File>
			<File Include="bin/Model.pdb">
			<publishTime>07/25/2024 12:56:57</publishTime>
			<publishTime>07/26/2024 13:26:39</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/25/2024 12:56:55</publishTime>
			<publishTime>07/26/2024 13:26:37</publishTime>
			</File>
			<File Include="bin/Pub_Class.pdb">
			<publishTime>07/25/2024 12:56:55</publishTime>
			<publishTime>07/26/2024 13:26:37</publishTime>
			</File>
			<File Include="bin/Pub_Control.dll">
			<publishTime>07/25/2024 12:56:56</publishTime>
			<publishTime>07/26/2024 13:26:38</publishTime>
			</File>
			<File Include="bin/Pub_Control.pdb">
			<publishTime>07/25/2024 12:56:56</publishTime>
			<publishTime>07/26/2024 13:26:38</publishTime>
			</File>
			<File Include="bin/RestSharp.dll">
			<publishTime>08/31/2012 06:22:50</publishTime>
			</File>
			<File Include="bin/SQLHelper.dll">
			<publishTime>07/25/2024 12:56:56</publishTime>
			<publishTime>07/26/2024 13:26:38</publishTime>
			</File>
			<File Include="bin/SQLHelper.pdb">
			<publishTime>07/25/2024 12:56:56</publishTime>
			<publishTime>07/26/2024 13:26:38</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/25/2024 12:57:05</publishTime>
			<publishTime>07/26/2024 13:26:50</publishTime>
			</File>
			<File Include="bin/WebAPI.pdb">
			<publishTime>07/25/2024 12:57:05</publishTime>
			<publishTime>07/26/2024 13:26:50</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/25/2024 12:57:25</publishTime>
			<publishTime>07/26/2024 13:27:04</publishTime>
			</File>
			</ItemGroup>
			</Project>