From 4ba9609d75b835d8d2ef361ca0fe68fa72dfe5e2 Mon Sep 17 00:00:00 2001 From: yangle <admin@YINMOU> Date: 星期一, 14 十一月 2022 18:16:10 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- WebAPI/WebAPI.csproj | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj index 8520ef4..3d12a98 100644 --- a/WebAPI/WebAPI.csproj +++ b/WebAPI/WebAPI.csproj @@ -189,6 +189,7 @@ <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath> <Private>True</Private> </Reference> + <Reference Include="System.Windows.Forms" /> <Reference Include="System.Xml"> <Private>True</Private> </Reference> @@ -320,6 +321,8 @@ <Compile Include="App_Start\SwaggerConfig.cs" /> <Compile Include="App_Start\WebApiConfig.cs" /> <Compile Include="Controllers\BaseSet\Gy_BarCodeBillController.cs" /> + <Compile Include="Controllers\BaseSet\Gy_ConkTypeController.cs" /> + <Compile Include="Controllers\BaseSet\Gy_PackTypeController.cs" /> <Compile Include="Controllers\BaseSet\Gy_RoutingGroupController.cs" /> <Compile Include="Controllers\BaseSet\Gy_TechnologyController.cs" /> <Compile Include="Controllers\BaseSet\Gy_TechnologyParUnitController.cs" /> @@ -436,8 +439,13 @@ <Compile Include="Controllers\浠撳瓨绠$悊\棰嗘枡鍙戣揣\Kf_StepFoldOutBillController.cs" /> <Compile Include="Controllers\浠撳瓨绠$悊\楠屾敹鍏ュ簱\Kf_StepFoldinBillController.cs" /> <Compile Include="Controllers\鍗氭棩鑷姩鎵爜绾縗ScanlineAPIController.cs" /> + <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DutyBillController.cs" /> + <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_SOPBillController.cs" /> + <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_SOPBillListController.cs" /> <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_StockCheckItemBillController.cs" /> <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_WorkStationBillController.cs" /> + <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_CheckFlowBillController.cs" /> + <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_CheckItemBillController.cs" /> <Compile Include="Controllers\宸ヨ祫绠$悊\Pay_MonthlySalaryReportController.cs" /> <Compile Include="Controllers\宸ヨ祫绠$悊\Pay_PieceRateWageReportController.cs" /> <Compile Include="Controllers\宸ヨ祫绠$悊\Gy_ClassTimePrjBillController.cs" /> @@ -593,12 +601,20 @@ <Compile Include="Models\Sc_WorkBillSortBillSub.cs" /> <Compile Include="Models\Sc_WorkDemandPlanBillMain.cs" /> <Compile Include="Models\Sc_WorkDemandPlanBillSub.cs" /> + <Compile Include="Models\SOPBill.cs" /> <Compile Include="Models\TechnologyParameter.cs" /> <Compile Include="Models\TechnologyParameterUnit.cs" /> <Compile Include="Models\TechParamByProc.cs" /> + <Compile Include="Models\Xt_CheckFlowMain.cs" /> + <Compile Include="Models\Xt_CheckFlowSub.cs" /> + <Compile Include="Models\Xt_CheckItem.cs" /> <Compile Include="Models\鍏跺畠\ReciveBill_FastModel.cs" /> <Compile Include="Models\鍔ㄦ�佸垪\OptionListModel.cs" /> + <Compile Include="Models\鍩虹璧勬枡\ConkType.cs" /> <Compile Include="Models\鍩虹璧勬枡\Gy_ClassTimePrj.cs" /> + <Compile Include="Models\鍩虹璧勬枡\Gy_Duty.cs" /> + <Compile Include="Models\鍩虹璧勬枡\PackType.cs" /> + <Compile Include="Models\鍩虹璧勬枡\WorkStation.cs" /> <Compile Include="Models\宸ヨ祫绠$悊\ClsGy_ClassTimePrj_Model.cs" /> <Compile Include="Models\宸ヨ祫绠$悊\ClsPay_GroupBalBillEmp.cs" /> <Compile Include="Models\宸ヨ祫绠$悊\ClsPay_GroupBalBillMain.cs" /> @@ -852,10 +868,14 @@ <Folder Include="Views\Cj_CallGoodsBillMain\" /> <Folder Include="Views\Cj_ComplementGoodsBill\" /> <Folder Include="Views\Cj_SendGoodsBill\" /> + <Folder Include="Views\Gy_ConkType\" /> + <Folder Include="Views\Gy_DutyBill\" /> <Folder Include="Views\Gy_EquipType\" /> <Folder Include="Views\Gy_ICBomBill\" /> <Folder Include="Views\Gy_MateMould\" /> + <Folder Include="Views\Gy_PackType\" /> <Folder Include="Views\Gy_RoutingGroup\" /> + <Folder Include="Views\Gy_SOPBill\" /> <Folder Include="Views\Gy_WorkStation\" /> <Folder Include="Views\JIT_DayPlanPlatFormBill\" /> <Folder Include="Views\JIT_DayPlanPlatFormImport\" /> @@ -884,6 +904,8 @@ <Folder Include="Views\Sc_WorkBillAutoSortBillMain\" /> <Folder Include="Views\Sc_WorkBillSortBill\" /> <Folder Include="Views\Sc_WorkDemandPlanBill\" /> + <Folder Include="Views\Xt_CheckFlowBill\" /> + <Folder Include="Views\Xt_CheckItem\" /> <Folder Include="Views\Xt_grdAlignment_WMES\" /> </ItemGroup> <ItemGroup> -- Gitblit v1.9.1