From 6ebb7a292cac210551186eed94a0bfdcd34494d3 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 13 三月 2023 10:58:01 +0800
Subject: [PATCH] 用户清单数据验证 班组验证提示信息修改
---
VueWebApi/Tools/ImportExcelData.cs | 4 ++--
VueWebApi/bin/VueWebApi.xml | 17 +++++++++++++++++
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.csproj.FileListAbsolute.txt | 1 +
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml | 17 +++++++++++++++++
VueWebApi/bin/VueWebApi.pdb | 0
.vs/VueWebApi/v16/.suo | 0
VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user | 10 +++++-----
10 files changed, 42 insertions(+), 7 deletions(-)
diff --git a/.vs/VueWebApi/v16/.suo b/.vs/VueWebApi/v16/.suo
index e01e36f..021f3ce 100644
--- a/.vs/VueWebApi/v16/.suo
+++ b/.vs/VueWebApi/v16/.suo
Binary files differ
diff --git a/VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user b/VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user
index ec625b4..fe87ac0 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-06T08:28:52.5324366Z;True|2023-03-04T14:39:07.6196796+08:00;True|2023-03-04T11:14:42.4747638+08:00;True|2023-03-03T16:04:05.4168918+08:00;True|2023-02-27T14:08:22.9246071+08:00;</History>
+ <History>True|2023-03-13T02:44:20.6460094Z;True|2023-03-07T07:53:47.8742070+08:00;True|2023-03-06T16:28:52.5324366+08:00;True|2023-03-04T14:39:07.6196796+08:00;True|2023-03-04T11:14:42.4747638+08:00;True|2023-03-03T16:04:05.4168918+08:00;True|2023-02-27T14:08:22.9246071+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/06/2023 16:28:39</publishTime>
+ <publishTime>03/13/2023 10:44:13</publishTime>
</File>
<File Include="bin/VueWebApi.pdb">
- <publishTime>03/06/2023 16:28:39</publishTime>
+ <publishTime>03/13/2023 10:44:13</publishTime>
</File>
<File Include="bin/VueWebApi.xml">
- <publishTime>03/06/2023 16:28:39</publishTime>
+ <publishTime>03/13/2023 10:44:13</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/06/2023 16:28:51</publishTime>
+ <publishTime>03/13/2023 10:44:20</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/VueWebApi/Tools/ImportExcelData.cs b/VueWebApi/Tools/ImportExcelData.cs
index ce03a64..45f86ef 100644
--- a/VueWebApi/Tools/ImportExcelData.cs
+++ b/VueWebApi/Tools/ImportExcelData.cs
@@ -1945,7 +1945,7 @@
ExcelErro erro = new ExcelErro();
erro.RoeNumber = "/";
erro.ErrorField = "{鐢ㄦ埛缂栫爜(鍞竴)}";
- erro.ErrorCont = "鐢ㄦ埛琛�:{鐢ㄦ埛缂栫爜(鍞竴)}瀛楁" + excelTable[1].Rows[k][2].ToString().Trim() + "宸插瓨鍦�";
+ erro.ErrorCont = "鐢ㄦ埛琛�:{鐢ㄦ埛缂栫爜(鍞竴)}瀛楁" + excelTable[1].Rows[k][1].ToString().Trim() + "宸插瓨鍦�";
list.Add(erro);
}
}
@@ -1959,7 +1959,7 @@
ExcelErro erro = new ExcelErro();
erro.RoeNumber = "/";
erro.ErrorField = "{缁勭粐缂栫爜}";
- erro.ErrorCont = "鐢ㄦ埛琛�:{缁勭粐缂栫爜}瀛楁" + excelTable[1].Rows[k][2].ToString().Trim() + "涓嶅瓨鍦�";
+ erro.ErrorCont = "鐢ㄦ埛琛�:{缁勭粐缂栫爜}瀛楁" + excelTable[1].Rows[k][7].ToString().Trim() + "涓嶅瓨鍦�";
list.Add(erro);
}
}
diff --git a/VueWebApi/bin/VueWebApi.pdb b/VueWebApi/bin/VueWebApi.pdb
index c4c4e95..cd27bdf 100644
--- a/VueWebApi/bin/VueWebApi.pdb
+++ b/VueWebApi/bin/VueWebApi.pdb
Binary files differ
diff --git a/VueWebApi/bin/VueWebApi.xml b/VueWebApi/bin/VueWebApi.xml
index 412d54e..0053758 100644
--- a/VueWebApi/bin/VueWebApi.xml
+++ b/VueWebApi/bin/VueWebApi.xml
@@ -2234,6 +2234,23 @@
<param name="order">鎺掑簭瑙勫垯</param>
<returns></returns>
</member>
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.MesBadOrderSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <summary>
+ MES鎶ュ簾琛ュ崟宸ュ崟鏌ヨ
+ </summary>
+ <param name="mesordercode">宸ュ崟缂栧彿</param>
+ <param name="sourceorder">婧愬崟鍗曞彿</param>
+ <param name="partcode">浜у搧缂栫爜</param>
+ <param name="partname">浜у搧鍚嶇О</param>
+ <param name="partspec">浜у搧瑙勬牸</param>
+ <param name="creatuser">鍒涘缓浜哄憳</param>
+ <param name="createdate">鍒涘缓鏃堕棿</param>
+ <param name="page">椤电爜</param>
+ <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ <param name="prop">鎺掑簭瀛楁</param>
+ <param name="order">鎺掑簭瑙勫垯</param>
+ <returns></returns>
+ </member>
<member name="M:VueWebApi.Controllers.ProductionManagementController.PartSelectRoute(System.String)">
<summary>
浜у搧缂栫爜鏌ユ壘宸ヨ壓璺嚎涓嬫媺鎺ュ彛
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
index c4c4e95..cd27bdf 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/Package/PackageTmp/bin/VueWebApi.xml b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
index 412d54e..0053758 100644
--- a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
+++ b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml
@@ -2234,6 +2234,23 @@
<param name="order">鎺掑簭瑙勫垯</param>
<returns></returns>
</member>
+ <member name="M:VueWebApi.Controllers.ProductionManagementController.MesBadOrderSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
+ <summary>
+ MES鎶ュ簾琛ュ崟宸ュ崟鏌ヨ
+ </summary>
+ <param name="mesordercode">宸ュ崟缂栧彿</param>
+ <param name="sourceorder">婧愬崟鍗曞彿</param>
+ <param name="partcode">浜у搧缂栫爜</param>
+ <param name="partname">浜у搧鍚嶇О</param>
+ <param name="partspec">浜у搧瑙勬牸</param>
+ <param name="creatuser">鍒涘缓浜哄憳</param>
+ <param name="createdate">鍒涘缓鏃堕棿</param>
+ <param name="page">椤电爜</param>
+ <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ <param name="prop">鎺掑簭瀛楁</param>
+ <param name="order">鎺掑簭瑙勫垯</param>
+ <returns></returns>
+ </member>
<member name="M:VueWebApi.Controllers.ProductionManagementController.PartSelectRoute(System.String)">
<summary>
浜у搧缂栫爜鏌ユ壘宸ヨ壓璺嚎涓嬫媺鎺ュ彛
diff --git a/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache b/VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache
index 6d0d5d0..9834d10 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 5dbcae8..35db87d 100644
--- a/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt
+++ b/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt
@@ -847,6 +847,7 @@
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.pdb b/VueWebApi/obj/Release/VueWebApi.pdb
index c4c4e95..cd27bdf 100644
--- a/VueWebApi/obj/Release/VueWebApi.pdb
+++ b/VueWebApi/obj/Release/VueWebApi.pdb
Binary files differ
--
Gitblit v1.9.3