From d6000dcc7e825097d81d51d48e7406eddff9c1da Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 20 十月 2021 17:30:02 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebAPI.csproj | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 9b313e4..e407cf6 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -331,12 +331,16 @@
<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\Open_PrintTemController.cs" />
+ <Compile Include="Controllers\Pay_OtherBalBillController.cs" />
+ <Compile Include="Controllers\Pay_GroupBalBillController.cs" />
+ <Compile Include="Controllers\Pay_WorkTimesBillController.cs" />
+ <Compile Include="Controllers\Pay_SingleBalBillController.cs" />
<Compile Include="Controllers\ProductionOrderController.cs" />
<Compile Include="Controllers\PublicPageMethodController.cs" />
<Compile Include="Controllers\ReportFromController.cs" />
<Compile Include="Controllers\ReportPlatFormController.cs" />
<Compile Include="Controllers\SCGL\Sc_MESProductReportBillController.cs" />
- <Compile Include="Controllers\Pay_SingleBalBillController.cs" />
<Compile Include="Controllers\Sc_MouldRepairOutBillController.cs" />
<Compile Include="Controllers\Sc_MouldRepairInBillListController - .cs" />
<Compile Include="Controllers\Sc_MouldController.cs" />
@@ -397,7 +401,9 @@
<Compile Include="DLL\ClsSc_MouldOtherOutBill.cs" />
<Compile Include="DLL\ClsSc_MouldOtherInBill.cs" />
<Compile Include="DLL\ClsSc_MouldMoveStockStepOutBill.cs" />
+ <Compile Include="DLL\ClsPay_SingleBalBill.cs" />
<Compile Include="DLL\ClsSc_MouldProdBackBill.cs" />
+ <Compile Include="DLL\ClsPay_OtherBalBill.cs" />
<Compile Include="DLL\ClsSc_MouldProdInBill.cs" />
<Compile Include="DLL\ClsSc_MouldMoveStockStepInBill.cs" />
<Compile Include="DLL\ClsSc_MouldProdMoveBill.cs" />
@@ -431,6 +437,18 @@
<Compile Include="Models\ClsSc_MouldRepairInBillSub.cs" />
<Compile Include="Models\ClsSc_MouldRepairOutBillMain.cs" />
<Compile Include="Models\ClsSc_MouldRepairOutBillSub.cs" />
+ <Compile Include="Models\ClsGy_ProcPrice.cs" />
+ <Compile Include="Models\Menu.cs" />
+ <Compile Include="Models\ModelConvertHelper.cs" />
+ <Compile Include="Models\Pay_OtherBalBill.cs" />
+ <Compile Include="Models\Pay_GroupBalBill.cs" />
+ <Compile Include="Models\Pay_GroupBalBillSub.cs" />
+ <Compile Include="Models\Pay_WorkTimesBillSub.cs" />
+ <Compile Include="Models\Pay_WorkTimesBill.cs" />
+ <Compile Include="Models\Pay_SingleBalBill.cs" />
+ <Compile Include="Models\Pay_OtherBalBillSub.cs" />
+ <Compile Include="Models\Pay_SingleBalBillSub.cs" />
+ <Compile Include="Models\ToHierarchy.cs" />
<Compile Include="Models\Xt_ORGANIZATIONS.cs" />
<Compile Include="Models\ClsSb_EquipRepairWorkBillSub.cs" />
<Compile Include="Models\ClsSc_ICMOBillWorkQtyStatus_Tmp.cs" />
--
Gitblit v1.9.1