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 |  136 ++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 127 insertions(+), 9 deletions(-)

diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 54ece27..9a7365c 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -278,6 +278,15 @@
     <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\Pay_PeriodInfoSetController.cs" />
+    <Compile Include="Controllers\BaseSet\Gy_OrderBackInfoController.cs" />
+    <Compile Include="Controllers\BaseSet\Gy_OrderLevController.cs" />
+    <Compile Include="Controllers\BaseSet\Gy_WorkTypeController.cs" />
+    <Compile Include="Controllers\BaseSet\Gy_WorkPayTypeController.cs" />
+    <Compile Include="Controllers\BaseSet\Xt_DataDictionary_ProcController.cs" />
+    <Compile Include="Controllers\BaseSet\Xt_DataDictionary_TableController.cs" />
     <Compile Include="Controllers\BaseSet\Gy_ModelTypeController.cs" />
     <Compile Include="Controllers\BaseSet\Gy_QCCheckClassController.cs" />
     <Compile Include="Controllers\BaseSet\Gy_CheckItemController.cs" />
@@ -300,6 +309,7 @@
     <Compile Include="Controllers\BaseSet\Gy_SupplierController.cs" />
     <Compile Include="Controllers\BaseSet\Gy_PropertyController.cs" />
     <Compile Include="Controllers\BaseSet\Gy_WarehouseController.cs" />
+    <Compile Include="Controllers\BaseSet\Xt_DataDictionary_ViewController.cs" />
     <Compile Include="Controllers\BaseSet\Xt_ORGANIZATIONSController.cs" />
     <Compile Include="Controllers\BLL\Xt_AccountPeriodController.cs" />
     <Compile Include="Controllers\BLL\Xt_BillTypeController.cs" />
@@ -309,6 +319,8 @@
     <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" />
     <Compile Include="Controllers\CGGL\Cg_POInStockBillController.cs" />
@@ -322,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\MJGL\Sc_MouldMaintainRuleBillController.cs" />
     <Compile Include="Controllers\MJGL\Sc_MouldMoveStockStepInBillListController .cs" />
     <Compile Include="Controllers\MJGL\Sc_MouldProdMoveBillListController.cs" />
     <Compile Include="Controllers\MJGL\Sc_MouldMoveStockStepOutBillController.cs" />
@@ -331,18 +344,33 @@
     <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" />
-    <Compile Include="Controllers\Pay_WorkTimesBillController.cs" />
-    <Compile Include="Controllers\Pay_SingleBalBillController.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\宸ヨ祫绠＄悊\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" />
+    <Compile Include="Controllers\GG_NoticeController.cs" />
     <Compile Include="Controllers\ReportPlatFormController.cs" />
+    <Compile Include="Controllers\SBGL\Gy_EquipFileMainController.cs" />
+    <Compile Include="Controllers\SBGL\Gy_EquipTypeController.cs" />
+    <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_MouldRepairInBillListController.cs" />
     <Compile Include="Controllers\Sc_MouldController.cs" />
     <Compile Include="Controllers\Sc_GroupOrderBillController.cs" />
     <Compile Include="Controllers\QC_ManagementController.cs" />
@@ -359,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" />
@@ -369,9 +396,24 @@
     <Compile Include="Controllers\XSGL\Xs_SeOutStockBackBillController.cs" />
     <Compile Include="Controllers\XSGL\Xs_SeOutStockBillController.cs" />
     <Compile Include="Controllers\XSGL\Xs_SeOrderBillController.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" />
+    <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckBillController.cs" />
+    <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MaintainBillController.cs" />
+    <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" />
@@ -379,21 +421,29 @@
     <Compile Include="DbUntil\DataFormatUntil.cs" />
     <Compile Include="DLL\ClsGy_BadReason_Ctl.cs" />
     <Compile Include="DLL\ClsGy_DuSubsidyItemBill.cs" />
+    <Compile Include="DLL\ClsGy_EquipFileMain.cs" />
+    <Compile Include="DLL\ClsGy_EquipTypeBill.cs" />
     <Compile Include="DLL\ClsGy_Material_Ctl.cs" />
     <Compile Include="DLL\ClsGy_Source_Ctl.cs" />
     <Compile Include="DLL\ClsGy_WorkPayTypeBill.cs" />
     <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" />
     <Compile Include="DLL\ClsSb_EquipConkBookBill.cs" />
     <Compile Include="DLL\ClsSb_EquipDotCheckBill.cs" />
     <Compile Include="DLL\ClsSb_EquipMaintainBill.cs" />
+    <Compile Include="DLL\ClsSb_EquipMaintainRuleBill.cs" />
     <Compile Include="DLL\ClsSb_EquipRepairCheckBill.cs" />
     <Compile Include="DLL\ClsSb_EquipRepairWorkBill.cs" />
     <Compile Include="DLL\ClsSc_ICMOBillWorkQtyStatus_Tmp.cs" />
     <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" />
