From 69610af55238731e23083fcda4a8af3c8dca015c Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期六, 04 三月 2023 16:03:26 +0800
Subject: [PATCH] PC计件工资报表去掉车间关联
---
VueWebApi/obj/Release/VueWebApi.pdb | 0
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb | 0
VueWebApi/DLL/DAL/ReportManagerDAL.cs | 8 ++++----
VueWebApi/bin/VueWebApi.pdb | 0
.vs/VueWebApi/v16/.suo | 0
VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user | 10 +++++-----
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/.vs/VueWebApi/v16/.suo b/.vs/VueWebApi/v16/.suo
index 2328c9d..37deb14 100644
--- a/.vs/VueWebApi/v16/.suo
+++ b/.vs/VueWebApi/v16/.suo
Binary files differ
diff --git a/VueWebApi/DLL/DAL/ReportManagerDAL.cs b/VueWebApi/DLL/DAL/ReportManagerDAL.cs
index 3008c90..c842294 100644
--- a/VueWebApi/DLL/DAL/ReportManagerDAL.cs
+++ b/VueWebApi/DLL/DAL/ReportManagerDAL.cs
@@ -288,7 +288,7 @@
inner join TK_Wrk_Step P on A.wo_code=P.wo_code and A.step_code=P.step_code
left join TK_Wrk_Man K on A.wo_code=K.wo_code
left join TGroup G on B.usergroup_code=G.group_code
- left join TPrteEqp_Stad S on A.materiel_code=S.materiel_code and A.eqp_code=S.eqp_code and A.step_code=S.step_code and K.route_code=S.route_code and K.wkshp_code=S.wkspcode
+ left join TPrteEqp_Stad S on A.materiel_code=S.materiel_code and A.eqp_code=S.eqp_code and A.step_code=S.step_code and K.route_code=S.route_code
left join TMateriel_Info M on A.materiel_code=M.partcode
left join TStep T on A.step_code=T.stepcode
left join TUser U on A.lm_user=U.usercode
@@ -407,7 +407,7 @@
inner join TK_Wrk_Step P on A.wo_code=P.wo_code and A.step_code=P.step_code
left join TK_Wrk_Man K on A.wo_code=K.wo_code
left join TGroup G on B.usergroup_code=G.group_code
- left join TPrteEqp_Stad S on A.materiel_code=S.materiel_code and A.eqp_code=S.eqp_code and A.step_code=S.step_code and K.route_code=S.route_code and K.wkshp_code=S.wkspcode
+ left join TPrteEqp_Stad S on A.materiel_code=S.materiel_code and A.eqp_code=S.eqp_code and A.step_code=S.step_code and K.route_code=S.route_code
left join TMateriel_Info M on A.materiel_code=M.partcode
left join TStep T on A.step_code=T.stepcode
left join TUser U on A.lm_user=U.usercode
@@ -505,7 +505,7 @@
inner join TK_Wrk_Step P on A.wo_code=P.wo_code and A.step_code=P.step_code
left join TK_Wrk_Man K on A.wo_code=K.wo_code
left join TGroup G on B.usergroup_code=G.group_code
- left join TPrteEqp_Stad S on A.materiel_code=S.materiel_code and A.eqp_code=S.eqp_code and A.step_code=S.step_code and K.route_code=S.route_code and K.wkshp_code=S.wkspcode
+ left join TPrteEqp_Stad S on A.materiel_code=S.materiel_code and A.eqp_code=S.eqp_code and A.step_code=S.step_code and K.route_code=S.route_code
left join TMateriel_Info M on A.materiel_code=M.partcode
left join TStep T on A.step_code=T.stepcode
left join TUser U on B.report_person=U.usercode
@@ -601,7 +601,7 @@
inner join TK_Wrk_Step P on A.wo_code=P.wo_code and A.step_code=P.step_code
left join TK_Wrk_Man K on A.wo_code=K.wo_code
left join TGroup G on B.usergroup_code=G.group_code
- left join TPrteEqp_Stad S on A.materiel_code=S.materiel_code and A.eqp_code=S.eqp_code and A.step_code=S.step_code and K.route_code=S.route_code and K.wkshp_code=S.wkspcode
+ left join TPrteEqp_Stad S on A.materiel_code=S.materiel_code and A.eqp_code=S.eqp_code and A.step_code=S.step_code and K.route_code=S.route_code
left join TMateriel_Info M on A.materiel_code=M.partcode
left join TStep T on A.step_code=T.stepcode
left join TUser U on B.report_person=U.usercode
diff --git a/VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user b/VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
index 04f5c31..4ed2b14 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|2023-03-04T03:24:07.2811270Z;True|2023-03-03T16:01:45.2965979+08:00;</History>
+ <History>True|2023-03-04T06:44:43.4920595Z;True|2023-03-04T11:24:07.2811270+08:00;True|2023-03-03T16:01:45.2965979+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="Areas/HelpPage/HelpPage.css">
@@ -714,13 +714,13 @@
<publishTime>12/24/2021 15:38:29</publishTime>
</File>
<File Include="bin/VueWebApi.dll">
- <publishTime>03/04/2023 11:23:53</publishTime>
+ <publishTime>03/04/2023 14:44:36</publishTime>
</File>
<File Include="bin/VueWebApi.pdb">
- <publishTime>03/04/2023 11:23:53</publishTime>
+ <publishTime>03/04/2023 14:44:36</publishTime>
</File>
<File Include="bin/VueWebApi.xml">
- <publishTime>03/04/2023 11:23:53</publishTime>
+ <publishTime>03/04/2023 14:44:36</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>02/08/2013 16:42:28</publishTime>
@@ -1098,7 +1098,7 @@
<publishTime>06/16/2022 13:39:23</publishTime>
</File>
<File Include="Web.config">
- <publishTime>03/04/2023 11:24:05</publishTime>
+ <publishTime>03/04/2023 14:44:42</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/VueWebApi/bin/VueWebApi.pdb b/VueWebApi/bin/VueWebApi.pdb
index 1e3a37e..19efc9d 100644
--- a/VueWebApi/bin/VueWebApi.pdb
+++ b/VueWebApi/bin/VueWebApi.pdb
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
index 1e3a37e..19efc9d 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.pdb b/VueWebApi/obj/Release/VueWebApi.pdb
index 1e3a37e..19efc9d 100644
--- a/VueWebApi/obj/Release/VueWebApi.pdb
+++ b/VueWebApi/obj/Release/VueWebApi.pdb
Binary files differ
--
Gitblit v1.9.3