From d4795e2359ff150cd1fd6a1a8a5b798d8e37c373 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期三, 21 七月 2021 18:24:31 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-API
---
WebAPI/WebAPI.csproj | 105 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 90 insertions(+), 15 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 92148fa..93e6fb5 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -82,9 +82,9 @@
<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=MSIL">
+ <Reference Include="Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>DLL\Model.dll</HintPath>
+ <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>
@@ -232,7 +232,6 @@
<Content Include="Index.html" />
<Content Include="Views\Scripts\bootstrap.js" />
<Content Include="Views\Scripts\bootstrap.min.js" />
- <None Include="Properties\PublishProfiles\API.pubxml" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -300,10 +299,10 @@
<Content Include="Web References\WebS\ClsKf_ICStockBill_WMS.datasource">
<DependentUpon>Reference.map</DependentUpon>
</Content>
- <None Include="Web References\WebS\Reference.map">
+ <Content Include="Web References\WebS\Reference.map">
<Generator>MSDiscoCodeGenerator</Generator>
<LastGenOutput>Reference.cs</LastGenOutput>
- </None>
+ </Content>
<None Include="Web References\WebS\WebService1.disco" />
<Content Include="Web.config">
<SubType>Designer</SubType>
@@ -315,6 +314,12 @@
<Compile Include="App_Start\RouteConfig.cs" />
<Compile Include="App_Start\SwaggerConfig.cs" />
<Compile Include="App_Start\WebApiConfig.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" />
@@ -338,19 +343,38 @@
<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" />
<Compile Include="Controllers\CGGL\Cg_POInStockBackBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_NoPassProcController.cs" />
+ <Compile Include="Controllers\CJGL\Sc_ProcessExchangeBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationOutBillController.cs" />
<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\ReportPlatFormController.cs" />
+ <Compile Include="Controllers\Sc_MouldController.cs" />
+ <Compile Include="Controllers\Sc_GroupOrderBillController.cs" />
<Compile Include="Controllers\QC_ManagementController.cs" />
+ <Compile Include="Controllers\SBGL\Sb_EquipDotCheckBillController.cs" />
+ <Compile Include="Controllers\SBGL\Sb_EquipMaintainBillController.cs" />
+ <Compile Include="Controllers\SBGL\Sb_EquipMaintainPlanBillController.cs" />
+ <Compile Include="Controllers\SBGL\Sb_EquipDotCheckPlanBillController.cs" />
+ <Compile Include="Controllers\Sb_CheckEqpRepairWorkBillController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_MaterToSourceBillController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_MESEndWorkBillController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_MESStopWorkBillController.cs" />
+ <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" />
@@ -363,11 +387,32 @@
<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\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" />
+ <Compile Include="DLL\ClsSc_MESStopWorkBill.cs" />
+ <Compile Include="DLL\ClsSc_MouldDotCheckBill.cs" />
+ <Compile Include="DLL\ClsSc_MouldLifeChangeBill.cs" />
+ <Compile Include="DLL\ClsSc_MouldMaintainBill.cs" />
+ <Compile Include="DLL\ClsSc_MouldProdBackBill.cs" />
+ <Compile Include="DLL\ClsSc_MouldProdOutBill.cs" />
+ <Compile Include="DLL\ClsSc_MouldRepairCheckBill.cs" />
+ <Compile Include="DLL\ClsSc_MouldScrapInBill.cs" />
+ <Compile Include="DLL\ClsSc_MouldScrapOutBill.cs" />
<Compile Include="DLL\ClsSc_ProcessReport.cs" />
<Compile Include="DLL\ClsSc_ProcessSendWork.cs" />
<Compile Include="DLL\ClsWW_EntrustProcessReportBill.cs" />
@@ -375,6 +420,31 @@
<Compile Include="DLL\ClsWW_EntrustWorkOrderBill.cs" />
<Compile Include="Models\ApiConfig.cs" />
<Compile Include="Models\ApiResult.cs" />
+ <Compile Include="Models\CheckItem.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" />
@@ -396,6 +466,10 @@
<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" />
@@ -417,6 +491,7 @@
<Compile Include="Models\WWSendOutBillViewModel.cs" />
<Compile Include="Models\WW_EntrustProcSendWorkViewModel.cs" />
<Compile Include="Models\WW_EntrustWorkOrderViewModel.cs" />
+ <Compile Include="Models\鍩虹璧勬枡\Warehouse.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
@@ -504,10 +579,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>
@@ -515,12 +596,6 @@
<CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
<CachedSettingsPropName>WebAPI_WebS_WebService1</CachedSettingsPropName>
</WebReferenceUrl>
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Properties\Resources.resx">
- <Generator>ResXFileCodeGenerator</Generator>
- <LastGenOutput>Resources.Designer.cs</LastGenOutput>
- </EmbeddedResource>
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
--
Gitblit v1.9.1