From 72da1f7ca6f73346ff92bed7df96b4d28d6ccfd1 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期六, 04 三月 2023 11:25:03 +0800
Subject: [PATCH] 1.工单派发选择工艺路线或选择生产车间时判断绑定条件接口开发
2.组织架构删除update改为delete
3.工艺路线新增else if改为if
4.节拍工价根据工序线编码查找关联设备集合
---
VueWebApi/VueWebApi.csproj | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/VueWebApi/VueWebApi.csproj b/VueWebApi/VueWebApi.csproj
index 828998d..640512a 100644
--- a/VueWebApi/VueWebApi.csproj
+++ b/VueWebApi/VueWebApi.csproj
@@ -320,9 +320,28 @@
<Compile Include="Areas\HelpPage\SampleGeneration\SampleDirection.cs" />
<Compile Include="Areas\HelpPage\SampleGeneration\TextSample.cs" />
<Compile Include="Areas\HelpPage\XmlDocumentationProvider.cs" />
+ <Compile Include="Controllers\AppAnalyticsController.cs" />
+ <Compile Include="Controllers\AppPersonalController.cs" />
+ <Compile Include="Controllers\AppProductionManagementController.cs" />
+ <Compile Include="Controllers\AppPurchManagementController.cs" />
+ <Compile Include="Controllers\AppQualityManagementController.cs" />
+ <Compile Include="Controllers\BaseDateController.cs" />
+ <Compile Include="Controllers\PurchaseOrderController.cs" />
<Compile Include="Controllers\ReportManagerController.cs" />
<Compile Include="Controllers\SendController.cs" />
+ <Compile Include="DLL\BLL\AppAnalyticsBLL.cs" />
+ <Compile Include="DLL\BLL\AppPersonalBLL.cs" />
+ <Compile Include="DLL\BLL\AppPurchManagementBLL.cs" />
+ <Compile Include="DLL\BLL\AppQualityManagementBLL.cs" />
+ <Compile Include="DLL\BLL\BaseDateBLL.cs" />
+ <Compile Include="DLL\BLL\PurchaseOrderBLL.cs" />
<Compile Include="DLL\BLL\ReportManagerBLL.cs" />
+ <Compile Include="DLL\DAL\AppAnalyticsDAL.cs" />
+ <Compile Include="DLL\DAL\AppPersonalDAL.cs" />
+ <Compile Include="DLL\DAL\AppPurchManagementDAL.cs" />
+ <Compile Include="DLL\DAL\AppQualityManagementDAL.cs" />
+ <Compile Include="DLL\DAL\BaseDateDAL.cs" />
+ <Compile Include="DLL\DAL\PurchaseOrderDAL.cs" />
<Compile Include="DLL\DAL\ReportManagerDAL.cs" />
<Compile Include="Hubs\ChatHub.cs" />
<Compile Include="Controllers\AppDeviceManageController.cs" />
@@ -377,6 +396,8 @@
<Compile Include="Models\AlreadyScheduling.cs" />
<Compile Include="Models\AnDnDate.cs" />
<Compile Include="Models\AppDevicecCheck.cs" />
+ <Compile Include="Models\AppLabCode.cs" />
+ <Compile Include="Models\AppPurchOrderSave.cs" />
<Compile Include="Models\APSList.cs" />
<Compile Include="Models\BomSub.cs" />
<Compile Include="Models\CapacityPlanningSetup.cs" />
@@ -402,6 +423,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\ChannelActionFilterAttributeApp.cs" />
<Compile Include="Tools\DALSkillCondition.cs" />
@@ -500,6 +522,7 @@
<Content Include="Image\app_7_4.png" />
<Content Include="Image\app_8.png" />
<Content Include="Image\app_9.png" />
+ <Content Include="Image\app_9_1.png" />
<Content Include="Image\index_1.png" />
<Content Include="Image\index_2.png" />
<Content Include="Scripts\bootstrap.js" />
@@ -541,6 +564,9 @@
<Content Include="Excel\鑺傛媿宸ヤ环.xls" />
<Content Include="Excel\鐗╂枡娓呭崟.xls" />
<Content Include="Excel\璁惧娓呭崟.xls" />
+ <Content Include="Excel\璁惧鐐规鏍囧噯.xls" />
+ <Content Include="InExcel\9\璁惧娓呭崟66.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" />
@@ -566,7 +592,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" />
--
Gitblit v1.9.3