From 540880b7b9a49b9a3debf23cb6b51739474969f3 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 10 一月 2023 12:25:11 +0800
Subject: [PATCH] 设备点检标准、保养标准关联工作站接口去掉最后过滤条件
---
VueWebApi/obj/Release/VueWebApi.pdb | 0
VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache | 0
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb | 0
VueWebApi/obj/Release/VueWebApi.dll | 0
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.dll | 0
VueWebApi/bin/VueWebApi.pdb | 0
.vs/VueWebApi/v16/.suo | 0
VueWebApi/bin/VueWebApi.dll | 0
VueWebApi/DLL/DAL/DeviceManagerDAL.cs | 4 ++--
VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user | 10 +++++-----
10 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/.vs/VueWebApi/v16/.suo b/.vs/VueWebApi/v16/.suo
index b72bfd2..b3d39a7 100644
--- a/.vs/VueWebApi/v16/.suo
+++ b/.vs/VueWebApi/v16/.suo
Binary files differ
diff --git a/VueWebApi/DLL/DAL/DeviceManagerDAL.cs b/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
index 7167bfb..8a361c3 100644
--- a/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
+++ b/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
@@ -1362,7 +1362,7 @@
inner join TEqpchk_Eqp B on A.code=B.eqp_code
where A.wksp_code=@wkspcode and B.eqpchkmain_code=@checkstand_code and A.is_delete<>'1'
) as BB on AA.code=BB.code
- ) as CC where case when flag ='N' and flage1 ='Y' then 0 else 1 end=1";
+ ) as CC ";//where case when flag ='N' and flage1 ='Y' then 0 else 1 end=1
dynamicParams.Add("@checkstand_code", checkstand_code);
dynamicParams.Add("@wkspcode", data.Rows[i]["WKSP_CODE"].ToString());
var data0 = DapperHelper.selectdata(sql, dynamicParams);
@@ -1800,7 +1800,7 @@
inner join TEqpmai_Eqp B on A.code=B.eqp_code
where A.wksp_code=@wkspcode and B.eapmai_code=@repairstand_code and A.is_delete<>'1'
) as BB on AA.code=BB.code
- ) as CC where case when flag ='N' and flage1 ='Y' then 0 else 1 end=1";
+ ) as CC ";//where case when flag ='N' and flage1 ='Y' then 0 else 1 end=1
dynamicParams.Add("@repairstand_code", repairstand_code);
dynamicParams.Add("@wkspcode", data.Rows[i]["WKSP_CODE"].ToString());
var data0 = DapperHelper.selectdata(sql, dynamicParams);
diff --git a/VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user b/VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
index 65aba71..fb24254 100644
--- a/VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
+++ b/VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\MES鐏电繑</_PublishTargetUrl>
- <History>True|2022-12-06T01:16:45.3313819Z;True|2022-12-05T17:22:41.5632159+08:00;True|2022-12-05T17:08:31.1207925+08:00;True|2022-12-05T16:40:51.0731150+08:00;True|2022-12-05T13:17:38.4883581+08:00;True|2022-12-05T13:16:11.2439234+08:00;True|2022-12-05T13:11:31.6502410+08:00;True|2022-12-05T13:06:31.8519147+08:00;True|2022-11-28T17:29:35.0448121+08:00;True|2022-11-21T15:13:51.4848378+08:00;True|2022-11-21T11:02:59.6984011+08:00;True|2022-11-21T10:55:50.7022834+08:00;True|2022-11-18T16:03:51.0449470+08:00;False|2022-11-18T16:03:09.4203709+08:00;True|2022-11-18T16:01:39.4591963+08:00;True|2022-11-18T15:18:55.9443587+08:00;True|2022-11-18T15:18:44.4492390+08:00;True|2022-11-18T13:29:22.9601475+08:00;True|2022-11-18T13:29:05.4108151+08:00;True|2022-11-18T13:25:30.9305617+08:00;True|2022-11-17T10:13:35.2543186+08:00;True|2022-11-16T11:50:20.8332089+08:00;True|2022-11-16T10:30:15.8662476+08:00;True|2022-11-16T09:54:50.9630719+08:00;True|2022-11-11T13:23:20.3484151+08:00;True|2022-11-09T13:07:34.9422662+08:00;True|2022-11-09T10:59:58.4912849+08:00;True|2022-11-09T10:11:04.4851324+08:00;True|2022-11-09T10:10:46.8698985+08:00;</History>
+ <History>True|2022-12-06T01:25:41.3057126Z;True|2022-12-06T09:16:45.3313819+08:00;True|2022-12-05T17:22:41.5632159+08:00;True|2022-12-05T17:08:31.1207925+08:00;True|2022-12-05T16:40:51.0731150+08:00;True|2022-12-05T13:17:38.4883581+08:00;True|2022-12-05T13:16:11.2439234+08:00;True|2022-12-05T13:11:31.6502410+08:00;True|2022-12-05T13:06:31.8519147+08:00;True|2022-11-28T17:29:35.0448121+08:00;True|2022-11-21T15:13:51.4848378+08:00;True|2022-11-21T11:02:59.6984011+08:00;True|2022-11-21T10:55:50.7022834+08:00;True|2022-11-18T16:03:51.0449470+08:00;False|2022-11-18T16:03:09.4203709+08:00;True|2022-11-18T16:01:39.4591963+08:00;True|2022-11-18T15:18:55.9443587+08:00;True|2022-11-18T15:18:44.4492390+08:00;True|2022-11-18T13:29:22.9601475+08:00;True|2022-11-18T13:29:05.4108151+08:00;True|2022-11-18T13:25:30.9305617+08:00;True|2022-11-17T10:13:35.2543186+08:00;True|2022-11-16T11:50:20.8332089+08:00;True|2022-11-16T10:30:15.8662476+08:00;True|2022-11-16T09:54:50.9630719+08:00;True|2022-11-11T13:23:20.3484151+08:00;True|2022-11-09T13:07:34.9422662+08:00;True|2022-11-09T10:59:58.4912849+08:00;True|2022-11-09T10:11:04.4851324+08:00;True|2022-11-09T10:10:46.8698985+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="Areas/HelpPage/HelpPage.css">
@@ -705,13 +705,13 @@
<publishTime>12/24/2021 15:38:29</publishTime>
</File>
<File Include="bin/VueWebApi.dll">
- <publishTime>12/06/2022 09:16:39</publishTime>
+ <publishTime>12/06/2022 09:25:35</publishTime>
</File>
<File Include="bin/VueWebApi.pdb">
- <publishTime>12/06/2022 09:16:39</publishTime>
+ <publishTime>12/06/2022 09:25:35</publishTime>
</File>
<File Include="bin/VueWebApi.xml">
- <publishTime>12/06/2022 09:16:39</publishTime>
+ <publishTime>12/06/2022 09:25:35</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>02/08/2013 16:42:28</publishTime>
@@ -1074,7 +1074,7 @@
<publishTime>06/16/2022 13:39:23</publishTime>
</File>
<File Include="Web.config">
- <publishTime>12/06/2022 09:16:44</publishTime>
+ <publishTime>12/06/2022 09:25:40</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/VueWebApi/bin/VueWebApi.dll b/VueWebApi/bin/VueWebApi.dll
index 6d69600..cd5232a 100644
--- a/VueWebApi/bin/VueWebApi.dll
+++ b/VueWebApi/bin/VueWebApi.dll
Binary files differ
diff --git a/VueWebApi/bin/VueWebApi.pdb b/VueWebApi/bin/VueWebApi.pdb
index fe3595e..4bcd273 100644
--- a/VueWebApi/bin/VueWebApi.pdb
+++ b/VueWebApi/bin/VueWebApi.pdb
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.dll b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.dll
index 6d69600..cd5232a 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.dll
+++ b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.dll
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
index fe3595e..4bcd273 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
+++ b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
Binary files differ
diff --git a/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache b/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..f6e035c
--- /dev/null
+++ b/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache
Binary files differ
diff --git a/VueWebApi/obj/Release/VueWebApi.dll b/VueWebApi/obj/Release/VueWebApi.dll
index 6d69600..cd5232a 100644
--- a/VueWebApi/obj/Release/VueWebApi.dll
+++ b/VueWebApi/obj/Release/VueWebApi.dll
Binary files differ
diff --git a/VueWebApi/obj/Release/VueWebApi.pdb b/VueWebApi/obj/Release/VueWebApi.pdb
index fe3595e..4bcd273 100644
--- a/VueWebApi/obj/Release/VueWebApi.pdb
+++ b/VueWebApi/obj/Release/VueWebApi.pdb
Binary files differ
--
Gitblit v1.9.3