From a1bcf60d28f6abb6121d9e7335b115d9acc0cc3f Mon Sep 17 00:00:00 2001
From: pzy <2829717936@qq.com>
Date: 星期二, 03 九月 2024 16:48:58 +0800
Subject: [PATCH] 11
---
WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user | 20 +++++-----
WebAPI/Controllers/品质管理/质量报表/QC_QualityReportsController.cs | 22 +++++-----
WebAPI/Web.config | 4 +-
WebAPI/WebAPI.csproj.user | 4 +-
sdk_dingding/TopSdk/obj/Debug/TopSdk.csprojAssemblyReference.cache | 0
WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user | 40 ++++++++++----------
WebAPI/Controllers/PublicPageMethodController.cs | 2
7 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/WebAPI/Controllers/PublicPageMethodController.cs b/WebAPI/Controllers/PublicPageMethodController.cs
index 8a9a2a5..45881d2 100644
--- a/WebAPI/Controllers/PublicPageMethodController.cs
+++ b/WebAPI/Controllers/PublicPageMethodController.cs
@@ -3473,7 +3473,7 @@
SQLHelper.ClsCN SubCn = new SQLHelper.ClsCN();
string sql = string.Format(@"select '鏉冮檺绠＄悊-鐢ㄦ埛' id,'' HNumber,'鏉冮檺绠＄悊--鐢ㄦ埛' title,'' ParentID
union all
- select gnbm id,gnsy HNumber,gnmc as title, case when sjgnbm='' then '鏉冮檺绠＄悊--鐢ㄦ埛' else sjgnbm end ParentID from Xt_Xtgnb where sjgnbm=''
+ select gnbm id,gnsy HNumber,gnmc as title, case when sjgnbm='' then '鏉冮檺绠＄悊--鐢ㄦ埛' else sjgnbm end ParentID from Xt_Xtgnb where sjgnbm='' and useflag=1
union all
Select gnbm id,gnsy HNumber,gnmc as title,sjgnbm as ParentID
from Xt_Xtgnb where mjbz=0 and useflag=1 and rightflag=1 and sjgnbm in(
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs"
index 27c8be5..eec3a8e 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs"
@@ -640,17 +640,17 @@
{
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");
- }
+ List<object> columnNameList = new List<object>();
+ Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
+
+ string HYear = dic["HYear"].ToString();
+ string HMonth = dic["HMonth"].ToString();
+ string HDivisionName = dic["HDivisionName"].ToString();
+ string HProcName = dic["HProcName"].ToString();
+ string HMaterName = dic["HMaterName"].ToString();
+
+ ds = oCN.RunProcReturn("exec h_p_Sc_StationOutBillQuery_HProc '" + HYear + "','" + HMonth + "','" + HDivisionName + "','" + HProcName + "','" + HMaterName + "'", "h_p_SB_EquipICMOTechParamBillList");
+
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user
index e51588c..bf849b6 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user
@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <History>True|2024-08-28T01:49:18.1543721Z;False|2024-08-28T09:49:11.7260337+08:00;True|2024-08-27T13:18:40.6234335+08:00;False|2024-08-27T13:18:33.9730040+08:00;True|2024-08-26T17:40:29.9158973+08:00;True|2024-08-26T17:21:30.8800173+08:00;True|2024-08-26T17:19:23.9260010+08:00;True|2024-08-26T14:27:20.8154004+08:00;True|2024-08-26T14:16:14.4482284+08:00;True|2024-08-26T13:12:42.9574127+08:00;True|2024-08-26T12:48:31.2107630+08:00;True|2024-08-26T11:07:15.1181342+08:00;False|2024-08-26T11:07:09.9429791+08:00;True|2024-08-26T10:49:20.8494484+08:00;True|2024-08-26T10:13:11.5222607+08:00;False|2024-08-26T10:12:59.1146882+08:00;True|2024-08-23T15:39:39.9842990+08:00;False|2024-08-23T15:39:33.9824708+08:00;True|2024-08-22T16:55:46.4689463+08:00;True|2024-08-22T16:44:25.0981764+08:00;True|2024-08-22T16:19:29.9801909+08:00;True|2024-08-22T14:25:13.5120259+08:00;True|2024-08-22T09:48:50.0760398+08:00;True|2024-08-21T16:09:41.0487181+08:00;True|2024-08-21T15:42:13.7474317+08:00;True|2024-08-21T15:10:24.6912112+08:00;True|2024-08-21T14:56:51.3255866+08:00;True|2024-08-21T14:50:12.3359730+08:00;True|2024-08-19T15:43:16.1549663+08:00;True|2024-08-19T15:27:26.4219971+08:00;True|2024-08-19T09:41:45.7449029+08:00;True|2024-06-08T12:38:30.4153773+08:00;True|2024-06-07T21:22:19.4545597+08:00;True|2024-06-07T21:05:53.1963741+08:00;True|2024-06-07T21:00:57.2568708+08:00;True|2024-06-07T14:39:19.6618679+08:00;True|2024-06-07T14:21:51.5169962+08:00;True|2024-06-07T11:29:08.0690999+08:00;True|2024-06-07T11:26:29.1494329+08:00;True|2024-06-07T11:20:41.2024309+08:00;True|2024-06-07T10:12:26.5905597+08:00;False|2024-06-07T10:11:35.3679434+08:00;</History>
+ <History>True|2024-08-30T08:08:31.2415230Z;True|2024-08-30T15:18:36.6727666+08:00;True|2024-08-28T09:49:18.1543721+08:00;False|2024-08-28T09:49:11.7260337+08:00;True|2024-08-27T13:18:40.6234335+08:00;False|2024-08-27T13:18:33.9730040+08:00;True|2024-08-26T17:40:29.9158973+08:00;True|2024-08-26T17:21:30.8800173+08:00;True|2024-08-26T17:19:23.9260010+08:00;True|2024-08-26T14:27:20.8154004+08:00;True|2024-08-26T14:16:14.4482284+08:00;True|2024-08-26T13:12:42.9574127+08:00;True|2024-08-26T12:48:31.2107630+08:00;True|2024-08-26T11:07:15.1181342+08:00;False|2024-08-26T11:07:09.9429791+08:00;True|2024-08-26T10:49:20.8494484+08:00;True|2024-08-26T10:13:11.5222607+08:00;False|2024-08-26T10:12:59.1146882+08:00;True|2024-08-23T15:39:39.9842990+08:00;False|2024-08-23T15:39:33.9824708+08:00;True|2024-08-22T16:55:46.4689463+08:00;True|2024-08-22T16:44:25.0981764+08:00;True|2024-08-22T16:19:29.9801909+08:00;True|2024-08-22T14:25:13.5120259+08:00;True|2024-08-22T09:48:50.0760398+08:00;True|2024-08-21T16:09:41.0487181+08:00;True|2024-08-21T15:42:13.7474317+08:00;True|2024-08-21T15:10:24.6912112+08:00;True|2024-08-21T14:56:51.3255866+08:00;True|2024-08-21T14:50:12.3359730+08:00;True|2024-08-19T15:43:16.1549663+08:00;True|2024-08-19T15:27:26.4219971+08:00;True|2024-08-19T09:41:45.7449029+08:00;True|2024-06-08T12:38:30.4153773+08:00;True|2024-06-07T21:22:19.4545597+08:00;True|2024-06-07T21:05:53.1963741+08:00;True|2024-06-07T21:00:57.2568708+08:00;True|2024-06-07T14:39:19.6618679+08:00;True|2024-06-07T14:21:51.5169962+08:00;True|2024-06-07T11:29:08.0690999+08:00;True|2024-06-07T11:26:29.1494329+08:00;True|2024-06-07T11:20:41.2024309+08:00;True|2024-06-07T10:12:26.5905597+08:00;False|2024-06-07T10:11:35.3679434+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/28/2024 09:48:56</publishTime>
+ <publishTime>08/30/2024 16:08:17</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>08/28/2024 09:48:56</publishTime>
+ <publishTime>08/30/2024 16:08:17</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>08/28/2024 09:48:55</publishTime>
+ <publishTime>08/30/2024 16:08:16</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>08/28/2024 09:48:55</publishTime>
+ <publishTime>08/30/2024 16:08:16</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>08/28/2024 09:48:52</publishTime>
+ <publishTime>08/30/2024 16:08:13</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>08/28/2024 09:48:52</publishTime>
+ <publishTime>08/30/2024 16:08:13</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/28/2024 09:48:53</publishTime>
+ <publishTime>08/30/2024 16:08:14</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>08/28/2024 09:48:53</publishTime>
+ <publishTime>08/30/2024 16:08:14</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/28/2024 09:48:50</publishTime>
+ <publishTime>08/30/2024 16:08:11</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>08/28/2024 09:48:50</publishTime>
+ <publishTime>08/30/2024 16:08:11</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>08/28/2024 09:48:52</publishTime>
+ <publishTime>08/30/2024 16:08:12</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>08/28/2024 09:48:52</publishTime>
+ <publishTime>08/30/2024 16:08:12</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>08/28/2024 09:48:52</publishTime>
+ <publishTime>08/30/2024 16:08:13</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>08/28/2024 09:48:52</publishTime>
+ <publishTime>08/30/2024 16:08:13</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/28/2024 09:48:53</publishTime>
+ <publishTime>08/30/2024 16:08:12</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>08/28/2024 09:48:53</publishTime>
+ <publishTime>08/30/2024 16:08:12</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>08/28/2024 09:49:04</publishTime>
+ <publishTime>08/30/2024 16:08:23</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>08/28/2024 09:49:04</publishTime>
+ <publishTime>08/30/2024 16:08:23</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/28/2024 09:49:17</publishTime>
+ <publishTime>08/30/2024 16:08:30</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
index a76a891..3b31499 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <History>True|2024-08-26T02:17:08.7733750Z;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History>
+ <History>True|2024-08-29T00:06:32.4732067Z;False|2024-08-29T08:06:02.4801886+08:00;True|2024-08-26T10:17:08.7733750+08:00;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History>
<_PublishTargetUrl>G:\issWeb\缃戠珯鍙戝竷\API</_PublishTargetUrl>
</PropertyGroup>
<ItemGroup>
@@ -45,19 +45,19 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>08/26/2024 10:16:57</publishTime>
+ <publishTime>08/29/2024 08:06:19</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>08/26/2024 10:16:57</publishTime>
+ <publishTime>08/29/2024 08:06:19</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>08/26/2024 10:16:54</publishTime>
+ <publishTime>08/29/2024 08:06:16</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>08/26/2024 10:16:54</publishTime>
+ <publishTime>08/29/2024 08:06:16</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
@@ -279,19 +279,19 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>08/26/2024 10:09:15</publishTime>
+ <publishTime>08/29/2024 07:57:46</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>08/26/2024 10:09:15</publishTime>
+ <publishTime>08/29/2024 07:57:46</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>08/26/2024 10:17:06</publishTime>
+ <publishTime>08/29/2024 08:06:26</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>08/26/2024 10:17:06</publishTime>
+ <publishTime>08/29/2024 08:06:26</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>08/16/2024 16:55:28</publishTime>
@@ -489,7 +489,7 @@
<publishTime>04/29/2024 08:30:03</publishTime>
</File>
<File Include="Web.config">
- <publishTime>08/26/2024 10:17:07</publishTime>
+ <publishTime>08/29/2024 08:06:26</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 0b0c1a7..0910a4e 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -22,7 +22,7 @@
<!--<add key="FileIP" value="http://localhost:8082/LuBaoAPI"/>-->
<!--<add key="FileIP" value="http://localhost:8080/" />-->
<!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/> -->
- <add key="sUrl" value="http://192.168.0.11/WEBS-WMS/WebService1.asmx" /><!--棰滃彴寮忔満-->
+ <!--<add key="sUrl" value="http://192.168.0.11/WEBS-WMS/WebService1.asmx" />--><!--棰滃彴寮忔満-->
<!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> 澶忓疂-->
<!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> -->
<!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/> 鍗氭棩绉戞妧-->
@@ -35,7 +35,7 @@
<!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/> --> <!--娴嬭瘯鏈嶅姟鍣�-->
<!--<add key="surl" value="http://localhost:8082/webs/webservice1.asmx"/> 鏈湴-->
<!--<add key="sUrl" value="http://192.168.110.57:81/WEBS/WebService1.asmx"/>--> <!--闄堥洴闈欐湰鍦伴厤缃�-->
- <!--<add key="surl" value="http://localhost/webs-web/webservice1.asmx"/>--> <!--缈佹稕娑涙湰鍦伴厤缃�-->
+ <add key="surl" value="http://localhost/webs-web/webservice1.asmx"/> <!--缈佹稕娑涙湰鍦伴厤缃�-->
<!--<add key="sUrl" value="http://192.168.1.57:8082/WEBS-WMS/WebService1.asmx"/>涔濊彵-->
<!--<add key="sUrl" value="http://61.130.182.102:18181/WEBSCS/WebService1.asmx"/>--><!--鏂帿灏�-->
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index a3787f9..e86f0b9 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -9,8 +9,8 @@
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile4.pubxml</NameOfLastUsedPublishProfile>
- <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+ <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
+ <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csprojAssemblyReference.cache b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csprojAssemblyReference.cache
new file mode 100644
index 0000000..6bd410c
--- /dev/null
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csprojAssemblyReference.cache
Binary files differ
--
Gitblit v1.9.1