From 770c681572301c938d7b9adcc60d9aad9d1dd604 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 19 九月 2023 17:37:03 +0800
Subject: [PATCH] 1.新增基本资料功能接口(erp车间/部门、erp仓库、erp用户信息) 2.报工接口添加字段入库条码 3.增加末道工序报工后提交入库接口(对接erp) 4.增加生成系统条码接口(自定义)
---
VueWebApi/VueWebApi.csproj | 167 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 166 insertions(+), 1 deletions(-)
diff --git a/VueWebApi/VueWebApi.csproj b/VueWebApi/VueWebApi.csproj
index 2644a8c..db44a0f 100644
--- a/VueWebApi/VueWebApi.csproj
+++ b/VueWebApi/VueWebApi.csproj
@@ -39,11 +39,12 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
+ <Optimize>false</Optimize>
<OutputPath>bin\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <DocumentationFile>bin\VueWebApi.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="BouncyCastle.Crypto, Version=1.8.9.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
@@ -58,6 +59,9 @@
<Reference Include="FastReport.Web">
<HintPath>..\..\..\FastReports\FastReport.Net\FastReport.Web.dll</HintPath>
</Reference>
+ <Reference Include="Fleck, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\packages\Fleck.1.2.0\lib\net45\Fleck.dll</HintPath>
+ </Reference>
<Reference Include="ICSharpCode.SharpZipLib, Version=1.3.3.11, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<HintPath>..\packages\SharpZipLib.1.3.3\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>
@@ -67,10 +71,46 @@
<Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
</Reference>
+ <Reference Include="Microsoft.AspNet.SignalR.Core, Version=2.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.AspNet.SignalR.Core.2.2.2\lib\net45\Microsoft.AspNet.SignalR.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.AspNet.SignalR.SystemWeb, Version=2.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.AspNet.SignalR.SystemWeb.2.2.2\lib\net45\Microsoft.AspNet.SignalR.SystemWeb.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.AspNetCore.Http.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.AspNetCore.Http.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Http.Abstractions.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.AspNetCore.Http.Features, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.AspNetCore.Http.Features.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Http.Features.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.AspNetCore.Mvc.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.AspNetCore.Mvc.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Mvc.Abstractions.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.AspNetCore.Routing.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.AspNetCore.Routing.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Routing.Abstractions.dll</HintPath>
+ </Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
+ <Reference Include="Microsoft.Extensions.Primitives, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.Extensions.Primitives.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.Net.Http.Headers, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.Net.Http.Headers.2.2.0\lib\netstandard2.0\Microsoft.Net.Http.Headers.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.Owin, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.Owin.4.0.0\lib\net451\Microsoft.Owin.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.Owin.Cors, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.Owin.Cors.4.0.0\lib\net451\Microsoft.Owin.Cors.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.Owin.Host.SystemWeb, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.Owin.Host.SystemWeb.4.0.0\lib\net451\Microsoft.Owin.Host.SystemWeb.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.Owin.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.Owin.Security.4.0.0\lib\net451\Microsoft.Owin.Security.dll</HintPath>
+ </Reference>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
@@ -85,6 +125,9 @@
</Reference>
<Reference Include="NPOI.OpenXmlFormats, Version=2.5.6.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<HintPath>..\packages\NPOI.2.5.6\lib\net45\NPOI.OpenXmlFormats.dll</HintPath>
+ </Reference>
+ <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
+ <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
</Reference>
<Reference Include="Pipelines.Sockets.Unofficial, Version=1.0.0.0, Culture=neutral, PublicKeyToken=42ea0a778e13fbe2, processorArchitecture=MSIL">
<HintPath>..\packages\Pipelines.Sockets.Unofficial.2.2.2\lib\net461\Pipelines.Sockets.Unofficial.dll</HintPath>
@@ -111,6 +154,9 @@
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
</Reference>
+ <Reference Include="System.CodeDom, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+ <HintPath>..\packages\System.CodeDom.6.0.0\lib\net461\System.CodeDom.dll</HintPath>
+ </Reference>
<Reference Include="System.Data" />
<Reference Include="System.Diagnostics.PerformanceCounter, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Diagnostics.PerformanceCounter.5.0.0\lib\net461\System.Diagnostics.PerformanceCounter.dll</HintPath>
@@ -122,6 +168,7 @@
<Reference Include="System.IO.Pipelines, Version=5.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Pipelines.5.0.1\lib\net461\System.IO.Pipelines.dll</HintPath>
</Reference>
+ <Reference Include="System.Management" />
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
</Reference>
@@ -137,6 +184,9 @@
</Reference>
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Text.Encodings.Web, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+ <HintPath>..\packages\System.Text.Encodings.Web.4.5.0\lib\netstandard2.0\System.Text.Encodings.Web.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Channels, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Channels.5.0.0\lib\net461\System.Threading.Channels.dll</HintPath>
@@ -226,6 +276,7 @@
<Compile Include="App_Start\BundleConfig.cs" />
<Compile Include="App_Start\FilterConfig.cs" />
<Compile Include="App_Start\RouteConfig.cs" />
+ <Compile Include="App_Start\Startup.cs" />
<Compile Include="App_Start\SwaggerConfig.cs" />
<Compile Include="App_Start\SwaggerControllerDescProvider.cs" />
<Compile Include="App_Start\WebApiConfig.cs" />
@@ -257,11 +308,22 @@
<Compile Include="Areas\HelpPage\SampleGeneration\SampleDirection.cs" />
<Compile Include="Areas\HelpPage\SampleGeneration\TextSample.cs" />
<Compile Include="Areas\HelpPage\XmlDocumentationProvider.cs" />
+ <Compile Include="Controllers\BaseDateController.cs" />
+ <Compile Include="Controllers\MessageController.cs" />
+ <Compile Include="Controllers\ReportManagerController.cs" />
+ <Compile Include="Controllers\SendController.cs" />
+ <Compile Include="DLL\BLL\BaseDateBLL.cs" />
+ <Compile Include="DLL\BLL\ReportManagerBLL.cs" />
+ <Compile Include="DLL\DAL\BaseDateDAL.cs" />
+ <Compile Include="DLL\DAL\ReportManagerDAL.cs" />
+ <Compile Include="Hubs\ChatHub.cs" />
+ <Compile Include="Controllers\AppDeviceManageController.cs" />
<Compile Include="Controllers\BasicSettingController.cs" />
<Compile Include="Controllers\DeviceManagerController.cs" />
<Compile Include="Controllers\ErpSyncMesController.cs" />
<Compile Include="Controllers\GridReportController.cs" />
<Compile Include="Controllers\ImportExcelController.cs" />
+ <Compile Include="Controllers\KanBanManagerentController.cs" />
<Compile Include="Controllers\LoginController.cs" />
<Compile Include="Controllers\MaterialManagerController.cs" />
<Compile Include="Controllers\ProductionManagementController.cs" />
@@ -269,11 +331,14 @@
<Compile Include="Controllers\QualityManagementController.cs" />
<Compile Include="Controllers\SystemSettingController.cs" />
<Compile Include="Controllers\ValuesController.cs" />
+ <Compile Include="DDKanBanModel\ShopTopLeft.cs" />
+ <Compile Include="DLL\BLL\AppDeviceManageBLL.cs" />
<Compile Include="DLL\BLL\BasicSettingBLL.cs" />
<Compile Include="DLL\BLL\DeviceManagerBLL.cs" />
<Compile Include="DLL\BLL\ErpSyncMesBLL.cs" />
<Compile Include="DLL\BLL\ExcelCheckBLL.cs" />
<Compile Include="DLL\BLL\GridReportBLL.cs" />
+ <Compile Include="DLL\BLL\KanBanManagerentBLL.cs" />
<Compile Include="DLL\BLL\LoginBLL.cs" />
<Compile Include="DLL\BLL\MaterialManagerBLL.cs" />
<Compile Include="DLL\BLL\ProductionManagementBLL.cs" />
@@ -281,11 +346,13 @@
<Compile Include="DLL\BLL\QualityManagementBLL.cs" />
<Compile Include="DLL\BLL\SystemSettingBLL.cs" />
<Compile Include="DLL\BLL\UserDataBLL.cs" />
+ <Compile Include="DLL\DAL\AppDeviceManageDAL.cs" />
<Compile Include="DLL\DAL\BasicSettingDAL.cs" />
<Compile Include="DLL\DAL\DeviceManagerDAL.cs" />
<Compile Include="DLL\DAL\ErpSyncMesDAL.cs" />
<Compile Include="DLL\DAL\ExcelCheckDAL.cs" />
<Compile Include="DLL\DAL\GridReportDAL.cs" />
+ <Compile Include="DLL\DAL\KanBanManagerentDAL.cs" />
<Compile Include="DLL\DAL\LoginDAL.cs" />
<Compile Include="DLL\DAL\MaterialManagerDAL.cs" />
<Compile Include="DLL\DAL\ProductionManagementDAL.cs" />
@@ -296,13 +363,29 @@
<Compile Include="Global.asax.cs">
<DependentUpon>Global.asax</DependentUpon>
</Compile>
+ <Compile Include="Hubs\ChatHub2.cs" />
+ <Compile Include="Models\AdvancedSchedAlready.cs" />
+ <Compile Include="Models\AdvancedSchedulingDevice.cs" />
+ <Compile Include="Models\AlreadyScheduling.cs" />
+ <Compile Include="Models\AnDnDate.cs" />
+ <Compile Include="Models\AppDevicecCheck.cs" />
+ <Compile Include="Models\AppLabCode.cs" />
+ <Compile Include="Models\APSList.cs" />
+ <Compile Include="Models\BomSub.cs" />
+ <Compile Include="Models\CapacityPlanSect.cs" />
+ <Compile Include="Models\CapaPlan.cs" />
+ <Compile Include="Models\ChanjetEncryptMsg.cs" />
+ <Compile Include="Models\DeviceReport.cs" />
+ <Compile Include="Models\EqpRepair.cs" />
<Compile Include="Models\ExcelErro.cs" />
<Compile Include="Models\MaterialRout.cs" />
<Compile Include="Models\ObjectData.cs" />
<Compile Include="Models\ObjectDataCont.cs" />
+ <Compile Include="Models\ReportDefectHandle.cs" />
<Compile Include="Models\RoleUserSubmit.cs" />
<Compile Include="Models\RoutEdit.cs" />
<Compile Include="Models\ScanStartReportData.cs" />
+ <Compile Include="Models\StandEqp.cs" />
<Compile Include="Models\StepCheck.cs" />
<Compile Include="Models\StepDefect.cs" />
<Compile Include="Models\StepEqp.cs" />
@@ -312,10 +395,13 @@
<Compile Include="Models\Uom.cs" />
<Compile Include="Models\User.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="Tools\AppLableBarCode.cs" />
<Compile Include="Tools\ChannelActionFilterAttribute.cs" />
+ <Compile Include="Tools\DALSkillCondition.cs" />
<Compile Include="Tools\DapperHelper.cs" />
<Compile Include="Tools\DataOperator.cs" />
<Compile Include="Tools\DBHelper.cs" />
+ <Compile Include="Tools\DownLoad.cs" />
<Compile Include="Tools\Encrypt.cs" />
<Compile Include="Tools\ExcelList.cs" />
<Compile Include="Tools\ExcelModelCheck.cs" />
@@ -325,15 +411,21 @@
<Compile Include="Tools\JwtTools.cs" />
<Compile Include="Tools\LogHelper.cs" />
<Compile Include="Tools\NPOIHelper.cs" />
+ <Compile Include="Tools\PrintMessage.cs" />
<Compile Include="Tools\RedisHelper.cs" />
<Compile Include="Tools\Regedit.cs" />
<Compile Include="Tools\ScanStartReport.cs" />
+ <Compile Include="Tools\SchedulingMethod.cs" />
<Compile Include="Tools\SeachEncode.cs" />
+ <Compile Include="Tools\SeachEncodeJob.cs" />
<Compile Include="Tools\SessionControllerRouteHandler.cs" />
<Compile Include="Tools\SessionRouteHandler.cs" />
<Compile Include="Tools\TJson.cs" />
<Compile Include="Tools\ToMessage.cs" />
+ <Compile Include="Util\config.cs" />
<Compile Include="Util\EntityHelper.cs" />
+ <Compile Include="Util\Message.cs" />
+ <Compile Include="Util\OpenapiHelper.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="Areas\HelpPage\HelpPage.css" />
@@ -346,6 +438,65 @@
<Content Include="Global.asax" />
<Content Include="Grid\grwebapp.js" />
<Content Include="Grid\webapp-ws-tutorial.htm" />
+ <Content Include="Hubs\HubsMessage2.html" />
+ <Content Include="Hubs\HubsMessage1.html" />
+ <Content Include="Hubs\HubsMessage.html" />
+ <Content Include="Image\1.png" />
+ <Content Include="Image\2.png" />
+ <Content Include="Image\3.png" />
+ <Content Include="Image\4.png" />
+ <Content Include="Image\5.png" />
+ <Content Include="Image\6.png" />
+ <Content Include="Image\7.png" />
+ <Content Include="Image\8.png" />
+ <Content Include="Image\9.png" />
+ <Content Include="Image\app_1.png" />
+ <Content Include="Image\app_1_1.png" />
+ <Content Include="Image\app_1_2.png" />
+ <Content Include="Image\app_2.png" />
+ <Content Include="Image\app_3.png" />
+ <Content Include="Image\app_3_1.png" />
+ <Content Include="Image\app_3_2.png" />
+ <Content Include="Image\app_4.png" />
+ <Content Include="Image\app_4_1.png" />
+ <Content Include="Image\app_4_2.png" />
+ <Content Include="Image\app_4_3.png" />
+ <Content Include="Image\app_4_4.png" />
+ <Content Include="Image\app_4_5.png" />
+ <Content Include="Image\app_5.png" />
+ <Content Include="Image\app_5_1.png" />
+ <Content Include="Image\app_5_2.png" />
+ <Content Include="Image\app_5_3.png" />
+ <Content Include="Image\app_5_4.png" />
+ <Content Include="Image\app_5_5.png" />
+ <Content Include="Image\app_5_6.png" />
+ <Content Include="Image\app_5_7.png" />
+ <Content Include="Image\app_5_8.png" />
+ <Content Include="Image\app_5_9.png" />
+ <Content Include="Image\app_6.png" />
+ <Content Include="Image\app_6_1.png" />
+ <Content Include="Image\app_6_10.png" />
+ <Content Include="Image\app_6_11.png" />
+ <Content Include="Image\app_6_12.png" />
+ <Content Include="Image\app_6_13.png" />
+ <Content Include="Image\app_6_14.png" />
+ <Content Include="Image\app_6_2.png" />
+ <Content Include="Image\app_6_3.png" />
+ <Content Include="Image\app_6_4.png" />
+ <Content Include="Image\app_6_5.png" />
+ <Content Include="Image\app_6_6.png" />
+ <Content Include="Image\app_6_7.png" />
+ <Content Include="Image\app_6_8.png" />
+ <Content Include="Image\app_6_9.png" />
+ <Content Include="Image\app_7.png" />
+ <Content Include="Image\app_7_1.png" />
+ <Content Include="Image\app_7_2.png" />
+ <Content Include="Image\app_7_3.png" />
+ <Content Include="Image\app_7_4.png" />
+ <Content Include="Image\app_8.png" />
+ <Content Include="Image\app_9.png" />
+ <Content Include="Image\index_1.png" />
+ <Content Include="Image\index_2.png" />
<Content Include="Scripts\bootstrap.js" />
<Content Include="Scripts\bootstrap.min.js" />
<Content Include="Areas\HelpPage\Views\Web.config" />
@@ -375,11 +526,22 @@
<Content Include="grf\鎶ュ伐浜у嚭鏍囩.grf" />
<Content Include="grf\鎶ュ伐鎵撳嵃鏍囩.grf" />
<Content Include="grf\澶栧崗鏀舵枡鏍囩.grf" />
+ <Content Include="Excel\瑙掕壊娓呭崟.xls" />
+ <Content Include="Excel\浠撳簱搴撲綅娓呭崟.xls" />
+ <Content Include="Excel\寰�鏉ュ崟浣�.xls" />
+ <Content Include="grf\Rework.frx" />
+ <Content Include="Excel\缂洪櫡瀹氫箟.xls" />
+ <Content Include="Excel\璁惧鐐规椤圭洰.xls" />
+ <Content Include="Excel\璁惧淇濆吇椤圭洰.xls" />
+ <Content Include="Excel\鑺傛媿宸ヤ环.xls" />
+ <Content Include="Excel\璁惧娓呭崟.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" />
<Content Include="Scripts\jquery-3.4.1.slim.js" />
<Content Include="Scripts\jquery-3.4.1.slim.min.js" />
+ <Content Include="Scripts\jquery.signalR-2.2.2.js" />
+ <Content Include="Scripts\jquery.signalR-2.2.2.min.js" />
<Content Include="Scripts\modernizr-2.8.3.js" />
<Content Include="Scripts\swagger_lang.js" />
<Content Include="Web.config" />
@@ -394,7 +556,10 @@
</ItemGroup>
<ItemGroup>
<Folder Include="App_Data\" />
+ <Folder Include="DeviceImage\image1\" />
+ <Folder Include="DeviceImage\image2\" />
<Folder Include="File\excel\" />
+ <Folder Include="File\newxls\" />
<Folder Include="InExcel\" />
</ItemGroup>
<ItemGroup>
--
Gitblit v1.9.3