From 16ed2221438c126755fc0b09308f26ddcbd9a2c4 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 18 十一月 2022 16:52:28 +0800
Subject: [PATCH] 修改报工去掉班组
---
VueWebApi/obj/Release/VueWebApi.pdb | 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/Models/UpdateProductReport.cs | 1 -
VueWebApi/bin/VueWebApi.pdb | 0
.vs/VueWebApi/v16/.suo | 0
VueWebApi/bin/VueWebApi.dll | 0
VueWebApi/DLL/DAL/ProductionManagementDAL.cs | 5 ++---
VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user | 10 +++++-----
10 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/.vs/VueWebApi/v16/.suo b/.vs/VueWebApi/v16/.suo
index 648262b..9fb2d61 100644
--- a/.vs/VueWebApi/v16/.suo
+++ b/.vs/VueWebApi/v16/.suo
Binary files differ
diff --git a/VueWebApi/DLL/DAL/ProductionManagementDAL.cs b/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
index d774f08..fd8112f 100644
--- a/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
+++ b/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
@@ -2404,7 +2404,7 @@
var total = 0; //鎬绘潯鏁�
var sql = @"select * from(
select A.id,B.id as sbid,A.wo_code,A.materiel_code as partnumber,P.partname,P.partspec,A.task_qty,M.wkshp_code,G.org_name as wkshp_name,A.eqp_code,E.name as eqp_name,
- M.route_code,R.name as route_name,A.step_code,S.stepname,S.flwtype,D.first_choke,D.last_choke,T.unprice,B.usergroup_code,O.group_name as usergroup_name,B.report_person as usercode,U.username,
+ M.route_code,R.name as route_name,A.step_seq,A.step_code,S.stepname,S.flwtype,D.first_choke,D.last_choke,T.unprice,B.report_person as usercode,U.username,
B.report_date,B.report_qty,B.ng_qty,B.bad_qty,B.verify,B.bad_money
from TK_Wrk_Record A
inner join TK_Wrk_RecordSub B on A.id=B.m_id
@@ -2417,7 +2417,6 @@
left join TFlw_Rout R on M.route_code=R.code
left join TFlw_Rtdt D on M.route_code=D.rout_code and A.step_code=D.step_code
left join TUser U on B.report_person=U.usercode
- left join TGroup O on U.usergroup_code=O.group_code
where A.style='B' and B.style='B' and M.status<>'CLOSED'
) as AA where" + search;
//union all
@@ -2785,7 +2784,7 @@
first_choke=json[i].first_choke.ToString(),
last_choke=json[i].last_choke.ToString(),
unprice=json[i].unprice.ToString(),
- usergroup_code=json[i].usergroup_code.ToString(),
+ usergroup_code="",
usercode=json[i].usercode.ToString(),
report_date=json[i].report_date.ToString(),
report_qty=json[i].report_qty.ToString(),
diff --git a/VueWebApi/Models/UpdateProductReport.cs b/VueWebApi/Models/UpdateProductReport.cs
index b4c6e1c..018a532 100644
--- a/VueWebApi/Models/UpdateProductReport.cs
+++ b/VueWebApi/Models/UpdateProductReport.cs
@@ -24,7 +24,6 @@
public string first_choke { get; set; } //鏄惁棣栭亾宸ュ簭
public string last_choke { get; set; } //鏄惁鏈亾宸ュ簭
public string unprice { get; set; } //宸ュ簭鍗曚环
- public string usergroup_code { get; set; } //鐢ㄦ埛缁勭紪鐮�
public string usercode { get; set; } //鎶ュ伐浜哄憳缂栫爜
public string report_date { get; set; } //鎶ュ伐鏃堕棿
public string report_qty { get; set; } //鎶ュ伐鏁伴噺
diff --git a/VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user b/VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
index 0229051..adad2cd 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-11-18T07:18:55.9443587Z;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-11-18T08:03:51.0449470Z;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>11/18/2022 15:18:38</publishTime>
+ <publishTime>11/18/2022 16:03:45</publishTime>
</File>
<File Include="bin/VueWebApi.pdb">
- <publishTime>11/18/2022 15:18:38</publishTime>
+ <publishTime>11/18/2022 16:03:45</publishTime>
</File>
<File Include="bin/VueWebApi.xml">
- <publishTime>11/18/2022 15:18:38</publishTime>
+ <publishTime>11/18/2022 16:03:45</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>11/18/2022 15:18:43</publishTime>
+ <publishTime>11/18/2022 16:03:50</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/VueWebApi/bin/VueWebApi.dll b/VueWebApi/bin/VueWebApi.dll
index ea31fa3..7cd1d2a 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 055a107..35a1514 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 ea31fa3..7cd1d2a 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 055a107..35a1514 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.dll b/VueWebApi/obj/Release/VueWebApi.dll
index ea31fa3..7cd1d2a 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 055a107..35a1514 100644
--- a/VueWebApi/obj/Release/VueWebApi.pdb
+++ b/VueWebApi/obj/Release/VueWebApi.pdb
Binary files differ
--
Gitblit v1.9.3