From 1a87a3bd6b3a85f7c7274f56a28a95135b351fbe Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 02 十二月 2022 09:52:13 +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/DLL/DAL/KanBanManagerentDAL.cs | 5 +++--
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.dll | 0
VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt | 1 -
VueWebApi/bin/VueWebApi.pdb | 0
.vs/VueWebApi/v16/.suo | 0
VueWebApi/bin/VueWebApi.dll | 0
VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user | 10 +++++-----
11 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/.vs/VueWebApi/v16/.suo b/.vs/VueWebApi/v16/.suo
index e84671d..f4bdeab 100644
--- a/.vs/VueWebApi/v16/.suo
+++ b/.vs/VueWebApi/v16/.suo
Binary files differ
diff --git a/VueWebApi/DLL/DAL/KanBanManagerentDAL.cs b/VueWebApi/DLL/DAL/KanBanManagerentDAL.cs
index 7f36c64..e47f525 100644
--- a/VueWebApi/DLL/DAL/KanBanManagerentDAL.cs
+++ b/VueWebApi/DLL/DAL/KanBanManagerentDAL.cs
@@ -677,7 +677,7 @@
try
{
//瀵屽皵杈捐溅闂磋川閲忔暟瀛楀寲鐪嬫澘,涓嶈壇鏄庣粏(鍙栬川妫�宸ュ簭,鎸変骇绾跨粺璁�)
- sql = @"select row_number() over(order by MM.lm_date,MM.wo_code) as RowNum,MM.lm_date,A.eqp_code,E.name as eqp_name,MM.wo_code,A.materiel_code,MM.step_code,T.stepname,A.good_qty as report_qty,A.ng_qty,
+ sql = @"select row_number() over(order by MM.lm_date,MM.wo_code) as RowNum,MM.lm_date,A.eqp_code,E.name as eqp_name,MM.wo_code,A.materiel_code,M.partname,MM.step_code,T.stepname,A.good_qty as report_qty,A.ng_qty,
defect_name=( STUFF(( SELECT ',' + B.name
FROM CSR_WorkRecord_Defect N
inner join TDefect B on N.defect_code=B.code
@@ -690,8 +690,9 @@
inner join TK_Wrk_Step S on A.wo_code=S.wo_code and A.step_code=S.step_code
inner join TStep T on MM.step_code=T.stepcode
inner join TEqpInfo E on A.eqp_code=E.code
+ inner join TMateriel_Info M on A.materiel_code=M.partcode
where MM.step_code=@StepCode and MM.style='B' and A.style='B' and A.ng_qty>0 and S.status<>'CLOSED'
- group by MM.lm_date,MM.record_id,A.eqp_code,E.name,MM.wo_code,A.materiel_code,MM.step_code,T.stepname,A.good_qty,A.ng_qty";
+ group by MM.lm_date,MM.record_id,A.eqp_code,E.name,MM.wo_code,A.materiel_code,M.partname,MM.step_code,T.stepname,A.good_qty,A.ng_qty";
dynamicParams.Add("@StepCode", StepCode);
var data = DapperHelper.selectdata(sql, dynamicParams);
mes.code = "200";
diff --git a/VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user b/VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
index ba7d9f9..de15384 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-02T00:40:39.6638743Z;True|2022-12-01T14:57:53.4186199+08:00;True|2022-11-30T15:59:10.4273430+08:00;True|2022-11-30T14:04:20.4425530+08:00;True|2022-11-30T14:03:51.8326823+08:00;True|2022-11-30T13:26:46.0316090+08:00;True|2022-11-29T08:57:17.3697109+08:00;True|2022-11-23T14:06:03.8602775+08:00;True|2022-11-21T15:13:10.4385853+08:00;True|2022-11-16T10:29:41.2258924+08:00;True|2022-11-16T09:54:23.4213778+08:00;</History>
+ <History>True|2022-12-02T01:48:15.8632783Z;True|2022-12-02T09:39:45.8161756+08:00;True|2022-12-02T08:40:39.6638743+08:00;True|2022-12-01T14:57:53.4186199+08:00;True|2022-11-30T15:59:10.4273430+08:00;True|2022-11-30T14:04:20.4425530+08:00;True|2022-11-30T14:03:51.8326823+08:00;True|2022-11-30T13:26:46.0316090+08:00;True|2022-11-29T08:57:17.3697109+08:00;True|2022-11-23T14:06:03.8602775+08:00;True|2022-11-21T15:13:10.4385853+08:00;True|2022-11-16T10:29:41.2258924+08:00;True|2022-11-16T09:54:23.4213778+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/02/2022 08:40:32</publishTime>
+ <publishTime>12/02/2022 09:48:10</publishTime>
</File>
<File Include="bin/VueWebApi.pdb">
- <publishTime>12/02/2022 08:40:32</publishTime>
+ <publishTime>12/02/2022 09:48:10</publishTime>
</File>
<File Include="bin/VueWebApi.xml">
- <publishTime>12/02/2022 08:40:32</publishTime>
+ <publishTime>12/02/2022 09:48:09</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/02/2022 08:40:39</publishTime>
+ <publishTime>12/02/2022 09:48:15</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/VueWebApi/bin/VueWebApi.dll b/VueWebApi/bin/VueWebApi.dll
index 58229fb..37a2449 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 53100f5..c008df7 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 58229fb..37a2449 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 53100f5..c008df7 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
index deaaa59..46b571b 100644
--- a/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache
+++ b/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache
Binary files differ
diff --git a/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt b/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt
index 83d83ba..3597e89 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 58229fb..37a2449 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 53100f5..c008df7 100644
--- a/VueWebApi/obj/Release/VueWebApi.pdb
+++ b/VueWebApi/obj/Release/VueWebApi.pdb
Binary files differ
--
Gitblit v1.9.3