@@ -401,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" />
@@ -419,10 +487,42 @@
     <Compile Include="DLL\ClsWW_EntrustProcessReportBill.cs" />
     <Compile Include="DLL\ClsWW_EntrustProcessSendOutBill.cs" />
     <Compile Include="DLL\ClsWW_EntrustWorkOrderBill.cs" />
+    <Compile Include="DLL\ClsSb_EquipDotCheckRuleBill.cs" />
     <Compile Include="LogService.cs" />
     <Compile Include="Models\ApiConfig.cs" />
     <Compile Include="Models\ApiResult.cs" />
     <Compile Include="Models\CheckItem.cs" />
+    <Compile Include="Models\ClsGy_DotCheck.cs" />
+    <Compile Include="Models\ClsGy_Maintain.cs" />
+    <Compile Include="Models\ClsGy_Repair.cs" />
+    <Compile Include="Models\ClsGy_RepairCheck.cs" />
+    <Compile Include="Models\ClsKf_ICStockBillMain.cs" />
+    <Compile Include="Models\ClsKf_ICStockBillScheme.cs" />
+    <Compile Include="Models\ClsKf_ICStockBillSub.cs" />
+    <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\宸ヨ祫绠＄悊\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" />
+    <Compile Include="Models\ClsSb_EquipMaintainRuleBillSub.cs" />
+    <Compile Include="Models\ClsSb_EquipMaintainRuleBillSub_Item.cs" />
+    <Compile Include="Models\Pay_PeriodInfoSet.cs" />
+    <Compile Include="Models\Gy_OrderBackInfo.cs" />
+    <Compile Include="Models\Gy_OrderLevList.cs" />
+    <Compile Include="Models\ClsGy_EquipFileMain.cs" />
+    <Compile Include="Models\ClsGy_EquipFileType.cs" />
     <Compile Include="Models\ClsGy_Material_Model.cs" />
     <Compile Include="Models\ClsSb_EquipDotCheckBillMain.cs" />
     <Compile Include="Models\ClsSb_EquipDotCheckBillSub.cs" />
@@ -438,6 +538,18 @@
     <Compile Include="Models\ClsSc_MouldRepairOutBillMain.cs" />
     <Compile Include="Models\ClsSc_MouldRepairOutBillSub.cs" />
     <Compile Include="Models\ClsGy_ProcPrice.cs" />
+    <Compile Include="Models\Gy_WorkType.cs" />
+    <Compile Include="Models\Gy_WorkPayType.cs" />
+    <Compile Include="Models\QC_POStockInCheckBillSub.cs" />
+    <Compile Include="Models\QC_POStockInCheckBill.cs" />
+    <Compile Include="Models\UserPower.cs" />
+    <Compile Include="Models\Xt_DataDictionary_Proc.cs" />
+    <Compile Include="Models\Xt_DataDictionary_View.cs" />
+    <Compile Include="Models\Xt_DataDictionary_Table.cs" />
+    <Compile Include="Models\Gy_User.cs" />
+    <Compile Include="Models\Gy_UserSupper.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" />
@@ -446,6 +558,7 @@
     <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" />
@@ -513,9 +626,14 @@
     <Compile Include="Models\WWSendOutBillViewModel.cs" />
     <Compile Include="Models\WW_EntrustProcSendWorkViewModel.cs" />
     <Compile Include="Models\WW_EntrustWorkOrderViewModel.cs" />
+    <Compile Include="Models\鍩虹璧勬枡\Gy_ClassTimePrjSub.cs" />
+    <Compile Include="Models\鍩虹璧勬枡\Gy_ClassTimePrj.cs" />
     <Compile Include="Models\鍩虹璧勬枡\Gy_Employee.cs" />
     <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>
@@ -542,7 +660,6 @@
     <Compile Include="Controllers\EntrustOutController.cs" />
     <Compile Include="Controllers\Kf_EntrustInBillController.cs" />
     <Compile Include="Controllers\MateOutController.cs" />
-    <Compile Include="Controllers\MoveStockBillController.cs" />
     <Compile Include="Controllers\OtherOutBillController.cs" />
     <Compile Include="Controllers\OtherInStockController.cs" />
     <Compile Include="Controllers\POStockInBackBillController.cs" />
@@ -593,6 +710,7 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />
+    <Folder Include="Views\Gy_EquipType\" />
     <Folder Include="Views\MoveStockBill\" />
     <Folder Include="Views\QC_Management\" />
     <Folder Include="Views\Sc_MouldRepairOutBill\" />

--
Gitblit v1.9.1