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 | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/VueWebApi/VueWebApi.csproj b/VueWebApi/VueWebApi.csproj
index 15154d6..db44a0f 100644
--- a/VueWebApi/VueWebApi.csproj
+++ b/VueWebApi/VueWebApi.csproj
@@ -308,7 +308,14 @@
<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" />
@@ -357,7 +364,18 @@
<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" />
@@ -377,6 +395,7 @@
<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" />
@@ -396,13 +415,17 @@
<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\TestSocket.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" />
@@ -439,6 +462,7 @@
<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" />
@@ -510,6 +534,7 @@
<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" />
@@ -531,6 +556,8 @@
</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\" />
--
Gitblit v1.9.3