From bd76b282500a2f36d1809f91c4407873c758b0f9 Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期二, 28 十二月 2021 23:23:23 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebAPI.csproj | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 2b0c993..f3592b7 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -318,6 +318,7 @@
<Compile Include="Controllers\BLL\Xt_UserController.cs" />
<Compile Include="Controllers\BLL\Xt_SystemLogController.cs" />
<Compile Include="Controllers\CellWidthController.cs" />
+ <Compile Include="Controllers\CGGL\Cg_PurchaseReturnController.cs" />
<Compile Include="Controllers\CGGL\Kf_POStockInBackBillController.cs" />
<Compile Include="Controllers\CGGL\Kf_POStockInBillController.cs" />
<Compile Include="Controllers\CGGL\Cg_POOrderBillController.cs" />
@@ -333,6 +334,7 @@
<Compile Include="Controllers\GZGL\Gy_WorkPayTypeBillController.cs" />
<Compile Include="Controllers\GZGL\Gy_WorkTypeBillController.cs" />
<Compile Include="Controllers\JHGL\Gy_RoutingBillController.cs" />
+ <Compile Include="Controllers\Kf_ICStockBillMainController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldMaintainRuleBillController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldMoveStockStepInBillListController .cs" />
<Compile Include="Controllers\MJGL\Sc_MouldProdMoveBillListController.cs" />
@@ -430,6 +432,7 @@
<Compile Include="DLL\ClsGy_WorkTypeBill.cs" />
<Compile Include="DLL\ClsKf_MateOutBackBill.cs" />
<Compile Include="DLL\ClsKf_MateOutBill.cs" />
+ <Compile Include="DLL\ClsKf_SellOutBackBill.cs" />
<Compile Include="DLL\ClsOA_ErrMsgBackBill.cs" />
<Compile Include="DLL\ClsOA_InformBill.cs" />
<Compile Include="DLL\ClsQC_NoPassProdCheckBill.cs" />
@@ -711,7 +714,9 @@
</ItemGroup>
<ItemGroup>
<Folder Include="App_Data\" />
+ <Folder Include="Views\Cg_PurchaseReturn\" />
<Folder Include="Views\Gy_EquipType\" />
+ <Folder Include="Views\Kf_ICStockBillMain\" />
<Folder Include="Views\MoveStockBill\" />
<Folder Include="Views\QC_Management\" />
<Folder Include="Views\Sc_MouldRepairOutBill\" />
--
Gitblit v1.9.1