From 0a6bc1020d17bbd9923fc78157688183287a6270 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期三, 01 十二月 2021 17:51:47 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebAPI.csproj | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 7fe8d77..cfc3b1b 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -278,6 +278,7 @@
<Compile Include="App_Start\RouteConfig.cs" />
<Compile Include="App_Start\SwaggerConfig.cs" />
<Compile Include="App_Start\WebApiConfig.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_BarCodeBillController.cs" />
<Compile Include="Controllers\BaseSet\Gy_ClassTimePrjSubController.cs" />
<Compile Include="Controllers\BaseSet\Gy_ClassTimePrjController.cs" />
<Compile Include="Controllers\BaseSet\Pay_PeriodInfoSetController.cs" />
@@ -319,6 +320,7 @@
<Compile Include="Controllers\BLL\Xt_UserController.cs" />
<Compile Include="Controllers\BLL\Xt_SystemLogController.cs" />
<Compile Include="Controllers\CellWidthController.cs" />
+ <Compile Include="Controllers\CGGL\Kf_POStockInBackBillController.cs" />
<Compile Include="Controllers\CGGL\Kf_POStockInBillController.cs" />
<Compile Include="Controllers\CGGL\Cg_POOrderBillController.cs" />
<Compile Include="Controllers\CGGL\WW_EntrustOrderBillController.cs" />
@@ -343,6 +345,7 @@
<Compile Include="Controllers\MJGL\Sc_MouldScrapInBillController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldOtherOutBillController.cs" />
<Compile Include="Controllers\MJJY\Mj_PDA_MoudlCheckController.cs" />
+ <Compile Include="Controllers\MoveStockBillController.cs" />
<Compile Include="Controllers\Open_PrintTemController.cs" />
<Compile Include="Controllers\Pay_OtherBalBillController.cs" />
<Compile Include="Controllers\Pay_GroupBalBillController.cs" />
@@ -388,8 +391,9 @@
<Compile Include="Controllers\XSGL\Xs_SeOutStockBackBillController.cs" />
<Compile Include="Controllers\XSGL\Xs_SeOutStockBillController.cs" />
<Compile Include="Controllers\XSGL\Xs_SeOrderBillController.cs" />
- <Compile Include="Controllers\浠撳瓨绠＄悊\ClsKf_MateOutBackBillController.cs" />
- <Compile Include="Controllers\浠撳瓨绠＄悊\Kf_MateOutBillController.cs" />
+ <Compile Include="Controllers\浠撳瓨绠＄悊\棰嗘枡鍙戣揣\Kf_MateOutBackBillController.cs" />
+ <Compile Include="Controllers\浠撳瓨绠＄悊\棰嗘枡鍙戣揣\Kf_MateOutBillController.cs" />
+ <Compile Include="Controllers\浠撳瓨绠＄悊\楠屾敹鍏ュ簱\Kf_EntrustOutBackBillController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\宸ュ簭妫�楠屽崟\QC_ProcessCheckBillController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\棣栦欢妫�楠屽崟\QC_FirstPieceCheckBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ConkReasonBillController.cs" />
--
Gitblit v1.9.1