From c48c4cfcc783eb4767ccb8b89521eb5c7920b29b Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期四, 31 十月 2024 11:05:13 +0800
Subject: [PATCH] 系统计件报表接口
---
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache | 0
WebAPI/Controllers/Pay_ReportController.cs | 45 ++++++++++++++++++++++
WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user | 40 ++++++++++----------
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt | 1
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll | 0
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb | 0
8 files changed, 66 insertions(+), 20 deletions(-)
diff --git a/WebAPI/Controllers/Pay_ReportController.cs b/WebAPI/Controllers/Pay_ReportController.cs
index 430f600..ac86a0f 100644
--- a/WebAPI/Controllers/Pay_ReportController.cs
+++ b/WebAPI/Controllers/Pay_ReportController.cs
@@ -594,5 +594,50 @@
return objJsonResult;
}
#endregion
+
+ #region [绯荤粺璁′欢鎶ヨ〃]
+ [Route("Pay_PaymentEntryReport/list")]
+ [HttpGet]
+ public object Pay_PaymentEntryReport(string sWhere, string user)
+ {
+ List<object> columnNameList = new List<object>();
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+
+ if (!DBUtility.ClsPub.Security_Log("Pay_PaymentEntryReport", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愭煡鐪�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ ds = oCN.RunProcReturn("exec h_p_Pay_PaymentEntryReport" + sWhere, "h_p_Pay_PaymentEntryReport");
+ 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));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+ 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 = e.Message.ToString();
+ objJsonResult.data = null;
+ objJsonResult.list = columnNameList;
+ }
+ return objJsonResult;
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
index afd774c..3b4453d 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
@@ -45,28 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>10/30/2024 15:32:44</publishTime>
+ <publishTime>10/31/2024 10:55:13</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>10/30/2024 15:32:44</publishTime>
+ <publishTime>10/31/2024 10:55:13</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>10/30/2024 15:32:42</publishTime>
+ <publishTime>10/31/2024 10:55:09</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>10/30/2024 15:32:42</publishTime>
+ <publishTime>10/31/2024 10:55:09</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>10/30/2024 15:32:35</publishTime>
+ <publishTime>10/31/2024 10:55:03</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>10/30/2024 15:32:35</publishTime>
+ <publishTime>10/31/2024 10:55:03</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>10/30/2024 15:32:37</publishTime>
+ <publishTime>10/31/2024 10:55:05</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>10/30/2024 15:32:37</publishTime>
+ <publishTime>10/31/2024 10:55:05</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>04/15/2024 12:55:45</publishTime>
@@ -147,34 +147,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>10/30/2024 15:32:33</publishTime>
+ <publishTime>10/31/2024 10:55:00</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>10/30/2024 15:32:33</publishTime>
+ <publishTime>10/31/2024 10:55:00</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>10/30/2024 15:32:34</publishTime>
+ <publishTime>10/31/2024 10:55:01</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>10/30/2024 15:32:34</publishTime>
+ <publishTime>10/31/2024 10:55:01</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>10/30/2024 15:32:34</publishTime>
+ <publishTime>10/31/2024 10:55:02</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>10/30/2024 15:32:34</publishTime>
+ <publishTime>10/31/2024 10:55:02</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>10/30/2024 15:30:45</publishTime>
+ <publishTime>10/30/2024 16:45:07</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>10/30/2024 15:30:45</publishTime>
+ <publishTime>10/30/2024 16:45:07</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,19 +285,19 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>10/30/2024 15:30:51</publishTime>
+ <publishTime>10/31/2024 10:51:26</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>10/30/2024 15:30:51</publishTime>
+ <publishTime>10/31/2024 10:51:26</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>10/30/2024 15:33:22</publishTime>
+ <publishTime>10/31/2024 10:55:50</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>10/30/2024 15:33:22</publishTime>
+ <publishTime>10/31/2024 10:55:50</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>08/16/2024 16:55:28</publishTime>
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
index 6d49479..07bedb2 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
index 4d15a04..ad05617 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..d6e21aa
--- /dev/null
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
index c186608..8ecf123 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -21,3 +21,4 @@
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
D:\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
index 6d49479..07bedb2 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
index 4d15a04..ad05617 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
Binary files differ
--
Gitblit v1.9.1