From 2a1c73ffedfbdb08d8aa016987f413de7911dfe4 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 18 十一月 2022 15:29:45 +0800
Subject: [PATCH] 修改报工接口修改
---
VueWebApi/obj/Release/VueWebApi.pdb | 0
VueWebApi/Logs/2022-11-18.TXT | 0
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.dll | 0
VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt | 1 -
VueWebApi/Models/UpdateProductReport.cs | 1 +
.vs/VueWebApi/v16/.suo | 0
VueWebApi/bin/VueWebApi.dll | 0
VueWebApi/DLL/DAL/ProductionManagementDAL.cs | 28 +++++++++++++++-------------
VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user | 10 +++++-----
/dev/null | 0
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb | 0
VueWebApi/Controllers/ProductionManagementController.cs | 2 +-
VueWebApi/obj/Release/VueWebApi.dll | 0
VueWebApi/bin/VueWebApi.pdb | 0
14 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/.vs/VueWebApi/v16/.suo b/.vs/VueWebApi/v16/.suo
index 8ae50bf..648262b 100644
--- a/.vs/VueWebApi/v16/.suo
+++ b/.vs/VueWebApi/v16/.suo
Binary files differ
diff --git a/VueWebApi/Controllers/ProductionManagementController.cs b/VueWebApi/Controllers/ProductionManagementController.cs
index 4b2bca1..69ccf3c 100644
--- a/VueWebApi/Controllers/ProductionManagementController.cs
+++ b/VueWebApi/Controllers/ProductionManagementController.cs
@@ -661,7 +661,7 @@
/// <returns></returns>
[Route(template: "MesOrderStepVerifySearch")]
[HttpGet]
- public HttpResponseMessage MesOrderStepVerifySearch(string verify, string wo_code=null,string partnumber=null,string partname=null,string partspec=null,string reportuser=null,string reportdate=null, int page = 0, int rows = 0, string prop = null, string order = null)
+ public HttpResponseMessage MesOrderStepVerifySearch(string verify=null, string wo_code=null,string partnumber=null,string partname=null,string partspec=null,string reportuser=null,string reportdate=null, int page = 0, int rows = 0, string prop = null, string order = null)
{
string reportdateopendate = ""; //鏀舵枡寮�濮嬫椂闂�
string reportdateclosedate = ""; //鏀舵枡缁撴潫鏃堕棿
diff --git a/VueWebApi/DLL/DAL/ProductionManagementDAL.cs b/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
index a5c3496..d774f08 100644
--- a/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
+++ b/VueWebApi/DLL/DAL/ProductionManagementDAL.cs
@@ -2359,7 +2359,7 @@
{
if (verify != "" && verify != null)
{
- search += "and B.verify=@verify ";
+ search += "and AA.verify=@verify ";
dynamicParams.Add("@verify", verify);
}
if (wo_code != "" && wo_code != null)
@@ -2405,7 +2405,7 @@
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,
- B.report_date,B.report_qty,B.ng_qty,B.bad_qty,B.verify
+ 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
left join TK_Wrk_Man M on A.wo_code=M.wo_code
@@ -2629,7 +2629,7 @@
///////////////////////////////淇敼鎶ュ伐//////////////////////////////
//鍥炲啓瀵瑰簲鐨勬姤宸ヨ褰曞瓙琛ㄥ悎鏍兼暟閲忋�佷笉鑹暟閲忋�佹姤搴熸暟閲�
- sql = @"update TK_Wrk_RecordSub set report_qty=report_qty+@repair_qty,ng_qty=ng_qty+@ng_qty,bad_qty=bad_qty+@bad_qty,
+ sql = @"update TK_Wrk_RecordSub set report_qty=report_qty+@repair_qty,ng_qty=ng_qty+@ng_qty,bad_qty=bad_qty+@bad_qty,bad_money=bad_money+@bad_money,
updatereportuser=@updatereportuser,updatereportdate=@updatereportdate
where m_id=@m_id and id=@id and style='B'";
list.Add(new
@@ -2639,9 +2639,10 @@
{
m_id = int.Parse(json[i].id),
id = int.Parse(json[i].sbid),
- repair_qty = decimal.Parse(json[i].report_qty),
- ng_qty = decimal.Parse(json[i].ng_qty),
- bad_qty = decimal.Parse(json[i].bad_qty),
+ repair_qty = decimal.Parse(json[i].report_dvalue),
+ ng_qty = decimal.Parse(json[i].ng_dvalue),
+ bad_qty = decimal.Parse(json[i].bad_dvalue),
+ bad_money = decimal.Parse(json[i].badmoney_dvalue),
updatereportuser = username,
updatereportdate = date
}
@@ -2654,9 +2655,9 @@
str = sql,
parm = new
{
- good_qty = decimal.Parse(json[i].report_qty),
- ng_qty = decimal.Parse(json[i].ng_qty),
- bad_qty = decimal.Parse(json[i].bad_qty),
+ good_qty = decimal.Parse(json[i].report_dvalue),
+ ng_qty = decimal.Parse(json[i].ng_dvalue),
+ bad_qty = decimal.Parse(json[i].bad_dvalue),
wo_code = json[i].wo_code,
step_code = json[i].step_code,
id = int.Parse(json[i].id)
@@ -2670,7 +2671,7 @@
str = sql,
parm = new
{
- ng_qty = decimal.Parse(json[i].ng_qty),
+ ng_qty = decimal.Parse(json[i].ng_dvalue),
wo_code = json[i].wo_code,
step_code = json[i].step_code,
id = int.Parse(json[i].id),
@@ -2762,9 +2763,9 @@
});
//鍐欏叆鎶ュ伐璁板綍瀹℃牳琛�
sql = @"insert into TK_WorkRecord_Verify(report_id,report_sbid,wo_code,partnumber,task_qty,wkshp_code,eqp_code,route_code,
- step_seq,step_code,flw_type,first_choke,last_choke,unprice,usergroup_code,usercode,report_date,report_qty,report_dvalue,ng_qty,ng_dvalue,bad_qty,bad_dvalue,bad_money)
+ step_seq,step_code,flw_type,first_choke,last_choke,unprice,usergroup_code,usercode,report_date,report_qty,report_dvalue,ng_qty,ng_dvalue,bad_qty,bad_dvalue,bad_money,badmoney_dvalue)
values(@report_id,@report_sbid,@wo_code,@partnumber,@task_qty,@wkshp_code,@eqp_code,@route_code,
- @step_seq,@step_code,@flw_type,@first_choke,@last_choke,@unprice,@usergroup_code,@usercode,@report_date,@report_qty,@report_dvalue,@ng_qty,@ng_dvalue,@bad_qty,@bad_dvalue,@bad_money)";
+ @step_seq,@step_code,@flw_type,@first_choke,@last_choke,@unprice,@usergroup_code,@usercode,@report_date,@report_qty,@report_dvalue,@ng_qty,@ng_dvalue,@bad_qty,@bad_dvalue,@bad_money,@badmoney_dvalue)";
list.Add(new
{
str = sql,
@@ -2793,7 +2794,8 @@
ng_dvalue=json[i].ng_dvalue.ToString(),
bad_qty=json[i].bad_qty.ToString(),
bad_dvalue=json[i].bad_dvalue.ToString(),
- bad_money=json[i].bad_money.ToString()
+ bad_money=json[i].bad_money.ToString(),
+ badmoney_dvalue= json[i].badmoney_dvalue.ToString()
}
});
}
diff --git a/VueWebApi/Logs/2022-11-18.TXT b/VueWebApi/Logs/2022-11-18.TXT
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/VueWebApi/Logs/2022-11-18.TXT
diff --git a/VueWebApi/Models/UpdateProductReport.cs b/VueWebApi/Models/UpdateProductReport.cs
index 85ddc13..b4c6e1c 100644
--- a/VueWebApi/Models/UpdateProductReport.cs
+++ b/VueWebApi/Models/UpdateProductReport.cs
@@ -34,5 +34,6 @@
public string bad_qty { get; set; } //鎶ュ簾鏁伴噺
public string bad_dvalue { get; set; } //鎶ュ簾鏁伴噺宸��
public string bad_money { get; set; } //鎶ュ簾閲戦
+ public string badmoney_dvalue { get; set; } //鎶ュ簾宸��
}
}
\ No newline at end of file
diff --git a/VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user b/VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
index 854299f..0229051 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-18T05:25:30.9305617Z;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-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>
</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 13:25:23</publishTime>
+ <publishTime>11/18/2022 15:18:38</publishTime>
</File>
<File Include="bin/VueWebApi.pdb">
- <publishTime>11/18/2022 13:25:23</publishTime>
+ <publishTime>11/18/2022 15:18:38</publishTime>
</File>
<File Include="bin/VueWebApi.xml">
- <publishTime>11/18/2022 13:25:23</publishTime>
+ <publishTime>11/18/2022 15:18:38</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 13:25:30</publishTime>
+ <publishTime>11/18/2022 15:18:43</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/VueWebApi/bin/VueWebApi.dll b/VueWebApi/bin/VueWebApi.dll
index fa5eec5..ea31fa3 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 75690bf..055a107 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 fa5eec5..ea31fa3 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 75690bf..055a107 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
deleted file mode 100644
index f5e894a..0000000
--- a/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt b/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt
index 522c540..44eea37 100644
--- a/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt
+++ b/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt
@@ -845,7 +845,6 @@
D:\鏂板嚡杩狹ES\MES椤圭洰\MES鐏电繑\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.resources.dll
D:\鏂板嚡杩狹ES\MES椤圭洰\MES鐏电繑\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.Deployment.resources.dll
D:\鏂板嚡杩狹ES\MES椤圭洰\MES鐏电繑\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.Razor.resources.dll
-D:\鏂板嚡杩狹ES\MES椤圭洰\MES鐏电繑\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.AssemblyReference.cache
D:\鏂板嚡杩狹ES\MES椤圭洰\MES鐏电繑\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.CoreCompileInputs.cache
D:\鏂板嚡杩狹ES\MES椤圭洰\MES鐏电繑\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.CopyComplete
D:\鏂板嚡杩狹ES\MES椤圭洰\MES鐏电繑\VueWebApi\VueWebApi\obj\Release\VueWebApi.dll
diff --git a/VueWebApi/obj/Release/VueWebApi.dll b/VueWebApi/obj/Release/VueWebApi.dll
index fa5eec5..ea31fa3 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 75690bf..055a107 100644
--- a/VueWebApi/obj/Release/VueWebApi.pdb
+++ b/VueWebApi/obj/Release/VueWebApi.pdb
Binary files differ
--
Gitblit v1.9.3