From c0ea121256e4c23dba0efda571269c706766126a Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期三, 08 十二月 2021 19:13:03 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebAPI.csproj | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index ee0df6f..2418e11 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" />
@@ -346,12 +347,13 @@
<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" />
+ <Compile Include="Controllers\ReportStepPlatFormController.cs" />
+ <Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_OtherBalBillController.cs" />
+ <Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_GroupBalBillController.cs" />
<Compile Include="Controllers\PurchaseOrderController.cs" />
<Compile Include="Controllers\QC_POStockInCheckBillController.cs" />
- <Compile Include="Controllers\Pay_WorkTimesBillController.cs" />
- <Compile Include="Controllers\Pay_SingleBalBillController.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" />
@@ -362,6 +364,7 @@
<Compile Include="Controllers\SBGL\Sb_EquipDotCheckRuleBillController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipMaintainRuleBillController.cs" />
<Compile Include="Controllers\SCGL\Sc_MESProductReportBillController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_MESTransFerWorkBillController.cs" />
<Compile Include="Controllers\Sc_MouldRepairOutBillController.cs" />
<Compile Include="Controllers\Sc_MouldRepairInBillListController - .cs" />
<Compile Include="Controllers\Sc_MouldController.cs" />
@@ -401,6 +404,11 @@
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairCheckBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcPriceController.cs" />
+ <Compile Include="Controllers\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫Sc_MESBeginStepWorkBillController.cs" />
+ <Compile Include="Controllers\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫Sc_MESEndStepWorkBillController.cs" />
+ <Compile Include="Controllers\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫Sc_MESProductReportStepBillController.cs" />
+ <Compile Include="Controllers\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫Sc_MESReturnStepWorkBillController.cs" />
+ <Compile Include="Controllers\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫Sc_MESStopStepWorkBillController.cs" />
<Compile Include="Controllers\鐢熶骇绠＄悊\鐢熶骇浠诲姟鍗昞Sc_ICMOBillController.cs" />
<Compile Include="Controllers\鐢熶骇绠＄悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBillController.cs" />
<Compile Include="Dapper\SqlHelper.cs" />
@@ -416,6 +424,7 @@
<Compile Include="DLL\ClsGy_WorkTypeBill.cs" />
<Compile Include="DLL\ClsKf_MateOutBackBill.cs" />
<Compile Include="DLL\ClsKf_MateOutBill.cs" />
+ <Compile Include="DLL\ClsOA_ErrMsgBackBill.cs" />
<Compile Include="DLL\ClsOA_InformBill.cs" />
<Compile Include="DLL\ClsQC_NoPassProdCheckBill.cs" />
<Compile Include="DLL\ClsQC_PatrolProcCheckBill.cs" />
@@ -429,6 +438,7 @@
<Compile Include="DLL\ClsSc_ICMOReportBill.cs" />
<Compile Include="DLL\ClsSc_MESBeginWorkBill.cs" />
<Compile Include="DLL\ClsSc_MESEndWorkBill.cs" />
+ <Compile Include="DLL\ClsSc_MESReturnStepWorkBill.cs" />
<Compile Include="DLL\ClsSc_MESStopWorkBill.cs" />
<Compile Include="DLL\ClsSc_MouldDotCheckBill.cs" />
<Compile Include="DLL\ClsSc_MouldLifeChangeBill.cs" />
@@ -436,9 +446,14 @@
<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\宸ヨ祫绠＄悊\ClsPay_GroupBalBill.cs" />
+ <Compile Include="DLL\宸ヨ祫绠＄悊\ClsPay_WorkTimesBill.cs" />
+ <Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_GroupBalBillEmp.cs" />
+ <Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_GroupBalBillMain.cs" />
+ <Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_GroupBalBillSub.cs" />
+ <Compile Include="DLL\宸ヨ祫绠＄悊\ClsPay_SingleBalBill.cs" />
<Compile Include="DLL\ClsSc_MouldProdBackBill.cs" />
- <Compile Include="DLL\ClsPay_OtherBalBill.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" />
@@ -469,8 +484,15 @@
<Compile Include="Models\ClsKf_MateOutBillMain.cs" />
<Compile Include="Models\ClsKf_MateOutBillScheme.cs" />
<Compile Include="Models\ClsKf_MateOutBillSub.cs" />
+ <Compile Include="Models\ClsOA_ErrMsgBackBillMain.cs" />
+ <Compile Include="Models\ClsOA_ErrMsgBackBillSub.cs" />
+ <Compile Include="Models\ClsOA_ErrMsgBackBillSub2.cs" />
<Compile Include="Models\ClsOA_InformBillMain.cs" />
<Compile Include="Models\ClsOA_InformBillSub.cs" />
+ <Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_OtherBalBillMain.cs" />
+ <Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_OtherBalBillSub.cs" />
+ <Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_SingleBalBillMain.cs" />
+ <Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_SingleBalBillSub.cs" />
<Compile Include="Models\ClsSb_EquipDotCheckRuleBillMain.cs" />
<Compile Include="Models\ClsSb_EquipDotCheckRuleBillSub.cs" />
<Compile Include="Models\ClsSb_EquipMaintainRuleBillMain.cs" />
@@ -590,6 +612,8 @@
<Compile Include="Models\鍩虹璧勬枡\Gy_Process.cs" />
<Compile Include="Models\鍩虹璧勬枡\Gy_ClassTimePrj.cs" />
<Compile Include="Models\鍩虹璧勬枡\Warehouse.cs" />
+ <Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_WorkTimesBillMain.cs" />
+ <Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_WorkTimesBillSub.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
--
Gitblit v1.9.1