From 7a9c63c6145b6592f89e3e89cf5b2e608d923cb8 Mon Sep 17 00:00:00 2001
From: 仲国强 <519541279@qq.com>
Date: 星期三, 25 八月 2021 21:58:12 +0800
Subject: [PATCH] 1
---
WebAPI/WebAPI.csproj | 140 +++++++++++++++++++++++++++++++---------------
1 files changed, 93 insertions(+), 47 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index aecc3c8..0859ce4 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>
@@ -47,29 +48,8 @@
<HintPath>..\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll</HintPath>
<Private>True</Private>
</Reference>
- <Reference Include="BLL, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>DLL\BLL.dll</HintPath>
- </Reference>
- <Reference Include="DAL, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>DLL\DAL.dll</HintPath>
- </Reference>
<Reference Include="Dapper, Version=1.50.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapper.1.50.2\lib\net45\Dapper.dll</HintPath>
- </Reference>
- <Reference Include="DBUtility, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>DLL\DBUtility.dll</HintPath>
- </Reference>
- <Reference Include="Kingdee.BOS.WebApi.Client">
- <HintPath>..\..\..\..\LMES\LMES\LMES\OCX\Kingdee.BOS.WebApi.Client.dll</HintPath>
- </Reference>
- <Reference Include="Kingdee.BOS.WebApi.FormService">
- <HintPath>..\..\..\..\LMES\LMES\LMES\OCX\Kingdee.BOS.WebApi.FormService.dll</HintPath>
- </Reference>
- <Reference Include="Kingdee.BOS.WebApi.ServicesStub">
- <HintPath>..\..\..\..\LMES\LMES\LMES\OCX\Kingdee.BOS.WebApi.ServicesStub.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.AppService.ApiApps.Service, Version=0.9.16.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Azure.AppService.ApiApps.Service.0.9.16\lib\net45\Microsoft.Azure.AppService.ApiApps.Service.dll</HintPath>
@@ -82,24 +62,8 @@
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
<Private>True</Private>
</Reference>
- <Reference Include="Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>DLL\璋冪敤宸ョ▼鏂囦欢\Model.dll</HintPath>
- </Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
- </Reference>
- <Reference Include="Pub_Class, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>DLL\Pub_Class.dll</HintPath>
- </Reference>
- <Reference Include="Pub_Control, Version=1.0.7135.29962, Culture=neutral, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>DLL\Pub_Control.dll</HintPath>
- </Reference>
- <Reference Include="SQLHelper, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>DLL\SQLHelper.dll</HintPath>
</Reference>
<Reference Include="Swashbuckle.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cd1bb07a5ac7c7bc, processorArchitecture=MSIL">
<HintPath>..\packages\Swashbuckle.Core.5.0.0\lib\net40\Swashbuckle.Core.dll</HintPath>
@@ -314,12 +278,14 @@
<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" />
<Compile Include="Controllers\BaseSet\Gy_MaintenanceItemController.cs" />
<Compile Include="Controllers\BaseSet\Gy_MaintenanceModeController.cs" />
<Compile Include="Controllers\BaseSet\Gy_StockPlaceController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_EquipMentController.cs" />
<Compile Include="Controllers\BaseSet\Gy_WorkCenterController.cs" />
<Compile Include="Controllers\BaseSet\Gy_CurrencyController.cs" />
<Compile Include="Controllers\BaseSet\Gy_UnitController.cs" />
@@ -342,6 +308,7 @@
<Compile Include="Controllers\BLL\Xt_SystemParameterController.cs" />
<Compile Include="Controllers\BLL\Xt_UserController.cs" />
<Compile Include="Controllers\BLL\Xt_SystemLogController.cs" />
+ <Compile Include="Controllers\CellWidthController.cs" />
<Compile Include="Controllers\CGGL\Cg_POOrderBillController.cs" />
<Compile Include="Controllers\CGGL\WW_EntrustOrderBillController.cs" />
<Compile Include="Controllers\CGGL\Cg_POInStockBillController.cs" />
@@ -352,9 +319,14 @@
<Compile Include="Controllers\CJGL\Cj_StationInBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationEntrustOutBillController.cs" />
<Compile Include="Controllers\JHGL\Gy_RoutingBillController.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\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_MouldController.cs" />
<Compile Include="Controllers\Sc_GroupOrderBillController.cs" />
<Compile Include="Controllers\QC_ManagementController.cs" />
@@ -369,8 +341,8 @@
<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\QC_ProcessCheckBillController.cs" />
<Compile Include="Controllers\SCGL\Sc_QualityReportBillController.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" />
@@ -382,16 +354,22 @@
<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="Dapper\SqlHelper.cs" />
<Compile Include="Dapper\SqlPools.cs" />
<Compile Include="DbUntil\DataFormatUntil.cs" />
<Compile Include="DLL\ClsGy_BadReason_Ctl.cs" />
+ <Compile Include="DLL\ClsGy_Material_Ctl.cs" />
+ <Compile Include="DLL\ClsGy_Source_Ctl.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_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" />
@@ -412,16 +390,39 @@
<Compile Include="Models\ApiConfig.cs" />
<Compile Include="Models\ApiResult.cs" />
<Compile Include="Models\CheckItem.cs" />
+ <Compile Include="Models\ClsGy_Material_Model.cs" />
<Compile Include="Models\ClsSb_EquipDotCheckBillMain.cs" />
<Compile Include="Models\ClsSb_EquipDotCheckBillSub.cs" />
+ <Compile Include="Models\ClsSb_EquipMaintainBillMain.cs" />
+ <Compile Include="Models\ClsSb_EquipMaintainBillSub.cs" />
<Compile Include="Models\ClsSb_EquipRepairWorkBillMain.cs" />
<Compile Include="Models\ClsSb_EquipRepairWorkBillSub.cs" />
+ <Compile Include="Models\ClsSc_ICMOBillWorkQtyStatus_Tmp.cs" />
+ <Compile Include="Models\ClsSc_ICMOReportBillMain.cs" />
+ <Compile Include="Models\ClsSc_ICMOReportBillSub.cs" />
+ <Compile Include="Models\ClsSc_MESBeginWorkBillMain.cs" />
+ <Compile Include="Models\ClsSc_MESBeginWorkBillSub.cs" />
+ <Compile Include="Models\ClsSc_MESEndWorkBillMain.cs" />
+ <Compile Include="Models\ClsSc_MESEndWorkBillSub.cs" />
+ <Compile Include="Models\ClsSc_MESStopWorkBillMain.cs" />
+ <Compile Include="Models\ClsSc_MESStopWorkBillSub.cs" />
+ <Compile Include="Models\ClsSc_MouldScrapOutBillMain.cs">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Compile>
<Compile Include="Models\ClsSc_MouldDotCheckBillMain.cs" />
<Compile Include="Models\ClsSc_MouldDotCheckBillSub.cs" />
<Compile Include="Models\ClsSc_MouldMaintainBillMain.cs" />
<Compile Include="Models\ClsSc_MouldMaintainBillSub.cs" />
<Compile Include="Models\ClsSc_MouldStockBillMain.cs" />
<Compile Include="Models\ClsSc_MouldStockBillSub.cs" />
+ <Compile Include="Models\EquipMent.cs" />
+ <Compile Include="Models\Gy_Mould.cs" />
+ <Compile Include="Models\Gy_MouldSub.cs" />
+ <Compile Include="Models\Sc_MouldStockBillMain.cs" />
+ <Compile Include="Models\Sc_MouldStockBillSub.cs" />
+ <Compile Include="Models\Xt_AccountPeriod.cs" />
+ <Compile Include="Models\xtgnb.cs" />
+ <Compile Include="Models\SystemParameter.cs" />
<Compile Include="Models\ClsSc_ProcessSendWorkMain.cs" />
<Compile Include="Models\ClsWW_EntrustProcessReportBillMain.cs" />
<Compile Include="Models\ClsWW_EntrustProcessReportBillSub.cs" />
@@ -429,11 +430,18 @@
<Compile Include="Models\ClsWW_EntrustProcessSendOutBillSub.cs" />
<Compile Include="Models\ClsWW_EntrustWorkOrderBillMain.cs" />
<Compile Include="Models\ClsWW_EntrustWorkOrderBillSub.cs" />
+ <Compile Include="Models\Customer.cs" />
+ <Compile Include="Models\BillType.cs" />
+ <Compile Include="Models\QC_OutCompCheckBillMain.cs" />
+ <Compile Include="Models\QC_OutCompCheckBillSub.cs" />
+ <Compile Include="Models\Supplier.cs" />
<Compile Include="Models\DocumentsView.cs" />
<Compile Include="Models\Gy_Group.cs" />
<Compile Include="Models\Gy_WorkCenter.cs" />
<Compile Include="Models\MaintenanceAcceptItem.cs" />
<Compile Include="Models\MaintenanceMode.cs" />
+ <Compile Include="Models\QC_LastPieceCheckBillSub.cs" />
+ <Compile Include="Models\QC_LastPieceCheckBillMain.cs" />
<Compile Include="Models\QC_ProcessCheckBillSub.cs" />
<Compile Include="Models\QC_ProcessCheckBillMain.cs" />
<Compile Include="Models\Gy_RoutingBillSub.cs" />
@@ -453,6 +461,7 @@
<Compile Include="Models\WWSendOutBillViewModel.cs" />
<Compile Include="Models\WW_EntrustProcSendWorkViewModel.cs" />
<Compile Include="Models\WW_EntrustWorkOrderViewModel.cs" />
+ <Compile Include="Models\鍩虹璧勬枡\Gy_Process.cs" />
<Compile Include="Models\鍩虹璧勬枡\Warehouse.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
@@ -473,7 +482,6 @@
<DesignTime>True</DesignTime>
<DependentUpon>Reference.map</DependentUpon>
</Compile>
- <Compile Include="WebServer.cs" />
<Compile Include="Code\Common.cs" />
<Compile Include="Code\Test2.cs" />
<Compile Include="Code\TestDAL.cs" />
@@ -501,6 +509,7 @@
<Compile Include="Models\JsonResult.cs" />
<Compile Include="Models\Pensen.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="WebServer.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="packages.config">
@@ -531,7 +540,6 @@
</ItemGroup>
<ItemGroup>
<Folder Include="App_Data\" />
- <Folder Include="Controllers\PZGL\" />
<Folder Include="Views\MoveStockBill\" />
<Folder Include="Views\QC_Management\" />
</ItemGroup>
@@ -542,10 +550,16 @@
<WebReferences Include="Web References\" />
</ItemGroup>
<ItemGroup>
- <WebReferenceUrl Include="http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx">
- <UrlBehavior>Static</UrlBehavior>
+ <EmbeddedResource Include="Properties\Resources.resx">
+ <Generator>ResXFileCodeGenerator</Generator>
+ <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ItemGroup>
+ <WebReferenceUrl Include="http://localhost/WEBS-WMSTest/WebService1.asmx">
+ <UrlBehavior>Dynamic</UrlBehavior>
<RelPath>Web References\WebS\</RelPath>
- <UpdateFromURL>http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx</UpdateFromURL>
+ <UpdateFromURL>http://localhost/WEBS-WMSTest/WebService1.asmx</UpdateFromURL>
<ServiceLocationURL>
</ServiceLocationURL>
<CachedDynamicPropName>
@@ -555,15 +569,47 @@
</WebReferenceUrl>
</ItemGroup>
<ItemGroup>
- <EmbeddedResource Include="Properties\Resources.resx">
- <Generator>ResXFileCodeGenerator</Generator>
- <LastGenOutput>Resources.Designer.cs</LastGenOutput>
- </EmbeddedResource>
+ <ProjectReference Include="..\BLL\BLL.csproj">
+ <Project>{0bf3d95a-4a7b-45fb-92fb-9a5bb374b750}</Project>
+ <Name>BLL</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\DAL\DAL.csproj">
+ <Project>{7c30e3c9-58b7-420a-ab92-0a5117b82dda}</Project>
+ <Name>DAL</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\DBUtility\DBUtility.csproj">
+ <Project>{f2098f1b-4fa1-49bb-91ea-ab3522008f28}</Project>
+ <Name>DBUtility</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\Model\Model.csproj">
+ <Project>{5061b703-b7a6-4e82-a9aa-f73fd80520bf}</Project>
+ <Name>Model</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\Pub_Class\Pub_Class.csproj">
+ <Project>{0de3c6c4-9c87-4b8c-ac86-ac15b7afe731}</Project>
+ <Name>Pub_Class</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\Pub_Control\Pub_Control.csproj">
+ <Project>{f7838319-779c-4ad9-a59f-5dcb5757f335}</Project>
+ <Name>Pub_Control</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\SQLHelper\SQLHelper.csproj">
+ <Project>{0a4ef483-d8d3-49a5-8378-974ef7993365}</Project>
+ <Name>SQLHelper</Name>
+ </ProjectReference>
</ItemGroup>
<PropertyGroup>
<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