From e79ef1f195754b2afdc8e1e149d64774c7757ad9 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期四, 20 十月 2022 22:52:14 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

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

diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index dd0a2ec..d6a79a9 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,15 @@
     <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\Pay_ReportController.cs" />
     <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱DataHelper.cs" />
     <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_Cg_PODemandPlanBillController.cs" />
     <Compile Include="Controllers\SCGL\Sc_CallGoodsBackRequestBillController.cs" />
@@ -550,8 +556,13 @@
     <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\Gy_UserCustomer.cs" />
+    <Compile Include="Models\Gy_UserMater.cs" />
+    <Compile Include="Models\Gy_UserUser.cs" />
     <Compile Include="Models\JIT_Cg_PODemandPlanBillMain.cs" />
     <Compile Include="Models\JIT_Cg_PODemandPlanBillSub.cs" />
     <Compile Include="Models\Cg_PODemandPlanConfigBillSub.cs" />
@@ -581,6 +592,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" />
@@ -839,6 +853,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\" />
@@ -851,7 +866,9 @@
     <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\Pay_Report\" />
     <Folder Include="Views\ProductionPlanReport\" />
     <Folder Include="Views\ProductionReturnBill\" />
     <Folder Include="Views\QC_Management\" />

--
Gitblit v1.9.1