From c63b40452aeaf1b46ef716da9f5dc9e8c2a843a6 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 13 七月 2022 20:30:33 +0800
Subject: [PATCH] 生产开报工提交
---
VueWebApi/VueWebApi.csproj | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/VueWebApi/VueWebApi.csproj b/VueWebApi/VueWebApi.csproj
index c65ba00..ffd75cc 100644
--- a/VueWebApi/VueWebApi.csproj
+++ b/VueWebApi/VueWebApi.csproj
@@ -52,6 +52,12 @@
<Reference Include="Dapper, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapper.2.0.123\lib\net461\Dapper.dll</HintPath>
</Reference>
+ <Reference Include="FastReport">
+ <HintPath>..\..\..\FastReports\FastReport.Net\FastReport.dll</HintPath>
+ </Reference>
+ <Reference Include="FastReport.Web">
+ <HintPath>..\..\..\FastReports\FastReport.Net\FastReport.Web.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>
@@ -253,25 +259,34 @@
<Compile Include="Areas\HelpPage\XmlDocumentationProvider.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\LoginController.cs" />
<Compile Include="Controllers\MaterialManagerController.cs" />
+ <Compile Include="Controllers\ProductionManagementController.cs" />
<Compile Include="Controllers\ProductModelController.cs" />
<Compile Include="Controllers\SystemSettingController.cs" />
<Compile Include="Controllers\ValuesController.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\LoginBLL.cs" />
<Compile Include="DLL\BLL\MaterialManagerBLL.cs" />
+ <Compile Include="DLL\BLL\ProductionManagementBLL.cs" />
<Compile Include="DLL\BLL\ProductModelBLL.cs" />
<Compile Include="DLL\BLL\SystemSettingBLL.cs" />
<Compile Include="DLL\BLL\UserDataBLL.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\LoginDAL.cs" />
<Compile Include="DLL\DAL\MaterialManagerDAL.cs" />
+ <Compile Include="DLL\DAL\ProductionManagementDAL.cs" />
<Compile Include="DLL\DAL\ProductModelDAL.cs" />
<Compile Include="DLL\DAL\SystemSettingDAL.cs" />
<Compile Include="DLL\DAL\UserDataDAL.cs" />
@@ -283,6 +298,10 @@
<Compile Include="Models\ObjectData.cs" />
<Compile Include="Models\ObjectDataCont.cs" />
<Compile Include="Models\RoleUserSubmit.cs" />
+ <Compile Include="Models\RoutEdit.cs" />
+ <Compile Include="Models\ScanStartReportData.cs" />
+ <Compile Include="Models\StepDefect.cs" />
+ <Compile Include="Models\StepEqp.cs" />
<Compile Include="Models\TreeDG.cs" />
<Compile Include="Models\TreeDM.cs" />
<Compile Include="Models\TreeObejct.cs" />
@@ -296,6 +315,7 @@
<Compile Include="Tools\Encrypt.cs" />
<Compile Include="Tools\ExcelList.cs" />
<Compile Include="Tools\ExcelModelCheck.cs" />
+ <Compile Include="Tools\GridMessage.cs" />
<Compile Include="Tools\ImportExcel.cs" />
<Compile Include="Tools\ImportExcelData.cs" />
<Compile Include="Tools\JwtTools.cs" />
@@ -303,6 +323,7 @@
<Compile Include="Tools\NPOIHelper.cs" />
<Compile Include="Tools\RedisHelper.cs" />
<Compile Include="Tools\Regedit.cs" />
+ <Compile Include="Tools\ScanStartReport.cs" />
<Compile Include="Tools\SeachEncode.cs" />
<Compile Include="Tools\SessionControllerRouteHandler.cs" />
<Compile Include="Tools\SessionRouteHandler.cs" />
@@ -319,6 +340,8 @@
<Content Include="favicon.ico" />
<Content Include="fonts\glyphicons-halflings-regular.svg" />
<Content Include="Global.asax" />
+ <Content Include="Grid\grwebapp.js" />
+ <Content Include="Grid\webapp-ws-tutorial.htm" />
<Content Include="Scripts\bootstrap.js" />
<Content Include="Scripts\bootstrap.min.js" />
<Content Include="Areas\HelpPage\Views\Web.config" />
@@ -343,6 +366,11 @@
<Content Include="log4net.config" />
<Content Include="libman.json" />
<Content Include="Excel\鐢ㄦ埛娓呭崟.xls" />
+ <Content Include="grf\浜у搧娴佷紶鍗�.grf" />
+ <Content Include="grf\浜у搧娴佷紶鍗旳5.grf" />
+ <Content Include="grf\鎶ュ伐浜у嚭鏍囩.grf" />
+ <Content Include="grf\鎶ュ伐鎵撳嵃鏍囩.grf" />
+ <Content Include="grf\澶栧崗鏀舵枡鏍囩.grf" />
<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" />
@@ -359,10 +387,6 @@
</Content>
<Content Include="Areas\HelpPage\Views\_ViewStart.cshtml" />
<Content Include="Content\Site.css" />
- <Content Include="Views\Web.config" />
- <Content Include="Views\_ViewStart.cshtml" />
- <Content Include="Views\Shared\Error.cshtml" />
- <Content Include="Views\Shared\_Layout.cshtml" />
</ItemGroup>
<ItemGroup>
<Folder Include="App_Data\" />
--
Gitblit v1.9.3