From f10dd2827a613e9edfd58e359564dd59b5bf88f2 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 22 十二月 2021 17:37:20 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebAPI.csproj | 56 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 47 insertions(+), 9 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index b605de3..9a7365c 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -280,7 +280,6 @@
<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" />
<Compile Include="Controllers\BaseSet\Gy_OrderBackInfoController.cs" />
<Compile Include="Controllers\BaseSet\Gy_OrderLevController.cs" />
@@ -347,12 +346,18 @@
<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\Sc_ProcessMangementController.cs" />
+ <Compile Include="Controllers\鍗氭棩鑷姩鎵爜绾縗ScanlineAPIController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_StockCheckItemBillController.cs" />
+ <Compile Include="Controllers\宸ヨ祫绠＄悊\Gy_ClassTimePrjBillController.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\宸ヨ祫绠＄悊\Gy_GroupEmpBillController.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" />
@@ -365,7 +370,7 @@
<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_MouldRepairInBillListController.cs" />
<Compile Include="Controllers\Sc_MouldController.cs" />
<Compile Include="Controllers\Sc_GroupOrderBillController.cs" />
<Compile Include="Controllers\QC_ManagementController.cs" />
@@ -382,7 +387,6 @@
<Compile Include="Controllers\SCGL\QC_OutCompCheckBillController.cs" />
<Compile Include="Controllers\SCGL\Sc_ICMOReportBillController.cs" />
<Compile Include="Controllers\Sc_MouldOtherInBillController.cs" />
- <Compile Include="Controllers\Sc_ProcessMangementController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationEntrustInBillController.cs" />
<Compile Include="Controllers\LMESController.cs" />
<Compile Include="Controllers\LookingForBillController.cs" />
@@ -403,6 +407,13 @@
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairCheckBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcPriceController.cs" />
+ <Compile Include="Controllers\鐢熶骇绠＄悊\鎶ュ伐鍙板伐搴廫Sc_MaterToSourceStepBillController.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_QualityReportStepBillController.cs" />
<Compile Include="Controllers\鐢熶骇绠＄悊\鐢熶骇浠诲姟鍗昞Sc_ICMOBillController.cs" />
<Compile Include="Controllers\鐢熶骇绠＄悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBillController.cs" />
<Compile Include="Dapper\SqlHelper.cs" />
@@ -432,6 +443,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" />
@@ -439,9 +451,27 @@
<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_PackUnionBill.cs" />
+ <Compile Include="DLL\宸ヨ祫绠＄悊\ClsPay_GroupBalBill.cs" />
+ <Compile Include="DLL\宸ヨ祫绠＄悊\ClsGy_GroupEmpBill.cs" />
+ <Compile Include="DLL\宸ヨ祫绠＄悊\ClsPay_WorkTimesBill.cs" />
+ <Compile Include="HttpClient.cs" />
+ <Compile Include="InvokeHelper.cs" />
+ <Compile Include="Models\ClsGy_StockCheckItemBill.cs" />
+ <Compile Include="Models\ClsSc_PackUnionBillMain.cs" />
+ <Compile Include="Models\ClsSc_PackUnionBillSub.cs" />
+ <Compile Include="Models\ClsSc_ProcessReportMain.cs" />
+ <Compile Include="Models\ClsSc_ProcessReportSub.cs" />
+ <Compile Include="Models\GetWeekList.cs" />
+ <Compile Include="Models\jsonScanline.cs" />
+ <Compile Include="Models\ScanLineCode.cs" />
+ <Compile Include="Models\宸ヨ祫绠＄悊\ClsGy_ClassTimePrj_Model.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" />
@@ -477,6 +507,12 @@
<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\宸ヨ祫绠＄悊\ClsGy_GroupEmpListMain.cs" />
+ <Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_SingleBalBillMain.cs" />
+ <Compile Include="Models\宸ヨ祫绠＄悊\ClsGy_GroupEmpListSub.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" />
@@ -596,6 +632,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