From 76a6a6c378c6511f988e0b71dbec5e9e05782dac Mon Sep 17 00:00:00 2001
From: jhz <jinghz@oceic.com>
Date: 星期日, 09 十月 2022 12:37:51 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

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

diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 7a9497b..d3e9070 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -321,6 +321,9 @@
     <Compile Include="App_Start\WebApiConfig.cs" />
     <Compile Include="Controllers\BaseSet\Gy_BarCodeBillController.cs" />
     <Compile Include="Controllers\BaseSet\Gy_RoutingGroupController.cs" />
+    <Compile Include="Controllers\BaseSet\Gy_TechnologyController.cs" />
+    <Compile Include="Controllers\BaseSet\Gy_TechnologyParUnitController.cs" />
+    <Compile Include="Controllers\BaseSet\Gy_TechParamByProcController.cs" />
     <Compile Include="Controllers\BaseSet\Pay_PeriodInfoSetController.cs" />
     <Compile Include="Controllers\BaseSet\Gy_OrderBackInfoController.cs" />
     <Compile Include="Controllers\BaseSet\Gy_OrderLevController.cs" />
@@ -373,12 +376,14 @@
     <Compile Include="Controllers\CJGL\Cj_ComplementGoodsBillController.cs" />
     <Compile Include="Controllers\CJGL\Cj_NoPassProcController.cs" />
     <Compile Include="Controllers\CJGL\Cj_SendGoodsBillController.cs" />
+    <Compile Include="Controllers\CJGL\Mes_OrderProcFlowAllReportController.cs" />
     <Compile Include="Controllers\CJGL\ProductionPlanReportController.cs" />
     <Compile Include="Controllers\CJGL\Sc_ProcessExchangeBillController.cs" />
     <Compile Include="Controllers\CJGL\Cj_StationOutBillController.cs" />
     <Compile Include="Controllers\CJGL\Cj_StationInBillController.cs" />
     <Compile Include="Controllers\CJGL\Cj_StationEntrustOutBillController.cs" />
     <Compile Include="Controllers\CJGL\Sc_WorkBillAutoSortBillMainController.cs" />
+    <Compile Include="Controllers\Gy_MateMouldController.cs" />
     <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱DataHelper.cs" />
     <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_Cg_PODemandPlanBillController.cs" />
     <Compile Include="Controllers\SCGL\Sc_CallGoodsBackRequestBillController.cs" />
@@ -440,6 +445,7 @@
     <Compile Include="Controllers\PurchaseOrderController.cs" />
     <Compile Include="Controllers\QC_POStockInCheckBillController.cs" />
     <Compile Include="Controllers\宸ヨ祫绠＄悊\Gy_GroupEmpBillController.cs" />
+    <Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_PurchaseWallclothBillController.cs" />
     <Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_WorkTimesBillController.cs" />
     <Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_SingleBalBillController.cs" />
     <Compile Include="Controllers\ProductionOrderController.cs" />
@@ -549,8 +555,10 @@
     <Compile Include="HttpClient.cs" />
     <Compile Include="InvokeHelper.cs" />
     <Compile Include="Log.cs" />
+    <Compile Include="Models\ClsGy_MateMould.cs" />
     <Compile Include="Models\ClsSc_AssemblyBillMain.cs" />
     <Compile Include="Models\ClsSc_AssemblyBillSub.cs" />
+    <Compile Include="Models\Employee.cs" />
     <Compile Include="Models\JIT_Cg_PODemandPlanBillMain.cs" />
     <Compile Include="Models\JIT_Cg_PODemandPlanBillSub.cs" />
     <Compile Include="Models\Cg_PODemandPlanConfigBillSub.cs" />
@@ -580,6 +588,9 @@
     <Compile Include="Models\Sc_WorkBillSortBillSub.cs" />
     <Compile Include="Models\Sc_WorkDemandPlanBillMain.cs" />
     <Compile Include="Models\Sc_WorkDemandPlanBillSub.cs" />
+    <Compile Include="Models\TechnologyParameter.cs" />
+    <Compile Include="Models\TechnologyParameterUnit.cs" />
+    <Compile Include="Models\TechParamByProc.cs" />
     <Compile Include="Models\鍏跺畠\ReciveBill_FastModel.cs" />
     <Compile Include="Models\鍔ㄦ�佸垪\OptionListModel.cs" />
     <Compile Include="Models\鍩虹璧勬枡\Gy_ClassTimePrj.cs" />
@@ -748,7 +759,9 @@
     <Compile Include="Models\鍩虹璧勬枡\Gy_Employee.cs" />
     <Compile Include="Models\鍩虹璧勬枡\Gy_Process.cs" />
     <Compile Include="Models\鍩虹璧勬枡\Warehouse.cs" />
+    <Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_PurchaseWallclothBillMain.cs" />
     <Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_WorkTimesBillMain.cs" />
+    <Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_PurchaseWallclothBillSub.cs" />
     <Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_WorkTimesBillSub.cs" />
     <Compile Include="obj\Debug\.NETFramework,Version=v4.5.AssemblyAttributes.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
@@ -836,6 +849,7 @@
     <Folder Include="Views\Cj_SendGoodsBill\" />
     <Folder Include="Views\Gy_EquipType\" />
     <Folder Include="Views\Gy_ICBomBill\" />
+    <Folder Include="Views\Gy_MateMould\" />
     <Folder Include="Views\Gy_RoutingGroup\" />
     <Folder Include="Views\Gy_WorkStation\" />
     <Folder Include="Views\JIT_DayPlanPlatFormBill\" />
@@ -848,6 +862,7 @@
     <Folder Include="Views\KF_PonderationBill\" />
     <Folder Include="Views\kf_StepFoldinBill\" />
     <Folder Include="Views\Kf_StepFoldOutBill\" />
+    <Folder Include="Views\Mes_OrderProcFlowAllReport\" />
     <Folder Include="Views\MoveStockBill\" />
     <Folder Include="Views\ProductionPlanReport\" />
     <Folder Include="Views\ProductionReturnBill\" />

--
Gitblit v1.9.1