From 7839cb076bc99f691c0d245daf53516e0d1e6429 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 04 十一月 2022 15:42:10 +0800
Subject: [PATCH] 设备清单导入接口修改、模板更改
---
VueWebApi/obj/Release/VueWebApi.pdb | 0
VueWebApi/Excel/设备清单.xls | 0
.gitignore | 1 +
VueWebApi/obj/Release/Package/PackageTmp/Excel/设备点检标准.xls | 0
VueWebApi/obj/Release/Package/PackageTmp/Excel/仓库库位清单.xls | 0
VueWebApi/obj/Release/Package/PackageTmp/Excel/物料清单.xls | 0
VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt | 1 -
VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user | 16 +++++++++++-----
.vs/VueWebApi/v16/.suo | 0
VueWebApi/Tools/ImportExcelData.cs | 12 ++++++------
/dev/null | 0
VueWebApi/VueWebApi.csproj | 2 +-
VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache | 0
VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb | 0
VueWebApi/VueWebApi.csproj.user | 2 +-
VueWebApi/obj/Release/Package/PackageTmp/InExcel/9/设备清单66.xls | 0
VueWebApi/obj/Release/Package/PackageTmp/Excel/设备清单.xls | 0
VueWebApi/Logs/2022-11-04.TXT | 0
VueWebApi/bin/VueWebApi.pdb | 0
19 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/.gitignore b/.gitignore
index 4d40434..5483754 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@
*.i*86
*.x86_64
*.hex
+/VueWebApi/InExcel/9
diff --git a/.vs/VueWebApi/v16/.suo b/.vs/VueWebApi/v16/.suo
index 88759f1..432316e 100644
--- a/.vs/VueWebApi/v16/.suo
+++ b/.vs/VueWebApi/v16/.suo
Binary files differ
diff --git "a/VueWebApi/Excel/\350\256\276\345\244\207\346\270\205\345\215\225.xls" "b/VueWebApi/Excel/\350\256\276\345\244\207\346\270\205\345\215\225.xls"
index 1699a8e..f17c9ce 100644
--- "a/VueWebApi/Excel/\350\256\276\345\244\207\346\270\205\345\215\225.xls"
+++ "b/VueWebApi/Excel/\350\256\276\345\244\207\346\270\205\345\215\225.xls"
Binary files differ
diff --git a/VueWebApi/Logs/2022-11-04.TXT b/VueWebApi/Logs/2022-11-04.TXT
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/VueWebApi/Logs/2022-11-04.TXT
diff --git a/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user b/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
index c706e55..fde6afd 100644
--- a/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -729,16 +729,16 @@
<publishTime>12/24/2021 15:38:29</publishTime>
</File>
<File Include="bin/VueWebApi.dll">
- <publishTime>11/03/2022 16:32:20</publishTime>
+ <publishTime>11/04/2022 15:40:13</publishTime>
</File>
<File Include="bin/VueWebApi.dll.config">
<publishTime>06/15/2022 15:31:43</publishTime>
</File>
<File Include="bin/VueWebApi.pdb">
- <publishTime>11/03/2022 16:32:20</publishTime>
+ <publishTime>11/04/2022 15:40:13</publishTime>
</File>
<File Include="bin/VueWebApi.xml">
- <publishTime>11/03/2022 16:32:20</publishTime>
+ <publishTime>11/04/2022 15:40:13</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>02/08/2013 16:42:28</publishTime>
@@ -846,7 +846,10 @@
<publishTime>08/29/2022 12:08:02</publishTime>
</File>
<File Include="Excel/璁惧娓呭崟.xls">
- <publishTime>11/01/2022 08:08:32</publishTime>
+ <publishTime>11/04/2022 15:40:01</publishTime>
+ </File>
+ <File Include="Excel/璁惧鐐规鏍囧噯.xls">
+ <publishTime>11/03/2022 18:03:35</publishTime>
</File>
<File Include="Excel/璁惧鐐规椤圭洰.xls">
<publishTime>08/17/2022 09:56:57</publishTime>
@@ -1484,6 +1487,9 @@
<File Include="index.html">
<publishTime>06/30/2022 14:02:46</publishTime>
</File>
+ <File Include="InExcel/9/璁惧娓呭崟66.xls">
+ <publishTime>11/04/2022 15:22:03</publishTime>
+ </File>
<File Include="js/CreateControl.js">
<publishTime>06/29/2022 20:23:24</publishTime>
</File>
@@ -1545,7 +1551,7 @@
<publishTime>06/10/2022 08:20:24</publishTime>
</File>
<File Include="Web.config">
- <publishTime>11/03/2022 16:32:27</publishTime>
+ <publishTime>11/04/2022 15:40:29</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/VueWebApi/Tools/ImportExcelData.cs b/VueWebApi/Tools/ImportExcelData.cs
index 45eb380..d1a7322 100644
--- a/VueWebApi/Tools/ImportExcelData.cs
+++ b/VueWebApi/Tools/ImportExcelData.cs
@@ -1756,7 +1756,7 @@
code = "300";
Message = "鐗╂枡娓呭崟妯℃澘(姣嶄欢淇℃伅)涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
}
- else if (excelTable[1].Columns.Count != 9)
+ else if (excelTable[1].Columns.Count != 10)
{
code = "300";
Message = "鐗╂枡娓呭崟妯℃澘(瀛愪欢淇℃伅)涓嶇鍚堣鑼�,璇锋鏌ュ垪鍚嶅瓧娈垫暟";
@@ -2313,19 +2313,19 @@
}
}
//杞﹂棿鍒ゆ柇
- for (int m = 0; m < excelTable[1].Rows.Count; m++)
+ for (int m = 0; m < excelTable[2].Rows.Count; m++)
{
- if (excelTable[1].Rows[m][6].ToString().Trim() != null && excelTable[1].Rows[m][6].ToString().Trim() != "")
+ if (excelTable[2].Rows[m][6].ToString().Trim() != null && excelTable[2].Rows[m][6].ToString().Trim() != "")
{
sql = @"select * from TOrganization where org_name=@code and description='W'";
- dynamicParams.Add("@code", excelTable[1].Rows[m][6].ToString().Trim());
+ dynamicParams.Add("@code", excelTable[2].Rows[m][6].ToString().Trim());
dt = DapperHelper.selectdata(sql, dynamicParams);
if (dt.Rows.Count<=0)
{
ExcelErro erro = new ExcelErro();
erro.RoeNumber = "/";
erro.ErrorField = "{鐢熶骇杞﹂棿}";
- erro.ErrorCont = "璁惧琛�:{鐢熶骇杞﹂棿}瀛楁" + excelTable[1].Rows[m][6].ToString().Trim() + "涓嶅瓨鍦�";
+ erro.ErrorCont = "璁惧琛�:{鐢熶骇杞﹂棿}瀛楁" + excelTable[2].Rows[m][6].ToString().Trim() + "涓嶅瓨鍦�";
list.Add(erro);
}
}
@@ -2345,7 +2345,7 @@
{
StuCode = "200";
message = "鏁版嵁楠岃瘉鎴愬姛";
- count = excelTable[0].Rows.Count + excelTable[1].Rows.Count;
+ count = excelTable[0].Rows.Count + excelTable[1].Rows.Count+excelTable[2].Rows.Count;
}
return list;
}
diff --git a/VueWebApi/VueWebApi.csproj b/VueWebApi/VueWebApi.csproj
index 7685442..ffec72c 100644
--- a/VueWebApi/VueWebApi.csproj
+++ b/VueWebApi/VueWebApi.csproj
@@ -542,6 +542,7 @@
<Content Include="Excel\鐗╂枡娓呭崟.xls" />
<Content Include="Excel\璁惧娓呭崟.xls" />
<Content Include="Excel\璁惧鐐规鏍囧噯.xls" />
+ <Content Include="InExcel\9\璁惧娓呭崟66.xls" />
<None Include="Scripts\jquery-3.4.1.intellisense.js" />
<Content Include="Scripts\jquery-3.4.1.js" />
<Content Include="Scripts\jquery-3.4.1.min.js" />
@@ -567,7 +568,6 @@
<Folder Include="DeviceImage\image2\" />
<Folder Include="File\excel\" />
<Folder Include="File\newxls\" />
- <Folder Include="InExcel\" />
</ItemGroup>
<ItemGroup>
<Content Include="fonts\glyphicons-halflings-regular.woff2" />
diff --git a/VueWebApi/VueWebApi.csproj.user b/VueWebApi/VueWebApi.csproj.user
index f3de2e1..6f95e97 100644
--- a/VueWebApi/VueWebApi.csproj.user
+++ b/VueWebApi/VueWebApi.csproj.user
@@ -10,7 +10,7 @@
<UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>D:\鏂板嚡杩狹ES\MES浜у搧\VueWebApi\VueWebApi\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <ProjectView>ProjectFiles</ProjectView>
+ <ProjectView>ShowAllFiles</ProjectView>
<Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
<Controller_SelectedScaffolderCategoryPath>root/Common/Web API</Controller_SelectedScaffolderCategoryPath>
<WebStackScaffolding_ControllerDialogWidth>600</WebStackScaffolding_ControllerDialogWidth>
diff --git a/VueWebApi/bin/VueWebApi.pdb b/VueWebApi/bin/VueWebApi.pdb
index 4ed751e..38cbcb8 100644
--- a/VueWebApi/bin/VueWebApi.pdb
+++ b/VueWebApi/bin/VueWebApi.pdb
Binary files differ
diff --git a/VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
index d346f11..239ddbc 100644
--- a/VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git "a/VueWebApi/obj/Release/Package/PackageTmp/Excel/\344\273\223\345\272\223\345\272\223\344\275\215\346\270\205\345\215\225.xls" "b/VueWebApi/obj/Release/Package/PackageTmp/Excel/\344\273\223\345\272\223\345\272\223\344\275\215\346\270\205\345\215\225.xls"
index 4e050cd..cbfe09a 100644
--- "a/VueWebApi/obj/Release/Package/PackageTmp/Excel/\344\273\223\345\272\223\345\272\223\344\275\215\346\270\205\345\215\225.xls"
+++ "b/VueWebApi/obj/Release/Package/PackageTmp/Excel/\344\273\223\345\272\223\345\272\223\344\275\215\346\270\205\345\215\225.xls"
Binary files differ
diff --git "a/VueWebApi/obj/Release/Package/PackageTmp/Excel/\347\211\251\346\226\231\346\270\205\345\215\225.xls" "b/VueWebApi/obj/Release/Package/PackageTmp/Excel/\347\211\251\346\226\231\346\270\205\345\215\225.xls"
index f3e23f4..3896d25 100644
--- "a/VueWebApi/obj/Release/Package/PackageTmp/Excel/\347\211\251\346\226\231\346\270\205\345\215\225.xls"
+++ "b/VueWebApi/obj/Release/Package/PackageTmp/Excel/\347\211\251\346\226\231\346\270\205\345\215\225.xls"
Binary files differ
diff --git "a/VueWebApi/obj/Release/Package/PackageTmp/Excel/\350\256\276\345\244\207\346\270\205\345\215\225.xls" "b/VueWebApi/obj/Release/Package/PackageTmp/Excel/\350\256\276\345\244\207\346\270\205\345\215\225.xls"
index 04ea0ce..f17c9ce 100644
--- "a/VueWebApi/obj/Release/Package/PackageTmp/Excel/\350\256\276\345\244\207\346\270\205\345\215\225.xls"
+++ "b/VueWebApi/obj/Release/Package/PackageTmp/Excel/\350\256\276\345\244\207\346\270\205\345\215\225.xls"
Binary files differ
diff --git "a/VueWebApi/obj/Release/Package/PackageTmp/Excel/\350\256\276\345\244\207\347\202\271\346\243\200\346\240\207\345\207\206.xls" "b/VueWebApi/obj/Release/Package/PackageTmp/Excel/\350\256\276\345\244\207\347\202\271\346\243\200\346\240\207\345\207\206.xls"
new file mode 100644
index 0000000..f4bbb59
--- /dev/null
+++ "b/VueWebApi/obj/Release/Package/PackageTmp/Excel/\350\256\276\345\244\207\347\202\271\346\243\200\346\240\207\345\207\206.xls"
Binary files differ
diff --git "a/VueWebApi/obj/Release/Package/PackageTmp/InExcel/9/\350\256\276\345\244\207\346\270\205\345\215\22566.xls" "b/VueWebApi/obj/Release/Package/PackageTmp/InExcel/9/\350\256\276\345\244\207\346\270\205\345\215\22566.xls"
new file mode 100644
index 0000000..262c0d7
--- /dev/null
+++ "b/VueWebApi/obj/Release/Package/PackageTmp/InExcel/9/\350\256\276\345\244\207\346\270\205\345\215\22566.xls"
Binary files differ
diff --git a/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb b/VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb
index 4ed751e..38cbcb8 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 a11adf0..b921405 100644
--- a/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt
+++ b/VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt
@@ -564,7 +564,6 @@
D:\鏂板嚡杩狹ES\MES浜у搧\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.resources.dll
D:\鏂板嚡杩狹ES\MES浜у搧\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.Deployment.resources.dll
D:\鏂板嚡杩狹ES\MES浜у搧\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.Razor.resources.dll
-D:\鏂板嚡杩狹ES\MES浜у搧\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.AssemblyReference.cache
D:\鏂板嚡杩狹ES\MES浜у搧\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.CoreCompileInputs.cache
D:\鏂板嚡杩狹ES\MES浜у搧\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.CopyComplete
D:\鏂板嚡杩狹ES\MES浜у搧\VueWebApi\VueWebApi\obj\Release\VueWebApi.dll
diff --git a/VueWebApi/obj/Release/VueWebApi.pdb b/VueWebApi/obj/Release/VueWebApi.pdb
index 4ed751e..38cbcb8 100644
--- a/VueWebApi/obj/Release/VueWebApi.pdb
+++ b/VueWebApi/obj/Release/VueWebApi.pdb
Binary files differ
--
Gitblit v1.9.3