From c77c064076bd920838aeee189f079df3abedf80e Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期二, 28 九月 2021 19:07:37 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebAPI.csproj | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 06c00cd..5174b5f 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -319,7 +319,12 @@
<Compile Include="Controllers\CJGL\Cj_StationInBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationEntrustOutBillController.cs" />
<Compile Include="Controllers\JHGL\Gy_RoutingBillController.cs" />
+ <Compile Include="Controllers\MJGL\Sc_MouldMoveStockStepInBillListController .cs" />
+ <Compile Include="Controllers\MJGL\Sc_MouldProdMoveBillListController.cs" />
+ <Compile Include="Controllers\MJGL\Sc_MouldMoveStockStepOutBillController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldProdInBillController.cs" />
+ <Compile Include="Controllers\MJGL\Sc_MouldRepairChangeBillController.cs" />
+ <Compile Include="Controllers\MJGL\Sc_MouldRepairOutBillController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldScrapInBillController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldOtherOutBillController.cs" />
<Compile Include="Controllers\MJJY\Mj_PDA_MoudlCheckController.cs" />
@@ -328,6 +333,8 @@
<Compile Include="Controllers\ReportFromController.cs" />
<Compile Include="Controllers\ReportPlatFormController.cs" />
<Compile Include="Controllers\SCGL\Sc_MESProductReportBillController.cs" />
+ <Compile Include="Controllers\Sc_MouldRepairOutBillController.cs" />
+ <Compile Include="Controllers\Sc_MouldRepairInBillListController - .cs" />
<Compile Include="Controllers\Sc_MouldController.cs" />
<Compile Include="Controllers\Sc_GroupOrderBillController.cs" />
<Compile Include="Controllers\QC_ManagementController.cs" />
@@ -350,7 +357,7 @@
<Compile Include="Controllers\LookingForBillController.cs" />
<Compile Include="Controllers\NewApiController.cs" />
<Compile Include="Controllers\SCGL\Sc_PPBomBillController.cs" />
- <Compile Include="Controllers\Sc_CheckToolsRepairWorkBillController.cs" />
+ <Compile Include="Controllers\Sc_CheckToolsRepairWorkBillListController.cs" />
<Compile Include="Controllers\XSGL\Xs_SeOutStockBackBillController.cs" />
<Compile Include="Controllers\XSGL\Xs_SeOutStockBillController.cs" />
<Compile Include="Controllers\XSGL\Xs_SeOrderBillController.cs" />
@@ -379,10 +386,18 @@
<Compile Include="DLL\ClsSc_MouldDotCheckBill.cs" />
<Compile Include="DLL\ClsSc_MouldLifeChangeBill.cs" />
<Compile Include="DLL\ClsSc_MouldMaintainBill.cs" />
+ <Compile Include="DLL\ClsSc_MouldOtherOutBill.cs" />
+ <Compile Include="DLL\ClsSc_MouldOtherInBill.cs" />
+ <Compile Include="DLL\ClsSc_MouldMoveStockStepOutBill.cs" />
<Compile Include="DLL\ClsSc_MouldProdBackBill.cs" />
<Compile Include="DLL\ClsSc_MouldProdInBill.cs" />
+ <Compile Include="DLL\ClsSc_MouldMoveStockStepInBill.cs" />
+ <Compile Include="DLL\ClsSc_MouldProdMoveBill.cs" />
<Compile Include="DLL\ClsSc_MouldProdOutBill.cs" />
+ <Compile Include="DLL\ClsSc_MouldRepairChangeBill.cs" />
<Compile Include="DLL\ClsSc_MouldRepairCheckBill.cs" />
+ <Compile Include="DLL\ClsSc_MouldRepairInBill.cs" />
+ <Compile Include="DLL\ClsSc_MouldRepairOutBill.cs" />
<Compile Include="DLL\ClsSc_MouldScrapInBill.cs" />
<Compile Include="DLL\ClsSc_MouldScrapOutBill.cs" />
<Compile Include="DLL\ClsSc_ProcessReport.cs" />
@@ -402,6 +417,12 @@
<Compile Include="Models\ClsSb_EquipRepairWorkBillMain.cs" />
<Compile Include="Models\ClsSc_MouldProdBillMain.cs" />
<Compile Include="Models\ClsSc_MouldProdBillSub.cs" />
+ <Compile Include="Models\ClsSc_MouldRepairChangeBillMain.cs" />
+ <Compile Include="Models\ClsSc_MouldRepairChangeBillSub.cs" />
+ <Compile Include="Models\ClsSc_MouldRepairInBillMain.cs" />
+ <Compile Include="Models\ClsSc_MouldRepairInBillSub.cs" />
+ <Compile Include="Models\ClsSc_MouldRepairOutBillMain.cs" />
+ <Compile Include="Models\ClsSc_MouldRepairOutBillSub.cs" />
<Compile Include="Models\Xt_ORGANIZATIONS.cs" />
<Compile Include="Models\ClsSb_EquipRepairWorkBillSub.cs" />
<Compile Include="Models\ClsSc_ICMOBillWorkQtyStatus_Tmp.cs" />
@@ -551,6 +572,7 @@
<Folder Include="App_Data\" />
<Folder Include="Views\MoveStockBill\" />
<Folder Include="Views\QC_Management\" />
+ <Folder Include="Views\Sc_MouldRepairOutBill\" />
</ItemGroup>
<ItemGroup>
<WCFMetadata Include="Service References\" />
--
Gitblit v1.9.1