From 70e0952a3a7722904a21a5b514f18c7899359ef7 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期五, 29 十月 2021 17:22:32 +0800
Subject: [PATCH] 合并

---
 WebAPI/WebAPI.csproj |   41 ++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 40 insertions(+), 1 deletions(-)

diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 9b313e4..77d6983 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -278,6 +278,12 @@
     <Compile Include="App_Start\RouteConfig.cs" />
     <Compile Include="App_Start\SwaggerConfig.cs" />
     <Compile Include="App_Start\WebApiConfig.cs" />
+    <Compile Include="Controllers\BaseSet\Gy_ClassTimePrjController.cs" />
+    <Compile Include="Controllers\BaseSet\Gy_OrderBackInfoController.cs" />
+    <Compile Include="Controllers\BaseSet\Gy_OrderLevController.cs" />
+    <Compile Include="Controllers\BaseSet\Gy_WorkPayTypeController.cs" />
+    <Compile Include="Controllers\BaseSet\Gy_WorkTypeController.cs" />
+    <Compile Include="Controllers\BaseSet\Xt_DataDictionary_TableController.cs" />
     <Compile Include="Controllers\BaseSet\Gy_ModelTypeController.cs" />
     <Compile Include="Controllers\BaseSet\Gy_QCCheckClassController.cs" />
     <Compile Include="Controllers\BaseSet\Gy_CheckItemController.cs" />
@@ -331,12 +337,17 @@
     <Compile Include="Controllers\MJGL\Sc_MouldScrapInBillController.cs" />
     <Compile Include="Controllers\MJGL\Sc_MouldOtherOutBillController.cs" />
     <Compile Include="Controllers\MJJY\Mj_PDA_MoudlCheckController.cs" />
+    <Compile Include="Controllers\Open_PrintTemController.cs" />
+    <Compile Include="Controllers\Pay_OtherBalBillController.cs" />
+    <Compile Include="Controllers\Pay_GroupBalBillController.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\ReportPlatFormController.cs" />
+    <Compile Include="Controllers\SBGL\Gy_EquipTypeController.cs" />
     <Compile Include="Controllers\SCGL\Sc_MESProductReportBillController.cs" />
-    <Compile Include="Controllers\Pay_SingleBalBillController.cs" />
     <Compile Include="Controllers\Sc_MouldRepairOutBillController.cs" />
     <Compile Include="Controllers\Sc_MouldRepairInBillListController - .cs" />
     <Compile Include="Controllers\Sc_MouldController.cs" />
@@ -375,6 +386,7 @@
     <Compile Include="DbUntil\DataFormatUntil.cs" />
     <Compile Include="DLL\ClsGy_BadReason_Ctl.cs" />
     <Compile Include="DLL\ClsGy_DuSubsidyItemBill.cs" />
+    <Compile Include="DLL\ClsGy_EquipTypeBill.cs" />
     <Compile Include="DLL\ClsGy_Material_Ctl.cs" />
     <Compile Include="DLL\ClsGy_Source_Ctl.cs" />
     <Compile Include="DLL\ClsGy_WorkPayTypeBill.cs" />
@@ -397,7 +409,9 @@
     <Compile Include="DLL\ClsSc_MouldOtherOutBill.cs" />
     <Compile Include="DLL\ClsSc_MouldOtherInBill.cs" />
     <Compile Include="DLL\ClsSc_MouldMoveStockStepOutBill.cs" />
+    <Compile Include="DLL\ClsPay_SingleBalBill.cs" />
     <Compile Include="DLL\ClsSc_MouldProdBackBill.cs" />
+    <Compile Include="DLL\ClsPay_OtherBalBill.cs" />
     <Compile Include="DLL\ClsSc_MouldProdInBill.cs" />
     <Compile Include="DLL\ClsSc_MouldMoveStockStepInBill.cs" />
     <Compile Include="DLL\ClsSc_MouldProdMoveBill.cs" />
@@ -417,6 +431,9 @@
     <Compile Include="Models\ApiConfig.cs" />
     <Compile Include="Models\ApiResult.cs" />
     <Compile Include="Models\CheckItem.cs" />
+    <Compile Include="Models\Gy_OrderBackInfo.cs" />
+    <Compile Include="Models\Gy_OrderLevList.cs" />
+    <Compile Include="Models\ClsGy_EquipFileType.cs" />
     <Compile Include="Models\ClsGy_Material_Model.cs" />
     <Compile Include="Models\ClsSb_EquipDotCheckBillMain.cs" />
     <Compile Include="Models\ClsSb_EquipDotCheckBillSub.cs" />
@@ -431,6 +448,25 @@
     <Compile Include="Models\ClsSc_MouldRepairInBillSub.cs" />
     <Compile Include="Models\ClsSc_MouldRepairOutBillMain.cs" />
     <Compile Include="Models\ClsSc_MouldRepairOutBillSub.cs" />
+    <Compile Include="Models\ClsGy_ProcPrice.cs" />
+    <Compile Include="Models\Xt_DataDictionary_Proc.cs" />
+    <Compile Include="Models\Xt_DataDictionary_View.cs" />
+    <Compile Include="Models\Xt_DataDictionary_Table.cs" />
+    <Compile Include="Models\Gy_User.cs" />
+    <Compile Include="Models\Gy_UserSupper.cs" />
+    <Compile Include="Models\Gy_WorkPayType.cs" />
+    <Compile Include="Models\Gy_WorkType.cs" />
+    <Compile Include="Models\Menu.cs" />
+    <Compile Include="Models\ModelConvertHelper.cs" />
+    <Compile Include="Models\Pay_OtherBalBill.cs" />
+    <Compile Include="Models\Pay_GroupBalBill.cs" />
+    <Compile Include="Models\Pay_GroupBalBillSub.cs" />
+    <Compile Include="Models\Pay_WorkTimesBillSub.cs" />
+    <Compile Include="Models\Pay_WorkTimesBill.cs" />
+    <Compile Include="Models\Pay_SingleBalBill.cs" />
+    <Compile Include="Models\Pay_OtherBalBillSub.cs" />
+    <Compile Include="Models\Pay_SingleBalBillSub.cs" />
+    <Compile Include="Models\ToHierarchy.cs" />
     <Compile Include="Models\Xt_ORGANIZATIONS.cs" />
     <Compile Include="Models\ClsSb_EquipRepairWorkBillSub.cs" />
     <Compile Include="Models\ClsSc_ICMOBillWorkQtyStatus_Tmp.cs" />
@@ -498,8 +534,10 @@
     <Compile Include="Models\WWSendOutBillViewModel.cs" />
     <Compile Include="Models\WW_EntrustProcSendWorkViewModel.cs" />
     <Compile Include="Models\WW_EntrustWorkOrderViewModel.cs" />
+    <Compile Include="Models\鍩虹璧勬枡\Gy_ClassTimePrj.cs" />
     <Compile Include="Models\鍩虹璧勬枡\Gy_Employee.cs" />
     <Compile Include="Models\鍩虹璧勬枡\Gy_Process.cs" />
+    <Compile Include="Models\鍩虹璧勬枡\Gy_ClassTimePrj.cs" />
     <Compile Include="Models\鍩虹璧勬枡\Warehouse.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
@@ -578,6 +616,7 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />
+    <Folder Include="Views\Gy_EquipType\" />
     <Folder Include="Views\MoveStockBill\" />
     <Folder Include="Views\QC_Management\" />
     <Folder Include="Views\Sc_MouldRepairOutBill\" />

--
Gitblit v1.9.1