~yxj/MES-WEB-API.git

			@@ -91,6 +91,9 @@
			<Reference Include="NPOI.OpenXmlFormats, Version=2.5.5.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
			<HintPath>..\packages\NPOI.2.5.5\lib\net45\NPOI.OpenXmlFormats.dll</HintPath>
			</Reference>
			<Reference Include="RestSharp, Version=104.0.0.0, Culture=neutral, processorArchitecture=MSIL">
			<HintPath>..\packages\RestSharp.104.0\lib\net4\RestSharp.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>
			<Private>True</Private>
			@@ -299,16 +302,16 @@
			<Content Include="Web References\WebS\ClsGy_Warehouse_Model.datasource">
			<DependentUpon>Reference.map</DependentUpon>
			</Content>
			<Content Include="Web References\WebS\ClsKf_ICStockBill_WMS.datasource">
			<DependentUpon>Reference.map</DependentUpon>
			</Content>
			<Content Include="Web References\WebS\ClsKf_ICStockBill_Mould.datasource">
			<DependentUpon>Reference.map</DependentUpon>
			</Content>
			<None Include="Web References\WebS\Reference.map">
			<Content Include="Web References\WebS\ClsKf_ICStockBill_WMS.datasource">
			<DependentUpon>Reference.map</DependentUpon>
			</Content>
			<Content Include="Web References\WebS\Reference.map">
			<Generator>MSDiscoCodeGenerator</Generator>
			<LastGenOutput>Reference1.cs</LastGenOutput>
			</None>
			<LastGenOutput>Reference.cs</LastGenOutput>
			</Content>
			<None Include="Web References\WebS\WebService1.disco" />
			<Content Include="Web.config">
			<SubType>Designer</SubType>
			@@ -322,6 +325,8 @@
			<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_ICBomBillController.cs" />
			<Compile Include="Controllers\BaseSet\Gy_WorkDayController.cs" />
			<Compile Include="Controllers\BaseSet\Gy_PackTypeController.cs" />
			<Compile Include="Controllers\BaseSet\Gy_RoutingGroupController.cs" />
			<Compile Include="Controllers\BaseSet\Gy_TechnologyController.cs" />
			@@ -437,13 +442,28 @@
			<Compile Include="Controllers\仓存管理\调拨盘点\Kf_MoveStockRequestBillController.cs" />
			<Compile Include="Controllers\仓存管理\领料发货\apiController.cs" />
			<Compile Include="Controllers\仓存管理\领料发货\Kf_StepFoldOutBillController.cs" />
			<Compile Include="Controllers\仓存管理\领料发货\Kf_StockOutRequestBillController.cs" />
			<Compile Include="Controllers\仓存管理\验收入库\Kf_StepFoldinBillController.cs" />
			<Compile Include="Controllers\博日自动扫码线\ScanlineAPIController.cs" />
			<Compile Include="Controllers\基础资料\基础资料\Gy_COMMONCONTACTBillController.cs" />
			<Compile Include="Controllers\基础资料\基础资料\Gy_CustLocationController.cs" />
			<Compile Include="Controllers\基础资料\基础资料\Gy_DutyBillController.cs" />
			<Compile Include="Controllers\基础资料\基础资料\Gy_MatePriceSupController.cs" />
			<Compile Include="Controllers\基础资料\基础资料\Gy_PaymentConditionListBillController.cs" />
			<Compile Include="Controllers\基础资料\基础资料\Gy_RateTypeController.cs" />
			<Compile Include="Controllers\基础资料\基础资料\Gy_RecConditionBillController.cs" />
			<Compile Include="Controllers\基础资料\基础资料\Gy_SettleStyleController.cs" />
			<Compile Include="Controllers\基础资料\基础资料\Gy_SOPBillController.cs" />
			<Compile Include="Controllers\基础资料\基础资料\Gy_SOPBillEditController.cs" />
			<Compile Include="Controllers\基础资料\基础资料\Gy_SOPBillListController.cs" />
			<Compile Include="Controllers\基础资料\基础资料\Gy_StockCheckItemBillController.cs" />
			<Compile Include="Controllers\基础资料\基础资料\Gy_StockStatusBillController.cs" />
			<Compile Include="Controllers\基础资料\基础资料\Gy_SupplierContactBillController.cs" />
			<Compile Include="Controllers\基础资料\基础资料\Gy_TaxMIXController.cs" />
			<Compile Include="Controllers\基础资料\基础资料\Gy_TaxRateBillController.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" />
			@@ -505,6 +525,7 @@
			<Compile Include="Controllers\基础资料\基础资料\Gy_RepairBillController.cs" />
			<Compile Include="Controllers\基础资料\基础资料\Gy_RepairCheckBillController.cs" />
			<Compile Include="Controllers\基础资料\工资基础资料\Gy_ProcPriceController.cs" />
			<Compile Include="Controllers\条码管理\WEBSController.cs" />
			<Compile Include="Controllers\生产管理\报工台工序\Sc_MaterToSourceStepBillController.cs" />
			<Compile Include="Controllers\生产管理\报工台工序\Sc_MESBeginStepWorkBillController.cs" />
			<Compile Include="Controllers\生产管理\报工台工序\Sc_MESEndStepWorkBillController.cs" />
			@@ -600,13 +621,20 @@
			<Compile Include="Models\Sc_WorkDemandPlanBillMain.cs" />
			<Compile Include="Models\Sc_WorkDemandPlanBillSub.cs" />
			<Compile Include="Models\SOPBill.cs" />
			<Compile Include="Models\SOPBillSub.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\基础资料\Gy_StockPlace.cs" />
			<Compile Include="Models\基础资料\WorkDay.cs" />
			<Compile Include="Models\基础资料\PackType.cs" />
			<Compile Include="Models\基础资料\WorkStation.cs" />
			<Compile Include="Models\工资管理\ClsGy_ClassTimePrj_Model.cs" />
			@@ -794,11 +822,6 @@
			<Compile Include="Service\YqnDal.cs" />
			<Compile Include="Service\YqnQbService.cs" />
			<Compile Include="Utility\Util.cs" />
			<Compile Include="Web References\WebS\Reference.cs">
			<AutoGen>True</AutoGen>
			<DesignTime>True</DesignTime>
			<DependentUpon>Reference.map</DependentUpon>
			</Compile>
			<Compile Include="Code\Common.cs" />
			<Compile Include="Code\Test2.cs" />
			<Compile Include="Code\TestDAL.cs" />
			@@ -824,6 +847,11 @@
			<Compile Include="Models\JsonResult.cs" />
			<Compile Include="Models\Pensen.cs" />
			<Compile Include="Properties\AssemblyInfo.cs" />
			<Compile Include="Web References\WebS\Reference.cs">
			<AutoGen>True</AutoGen>
			<DesignTime>True</DesignTime>
			<DependentUpon>Reference.map</DependentUpon>
			</Compile>
			<Compile Include="WebServer.cs" />
			</ItemGroup>
			<ItemGroup>
			@@ -862,13 +890,25 @@
			<Folder Include="Views\Cj_CallGoodsBillMain\" />
			<Folder Include="Views\Cj_ComplementGoodsBill\" />
			<Folder Include="Views\Cj_SendGoodsBill\" />
			<Folder Include="Views\Gy_COMMONCONTACTBill\" />
			<Folder Include="Views\Gy_ConkType\" />
			<Folder Include="Views\Gy_CustLocation\" />
			<Folder Include="Views\Gy_DutyBill\" />
			<Folder Include="Views\Gy_EquipType\" />
			<Folder Include="Views\Gy_ICBomBill\" />
			<Folder Include="Views\Gy_MateMould\" />
			<Folder Include="Views\Gy_MatePriceSup\" />
			<Folder Include="Views\Gy_PackType\" />
			<Folder Include="Views\Gy_PaymentConditionListBill\" />
			<Folder Include="Views\Gy_RateType\" />
			<Folder Include="Views\Gy_RecConditionBill\" />
			<Folder Include="Views\Gy_RoutingGroup\" />
			<Folder Include="Views\Gy_SettleStyle\" />
			<Folder Include="Views\Gy_SOPBill\" />
			<Folder Include="Views\Gy_StockStatusBill\" />
			<Folder Include="Views\Gy_SupplierContactBill\" />
			<Folder Include="Views\Gy_TaxMIXMain\" />
			<Folder Include="Views\Gy_TaxRateBill\" />
			<Folder Include="Views\Gy_WorkStation\" />
			<Folder Include="Views\JIT_DayPlanPlatFormBill\" />
			<Folder Include="Views\JIT_DayPlanPlatFormImport\" />
			@@ -880,6 +920,7 @@
			<Folder Include="Views\KF_PonderationBill\" />
			<Folder Include="Views\kf_StepFoldinBill\" />
			<Folder Include="Views\Kf_StepFoldOutBill\" />
			<Folder Include="Views\Kf_StockOutRequestBill\" />
			<Folder Include="Views\Mes_OrderProcFlowAllReport\" />
			<Folder Include="Views\MoveStockBill\" />
			<Folder Include="Views\Pay_Report\" />
			@@ -897,6 +938,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>
			@@ -910,19 +953,6 @@
			<Generator>ResXFileCodeGenerator</Generator>
			<LastGenOutput>Resources.Designer.cs</LastGenOutput>
			</EmbeddedResource>
			</ItemGroup>
			<ItemGroup>
			<WebReferenceUrl Include="http://47.96.97.237/WEBS-WMS/WebService1.asmx">
			<UrlBehavior>Dynamic</UrlBehavior>
			<RelPath>Web References\WebS\</RelPath>
			<UpdateFromURL>http://47.96.97.237/WEBS-WMS/WebService1.asmx</UpdateFromURL>
			<ServiceLocationURL>
			</ServiceLocationURL>
			<CachedDynamicPropName>
			</CachedDynamicPropName>
			<CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
			<CachedSettingsPropName>WebAPI_WebS_WebService1</CachedSettingsPropName>
			</WebReferenceUrl>
			</ItemGroup>
			<ItemGroup>
			<ProjectReference Include="..\BLL\BLL.csproj">
			@@ -954,6 +984,19 @@
			<Name>SQLHelper</Name>
			</ProjectReference>
			</ItemGroup>
			<ItemGroup>
			<WebReferenceUrl Include="http://localhost/WEBS/WebService1.asmx">
			<UrlBehavior>Dynamic</UrlBehavior>
			<RelPath>Web References\WebS\</RelPath>
			<UpdateFromURL>http://localhost/WEBS/WebService1.asmx</UpdateFromURL>
			<ServiceLocationURL>
			</ServiceLocationURL>
			<CachedDynamicPropName>
			</CachedDynamicPropName>
			<CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
			<CachedSettingsPropName>WebAPI_WebS_WebService1</CachedSettingsPropName>
			</WebReferenceUrl>
			</ItemGroup>
			<PropertyGroup>
			<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
			<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>