设备清单导入接口修改、模板更改

yl

2022-11-04 7839cb076bc99f691c0d245daf53516e0d1e6429

设备清单导入接口修改、模板更改

 .gitignore

@@ -21,3 +21,4 @@
*.i*86
*.x86_64
*.hex
/VueWebApi/InExcel/9

 .vs/VueWebApi/v16/.suo

Binary files differ

 VueWebApi/Excel/É豸Çåµ¥.xls

Binary files differ

 VueWebApi/Logs/2022-11-04.TXT

 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>

 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;
        }

 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" />

 VueWebApi/VueWebApi.csproj.user

@@ -10,7 +10,7 @@
    <UseGlobalApplicationHostFile />
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <NameOfLastUsedPublishProfile>D:\新凯迪MES\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>

 VueWebApi/bin/VueWebApi.pdb

Binary files differ

 VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache

Binary files differ

 VueWebApi/obj/Release/Package/PackageTmp/Excel/²Ö¿â¿âλÇåµ¥.xls

Binary files differ

 VueWebApi/obj/Release/Package/PackageTmp/Excel/ÎïÁÏÇåµ¥.xls

Binary files differ

 VueWebApi/obj/Release/Package/PackageTmp/Excel/É豸Çåµ¥.xls

Binary files differ

 VueWebApi/obj/Release/Package/PackageTmp/Excel/É豸µã¼ì±ê×¼.xls

Binary files differ

 VueWebApi/obj/Release/Package/PackageTmp/InExcel/9/É豸Çåµ¥66.xls

Binary files differ

 VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb

Binary files differ

 VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache

Binary files differ

 VueWebApi/obj/Release/VueWebApi.csproj.FileListAbsolute.txt

@@ -564,7 +564,6 @@
D:\新凯迪MES\MES产品\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.resources.dll
D:\新凯迪MES\MES产品\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.Deployment.resources.dll
D:\新凯迪MES\MES产品\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.Razor.resources.dll
D:\新凯迪MES\MES产品\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.AssemblyReference.cache
D:\新凯迪MES\MES产品\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.CoreCompileInputs.cache
D:\新凯迪MES\MES产品\VueWebApi\VueWebApi\obj\Release\VueWebApi.csproj.CopyComplete
D:\新凯迪MES\MES产品\VueWebApi\VueWebApi\obj\Release\VueWebApi.dll

 VueWebApi/obj/Release/VueWebApi.pdb

Binary files differ