From 46c53aa04801e0f0d9b02a82bd14e607488d0f27 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期四, 11 十一月 2021 01:29:00 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebAPI.csproj | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index d39d945..ef9998a 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -278,7 +278,9 @@
<Compile Include="App_Start\RouteConfig.cs" />
<Compile Include="App_Start\SwaggerConfig.cs" />
<Compile Include="App_Start\WebApiConfig.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_ClassTimePrjSubController.cs" />
<Compile Include="Controllers\BaseSet\Gy_ClassTimePrjController.cs" />
+ <Compile Include="Controllers\BaseSet\Pay_PeriodInfoSetController.cs" />
<Compile Include="Controllers\BaseSet\Gy_OrderBackInfoController.cs" />
<Compile Include="Controllers\BaseSet\Gy_OrderLevController.cs" />
<Compile Include="Controllers\BaseSet\Gy_WorkTypeController.cs" />
@@ -342,11 +344,13 @@
<Compile Include="Controllers\Open_PrintTemController.cs" />
<Compile Include="Controllers\Pay_OtherBalBillController.cs" />
<Compile Include="Controllers\Pay_GroupBalBillController.cs" />
+ <Compile Include="Controllers\QC_POStockInCheckBillController.cs" />
<Compile Include="Controllers\Pay_WorkTimesBillController.cs" />
<Compile Include="Controllers\Pay_SingleBalBillController.cs" />
<Compile Include="Controllers\ProductionOrderController.cs" />
<Compile Include="Controllers\PublicPageMethodController.cs" />
<Compile Include="Controllers\ReportFromController.cs" />
+ <Compile Include="Controllers\GG_NoticeController.cs" />
<Compile Include="Controllers\ReportPlatFormController.cs" />
<Compile Include="Controllers\SBGL\Gy_EquipFileMainController.cs" />
<Compile Include="Controllers\SBGL\Gy_EquipTypeController.cs" />
@@ -399,6 +403,7 @@
<Compile Include="DLL\ClsGy_Source_Ctl.cs" />
<Compile Include="DLL\ClsGy_WorkPayTypeBill.cs" />
<Compile Include="DLL\ClsGy_WorkTypeBill.cs" />
+ <Compile Include="DLL\ClsOA_InformBill.cs" />
<Compile Include="DLL\ClsQC_NoPassProdCheckBill.cs" />
<Compile Include="DLL\ClsQC_PatrolProcCheckBill.cs" />
<Compile Include="DLL\ClsSb_EquipConkBookBill.cs" />
@@ -443,6 +448,9 @@
<Compile Include="Models\ClsGy_Maintain.cs" />
<Compile Include="Models\ClsGy_Repair.cs" />
<Compile Include="Models\ClsGy_RepairCheck.cs" />
+ <Compile Include="Models\ClsOA_InformBillMain.cs" />
+ <Compile Include="Models\ClsOA_InformBillSub.cs" />
+ <Compile Include="Models\Pay_PeriodInfoSet.cs" />
<Compile Include="Models\Gy_OrderBackInfo.cs" />
<Compile Include="Models\Gy_OrderLevList.cs" />
<Compile Include="Models\ClsGy_EquipFileMain.cs" />
@@ -464,6 +472,9 @@
<Compile Include="Models\ClsGy_ProcPrice.cs" />
<Compile Include="Models\Gy_WorkType.cs" />
<Compile Include="Models\Gy_WorkPayType.cs" />
+ <Compile Include="Models\QC_POStockInCheckBillSub.cs" />
+ <Compile Include="Models\QC_POStockInCheckBill.cs" />
+ <Compile Include="Models\UserPower.cs" />
<Compile Include="Models\Xt_DataDictionary_Proc.cs" />
<Compile Include="Models\Xt_DataDictionary_View.cs" />
<Compile Include="Models\Xt_DataDictionary_Table.cs" />
@@ -547,6 +558,7 @@
<Compile Include="Models\WWSendOutBillViewModel.cs" />
<Compile Include="Models\WW_EntrustProcSendWorkViewModel.cs" />
<Compile Include="Models\WW_EntrustWorkOrderViewModel.cs" />
+ <Compile Include="Models\鍩虹璧勬枡\Gy_ClassTimePrjSub.cs" />
<Compile Include="Models\鍩虹璧勬枡\Gy_ClassTimePrj.cs" />
<Compile Include="Models\鍩虹璧勬枡\Gy_Employee.cs" />
<Compile Include="Models\鍩虹璧勬枡\Gy_Process.cs" />
--
Gitblit v1.9.1