From fd7751b0cc64f10501b69b8a10bdc43c03892ab7 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 24 六月 2024 23:06:50 +0800
Subject: [PATCH] 生产质量日汇报单报表查看
---
WebAPI/Properties/PublishProfiles/FolderProfile12.pubxml.user | 76 ++++++++++++++++++++++++++++----------
WebAPI/Controllers/生产管理/质量汇报单/Sc_QualityReportBillController.cs | 21 ++++------
2 files changed, 65 insertions(+), 32 deletions(-)
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs"
index fdc247e..1fc4027 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs"
@@ -1615,7 +1615,13 @@
#endregion
#region 鐢熶骇璐ㄩ噺鏃ユ眹鎶ュ崟鍒楄〃 鏌ヨ
-
+ public class ReportWorkDemandPlanBill
+ {
+ public string HNumber;
+ public string HName;
+ public DateTime HBeginDate;
+ public DateTime HEndDate;
+ }
[Route("Sc_QualityReportBill/getSc_QualityReportBillDay")]
[HttpGet]
public object getSc_QualityReportBillDay(string sWhere, string user)
@@ -1632,17 +1638,8 @@
objJsonResult.data = null;
return objJsonResult;
}
-
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select * from h_v_Sc_StationOutBillMainList order by 鍗曟嵁鍙� desc", "h_v_Sc_StationOutBillMainList");
- }
- else
- {
- string sql1 = "select * from h_v_Sc_StationOutBillMainList where 1 = 1 ";
- string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� desc";
- ds = oCN.RunProcReturn(sql, "h_v_Sc_StationOutBillMainList");
- }
+ ReportWorkDemandPlanBill Report = JsonConvert.DeserializeObject<ReportWorkDemandPlanBill>(sWhere);
+ ds = oCN.RunProcReturn($"exec h_p_Sc_StationOutBillMain '{Report.HBeginDate}','{Report.HEndDate}','{Report.HNumber}','{Report.HName}'", "h_p_Sc_StationOutBillMain");
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile12.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile12.pubxml.user
index 79c6e56..deb670b 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile12.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile12.pubxml.user
@@ -4,12 +4,39 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <History>True|2024-06-18T08:08:52.3066991Z;True|2024-06-18T14:08:42.6969999+08:00;True|2024-06-17T13:22:25.8401219+08:00;True|2024-06-17T11:27:09.9223091+08:00;True|2024-06-17T11:23:37.5133763+08:00;True|2024-06-17T10:58:43.2727797+08:00;True|2024-06-14T13:32:57.5800980+08:00;False|2024-06-13T10:45:10.1375417+08:00;False|2024-06-13T10:43:52.8804222+08:00;</History>
+ <History>True|2024-06-24T15:05:20.8658324Z;True|2024-06-24T22:59:59.2842726+08:00;True|2024-06-24T16:29:08.9135923+08:00;True|2024-06-24T15:44:19.8100242+08:00;True|2024-06-18T16:08:52.3066991+08:00;True|2024-06-18T14:08:42.6969999+08:00;True|2024-06-17T13:22:25.8401219+08:00;True|2024-06-17T11:27:09.9223091+08:00;True|2024-06-17T11:23:37.5133763+08:00;True|2024-06-17T10:58:43.2727797+08:00;True|2024-06-14T13:32:57.5800980+08:00;False|2024-06-13T10:45:10.1375417+08:00;False|2024-06-13T10:43:52.8804222+08:00;</History>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
<publishTime>05/25/2024 09:46:41</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.EndpointUtil.dll">
+ <publishTime>04/07/2020 16:33:48</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.GatewayDingTalk.dll">
+ <publishTime>04/25/2023 17:49:04</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.GatewaySpi.dll">
+ <publishTime>07/26/2022 20:39:50</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.OpenApiClient.dll">
+ <publishTime>05/14/2024 12:47:20</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.OpenApiUtil.dll">
+ <publishTime>11/22/2022 11:24:18</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.SDK.Dingtalk.dll">
+ <publishTime>06/20/2024 11:03:14</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.TeaUtil.dll">
+ <publishTime>05/13/2024 10:17:22</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.TeaXML.dll">
+ <publishTime>08/03/2022 21:46:08</publishTime>
+ </File>
+ <File Include="bin/Aliyun.Credentials.dll">
+ <publishTime>12/05/2022 15:40:12</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.dll">
<publishTime>02/22/2013 16:43:40</publishTime>
@@ -18,28 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>06/18/2024 16:08:23</publishTime>
+ <publishTime>06/24/2024 23:05:01</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>06/18/2024 16:08:23</publishTime>
+ <publishTime>06/24/2024 23:05:01</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>06/18/2024 16:08:22</publishTime>
+ <publishTime>06/24/2024 23:05:00</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>06/18/2024 16:08:22</publishTime>
+ <publishTime>06/24/2024 23:05:00</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>06/18/2024 16:08:19</publishTime>
+ <publishTime>06/24/2024 23:04:57</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>06/18/2024 16:08:19</publishTime>
+ <publishTime>06/24/2024 23:04:57</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -84,16 +111,16 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>06/18/2024 16:08:20</publishTime>
+ <publishTime>06/24/2024 23:04:57</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>06/18/2024 16:08:20</publishTime>
+ <publishTime>06/24/2024 23:04:57</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
- <publishTime>08/04/2014 04:33:56</publishTime>
+ <publishTime>03/08/2023 15:09:56</publishTime>
</File>
<File Include="bin/NPOI.dll">
<publishTime>10/23/2021 09:07:54</publishTime>
@@ -120,25 +147,25 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>06/18/2024 16:08:17</publishTime>
+ <publishTime>06/24/2024 23:04:54</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>06/18/2024 16:08:17</publishTime>
+ <publishTime>06/24/2024 23:04:54</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>06/18/2024 16:08:19</publishTime>
+ <publishTime>06/24/2024 23:04:55</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>06/18/2024 16:08:19</publishTime>
+ <publishTime>06/24/2024 23:04:55</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>06/18/2024 16:08:19</publishTime>
+ <publishTime>06/24/2024 23:04:56</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>06/18/2024 16:08:19</publishTime>
+ <publishTime>06/24/2024 23:04:56</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
@@ -176,8 +203,14 @@
<File Include="bin/System.Net.Http.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
+ <File Include="bin/System.Net.Http.Extensions.dll">
+ <publishTime>02/20/2015 04:10:46</publishTime>
+ </File>
<File Include="bin/System.Net.Http.Formatting.dll">
<publishTime>11/28/2018 21:00:36</publishTime>
+ </File>
+ <File Include="bin/System.Net.Http.Primitives.dll">
+ <publishTime>02/20/2015 04:10:46</publishTime>
</File>
<File Include="bin/System.Runtime.CompilerServices.Unsafe.dll">
<publishTime>09/19/2018 03:38:10</publishTime>
@@ -242,14 +275,17 @@
<File Include="bin/System.Xml.Linq.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
+ <File Include="bin/Tea.dll">
+ <publishTime>04/18/2023 12:14:54</publishTime>
+ </File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>06/18/2024 16:08:27</publishTime>
+ <publishTime>06/24/2024 23:05:09</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>06/18/2024 16:08:27</publishTime>
+ <publishTime>06/24/2024 23:05:09</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -336,7 +372,7 @@
<publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="packages.config">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>06/20/2024 15:27:38</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
<publishTime>05/25/2024 09:46:41</publishTime>
@@ -444,7 +480,7 @@
<publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Web.config">
- <publishTime>06/18/2024 16:08:51</publishTime>
+ <publishTime>06/24/2024 23:05:19</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1