From ccfc7f25cbb5e78d335b44648a9964426a38a17f Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 15 十二月 2022 09:54:05 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/WebAPI.csproj |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index e8bc19a..7ea71e5 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -325,6 +325,7 @@
     <Compile Include="App_Start\WebApiConfig.cs" />
     <Compile Include="Controllers\BaseSet\Gy_BarCodeBillController.cs" />
     <Compile Include="Controllers\BaseSet\Gy_ConkTypeController.cs" />
+    <Compile Include="Controllers\BaseSet\Gy_ICBomBillController.cs" />
     <Compile Include="Controllers\BaseSet\Gy_WorkDayController.cs" />
     <Compile Include="Controllers\BaseSet\Gy_PackTypeController.cs" />
     <Compile Include="Controllers\BaseSet\Gy_RoutingGroupController.cs" />
@@ -447,16 +448,22 @@
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_COMMONCONTACTBillController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CustLocationController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DutyBillController.cs" />
+    <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MatePriceSupController.cs" />
+    <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_OperatorController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PaymentConditionListBillController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RateTypeController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RecConditionBillController.cs" />
+    <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_SettleStyleController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_SOPBillController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_SOPBillEditController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_SOPBillListController.cs" />
+    <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_StaffController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_StockCheckItemBillController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_StockStatusBillController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_SupplierContactBillController.cs" />
+    <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_TaxMIXController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_TaxRateBillController.cs" />
+    <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_WorkController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_WorkStationBillController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_CheckFlowBillController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_CheckItemBillController.cs" />
@@ -629,6 +636,7 @@
     <Compile Include="Models\鍩虹璧勬枡\ConkType.cs" />
     <Compile Include="Models\鍩虹璧勬枡\Gy_ClassTimePrj.cs" />
     <Compile Include="Models\鍩虹璧勬枡\Gy_Duty.cs" />
+    <Compile Include="Models\鍩虹璧勬枡\Gy_StockPlace.cs" />
     <Compile Include="Models\鍩虹璧勬枡\WorkDay.cs" />
     <Compile Include="Models\鍩虹璧勬枡\PackType.cs" />
     <Compile Include="Models\鍩虹璧勬枡\WorkStation.cs" />
@@ -892,16 +900,22 @@
     <Folder Include="Views\Gy_EquipType\" />
     <Folder Include="Views\Gy_ICBomBill\" />
     <Folder Include="Views\Gy_MateMould\" />
+    <Folder Include="Views\Gy_MatePriceSup\" />
+    <Folder Include="Views\Gy_Operator\" />
     <Folder Include="Views\Gy_PackType\" />
     <Folder Include="Views\Gy_PaymentConditionListBill\" />
     <Folder Include="Views\Gy_RateType\" />
     <Folder Include="Views\Gy_RecConditionBill\" />
     <Folder Include="Views\Gy_RoutingGroup\" />
+    <Folder Include="Views\Gy_SettleStyle\" />
     <Folder Include="Views\Gy_SOPBill\" />
+    <Folder Include="Views\Gy_Staff\" />
     <Folder Include="Views\Gy_StockStatusBill\" />
     <Folder Include="Views\Gy_SupplierContactBill\" />
+    <Folder Include="Views\Gy_TaxMIXMain\" />
     <Folder Include="Views\Gy_TaxRateBill\" />
     <Folder Include="Views\Gy_WorkStation\" />
+    <Folder Include="Views\Gy_Work\" />
     <Folder Include="Views\JIT_DayPlanPlatFormBill\" />
     <Folder Include="Views\JIT_DayPlanPlatFormImport\" />
     <Folder Include="Views\JIT_ICMOSortBillList\" />

--
Gitblit v1.9.1