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 | 79 +++++++++++++++++++++++++++++++++++++--
1 files changed, 74 insertions(+), 5 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 61c08d1..e407cf6 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -32,6 +32,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
+ <PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -262,10 +263,10 @@
<Content Include="Web References\WebS\ClsKf_ICStockBill_WMS.datasource">
<DependentUpon>Reference.map</DependentUpon>
</Content>
- <Content Include="Web References\WebS\Reference.map">
+ <None Include="Web References\WebS\Reference.map">
<Generator>MSDiscoCodeGenerator</Generator>
<LastGenOutput>Reference.cs</LastGenOutput>
- </Content>
+ </None>
<None Include="Web References\WebS\WebService1.disco" />
<Content Include="Web.config">
<SubType>Designer</SubType>
@@ -277,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_ModelTypeController.cs" />
<Compile Include="Controllers\BaseSet\Gy_QCCheckClassController.cs" />
<Compile Include="Controllers\BaseSet\Gy_CheckItemController.cs" />
<Compile Include="Controllers\BaseSet\Gy_MaintenanceAcceptItemController.cs" />
@@ -316,14 +318,31 @@
<Compile Include="Controllers\CJGL\Cj_StationOutBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationInBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationEntrustOutBillController.cs" />
+ <Compile Include="Controllers\GZGL\Gy_DuSubsidyItemBillController.cs" />
+ <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_MouldMoveStockStepInBillListController .cs" />
+ <Compile Include="Controllers\MJGL\Sc_MouldProdMoveBillListController.cs" />
+ <Compile Include="Controllers\MJGL\Sc_MouldMoveStockStepOutBillController.cs" />
+ <Compile Include="Controllers\MJGL\Sc_MouldProdInBillController.cs" />
+ <Compile Include="Controllers\MJGL\Sc_MouldRepairChangeBillController.cs" />
+ <Compile Include="Controllers\MJGL\Sc_MouldRepairOutBillController.cs" />
<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\Sc_MouldRepairOutBillController.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" />
@@ -338,27 +357,32 @@
<Compile Include="Controllers\SCGL\Sc_MESBeginWorkBillController.cs" />
<Compile Include="Controllers\SCGL\QC_LastPieceCheckBillController.cs" />
<Compile Include="Controllers\SCGL\QC_OutCompCheckBillController.cs" />
- <Compile Include="Controllers\SCGL\Sc_QualityReportBillController.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" />
<Compile Include="Controllers\NewApiController.cs" />
- <Compile Include="Controllers\SCGL\Sc_ICMOReportBillController.cs" />
<Compile Include="Controllers\SCGL\Sc_PPBomBillController.cs" />
- <Compile Include="Controllers\Sc_CheckToolsRepairWorkBillController.cs" />
+ <Compile Include="Controllers\Sc_CheckToolsRepairWorkBillListController.cs" />
<Compile Include="Controllers\XSGL\Xs_SeOutStockBackBillController.cs" />
<Compile Include="Controllers\XSGL\Xs_SeOutStockBillController.cs" />
<Compile Include="Controllers\XSGL\Xs_SeOrderBillController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\宸ュ簭妫�楠屽崟\QC_ProcessCheckBillController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\棣栦欢妫�楠屽崟\QC_FirstPieceCheckBillController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcPriceController.cs" />
+ <Compile Include="Controllers\鐢熶骇绠＄悊\鐢熶骇浠诲姟鍗昞Sc_ICMOBillController.cs" />
+ <Compile Include="Controllers\鐢熶骇绠＄悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBillController.cs" />
<Compile Include="Dapper\SqlHelper.cs" />
<Compile Include="Dapper\SqlPools.cs" />
<Compile Include="DbUntil\DataFormatUntil.cs" />
<Compile Include="DLL\ClsGy_BadReason_Ctl.cs" />
+ <Compile Include="DLL\ClsGy_DuSubsidyItemBill.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\ClsQC_NoPassProdCheckBill.cs" />
<Compile Include="DLL\ClsQC_PatrolProcCheckBill.cs" />
<Compile Include="DLL\ClsSb_EquipConkBookBill.cs" />
@@ -374,9 +398,20 @@
<Compile Include="DLL\ClsSc_MouldDotCheckBill.cs" />
<Compile Include="DLL\ClsSc_MouldLifeChangeBill.cs" />
<Compile Include="DLL\ClsSc_MouldMaintainBill.cs" />
+ <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" />
<Compile Include="DLL\ClsSc_MouldProdOutBill.cs" />
+ <Compile Include="DLL\ClsSc_MouldRepairChangeBill.cs" />
<Compile Include="DLL\ClsSc_MouldRepairCheckBill.cs" />
+ <Compile Include="DLL\ClsSc_MouldRepairInBill.cs" />
+ <Compile Include="DLL\ClsSc_MouldRepairOutBill.cs" />
<Compile Include="DLL\ClsSc_MouldScrapInBill.cs" />
<Compile Include="DLL\ClsSc_MouldScrapOutBill.cs" />
<Compile Include="DLL\ClsSc_ProcessReport.cs" />
@@ -384,6 +419,7 @@
<Compile Include="DLL\ClsWW_EntrustProcessReportBill.cs" />
<Compile Include="DLL\ClsWW_EntrustProcessSendOutBill.cs" />
<Compile Include="DLL\ClsWW_EntrustWorkOrderBill.cs" />
+ <Compile Include="LogService.cs" />
<Compile Include="Models\ApiConfig.cs" />
<Compile Include="Models\ApiResult.cs" />
<Compile Include="Models\CheckItem.cs" />
@@ -393,6 +429,27 @@
<Compile Include="Models\ClsSb_EquipMaintainBillMain.cs" />
<Compile Include="Models\ClsSb_EquipMaintainBillSub.cs" />
<Compile Include="Models\ClsSb_EquipRepairWorkBillMain.cs" />
+ <Compile Include="Models\ClsSc_MouldProdBillMain.cs" />
+ <Compile Include="Models\ClsSc_MouldProdBillSub.cs" />
+ <Compile Include="Models\ClsSc_MouldRepairChangeBillMain.cs" />
+ <Compile Include="Models\ClsSc_MouldRepairChangeBillSub.cs" />
+ <Compile Include="Models\ClsSc_MouldRepairInBillMain.cs" />
+ <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" />
<Compile Include="Models\ClsSc_ICMOReportBillMain.cs" />
@@ -416,6 +473,7 @@
<Compile Include="Models\Gy_Mould.cs" />
<Compile Include="Models\Gy_MouldSub.cs" />
<Compile Include="Models\Sc_MouldStockBillMain.cs" />
+ <Compile Include="Models\Sc_ICMOBillQualityStatus_Tmp.cs" />
<Compile Include="Models\Sc_MouldStockBillSub.cs" />
<Compile Include="Models\Xt_AccountPeriod.cs" />
<Compile Include="Models\xtgnb.cs" />
@@ -458,6 +516,8 @@
<Compile Include="Models\WWSendOutBillViewModel.cs" />
<Compile Include="Models\WW_EntrustProcSendWorkViewModel.cs" />
<Compile Include="Models\WW_EntrustWorkOrderViewModel.cs" />
+ <Compile Include="Models\鍩虹璧勬枡\Gy_Employee.cs" />
+ <Compile Include="Models\鍩虹璧勬枡\Gy_Process.cs" />
<Compile Include="Models\鍩虹璧勬枡\Warehouse.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
@@ -538,6 +598,7 @@
<Folder Include="App_Data\" />
<Folder Include="Views\MoveStockBill\" />
<Folder Include="Views\QC_Management\" />
+ <Folder Include="Views\Sc_MouldRepairOutBill\" />
</ItemGroup>
<ItemGroup>
<WCFMetadata Include="Service References\" />
@@ -598,6 +659,14 @@
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\</OutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\</OutputPath>
+ </PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
--
Gitblit v1.9.1