~yxj/MES-WEB-API.git

			@@ -223,8 +223,6 @@
			</Reference>
			</ItemGroup>
			<ItemGroup>
			<Content Include="bin\WebAPI.dll" />
			<Content Include="bin\WebAPI.pdb" />
			<Content Include="Content\bootstrap.css" />
			<Content Include="Content\bootstrap.min.css" />
			<Content Include="Content\Site.css" />
			@@ -256,12 +254,6 @@
			<Content Include="Views\Scripts\jquery.validate.unobtrusive.js" />
			<Content Include="Views\Scripts\jquery.validate.unobtrusive.min.js" />
			<Content Include="Views\Scripts\modernizr-2.6.2.js" />
			<Content Include="Web References\WebS2\Reference.map">
			<Generator>MSDiscoCodeGenerator</Generator>
			<LastGenOutput>Reference.cs</LastGenOutput>
			</Content>
			<None Include="Web References\WebS2\WebService1.disco" />
			<None Include="Web References\WebS2\WebService1.wsdl" />
			<Content Include="Web References\WebS\ClsCLD_Customer_Model.datasource">
			<DependentUpon>Reference.map</DependentUpon>
			</Content>
			@@ -281,6 +273,9 @@
			<DependentUpon>Reference.map</DependentUpon>
			</Content>
			<Content Include="Web References\WebS\ClsGy_BadReason_Model.datasource">
			<DependentUpon>Reference.map</DependentUpon>
			</Content>
			<Content Include="Web References\WebS\ClsGy_BarCodeBill_WMS_Model.datasource">
			<DependentUpon>Reference.map</DependentUpon>
			</Content>
			<Content Include="Web References\WebS\ClsGy_BarCodeBill_WMS_Model_View.datasource">
			@@ -319,13 +314,10 @@
			<Content Include="Web References\WebS\ClsKf_ICStockBill_WMS.datasource">
			<DependentUpon>Reference.map</DependentUpon>
			</Content>
			<Content Include="Web References\WebS\ClsGy_BarCodeBill_WMS_Model.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>
			@@ -470,6 +462,7 @@
			<Compile Include="Controllers\仓存管理\条码出入库记录\Kf_ICStockInOutBillController.cs" />
			<Compile Include="Controllers\仓存管理\条码库存\KF_ICInventoryList_WMSBillController.cs" />
			<Compile Include="Controllers\仓存管理\条码生成\Gy_BarCodeBill_OutController.cs" />
			<Compile Include="Controllers\仓存管理\条码生成\Gy_SplitBarCodeController.cs" />
			<Compile Include="Controllers\仓存管理\条码生成\KF_BarCodeStatusChangeBillController.cs" />
			<Compile Include="Controllers\仓存管理\条码生成\Sc_BarCodeController.cs" />
			<Compile Include="Controllers\仓存管理\调拨盘点\Kf_MoveStockRequestBillController.cs" />
			@@ -575,6 +568,10 @@
			<Compile Include="Controllers\生产管理\报工台工序\Sc_QualityReportStepBillController.cs" />
			<Compile Include="Controllers\生产管理\生产任务单\Sc_ICMOBillController.cs" />
			<Compile Include="Controllers\生产管理\质量汇报单\Sc_QualityReportBillController.cs" />
			<Compile Include="Controllers\项目管理\业绩指标\PM_YearEmployeeMoneyBillController.cs" />
			<Compile Include="Controllers\项目管理\工作任务\PM_WorkTaskBillController.cs" />
			<Compile Include="Controllers\项目管理\工程项目\PM_ProjectBillController.cs" />
			<Compile Include="Controllers\项目管理\项目阶段\Gy_ProjectStageController.cs" />
			<Compile Include="Dapper\SqlHelper.cs" />
			<Compile Include="Dapper\SqlPools.cs" />
			<Compile Include="DbUntil\DataFormatUntil.cs" />
			@@ -667,6 +664,7 @@
			<Compile Include="Models\TechnologyParameter.cs" />
			<Compile Include="Models\TechnologyParameterUnit.cs" />
			<Compile Include="Models\TechParamByProc.cs" />
			<Compile Include="Models\WorkCenter.cs" />
			<Compile Include="Models\Xt_CheckFlowMain.cs" />
			<Compile Include="Models\Xt_CheckFlowSub.cs" />
			<Compile Include="Models\Xt_CheckItem.cs" />
			@@ -889,11 +887,6 @@
			<Compile Include="Models\JsonResult.cs" />
			<Compile Include="Models\Pensen.cs" />
			<Compile Include="Properties\AssemblyInfo.cs" />
			<Compile Include="Web References\WebS2\Reference.cs">
			<AutoGen>True</AutoGen>
			<DesignTime>True</DesignTime>
			<DependentUpon>Reference.map</DependentUpon>
			</Compile>
			<Compile Include="Web References\WebS\Reference.cs">
			<AutoGen>True</AutoGen>
			<DesignTime>True</DesignTime>
			@@ -930,6 +923,7 @@
			</ItemGroup>
			<ItemGroup>
			<Folder Include="App_Data\" />
			<Folder Include="bin\" />
			<Folder Include="obj\x86\Debug\" />
			<Folder Include="Views\Cg_PODemandPlanBill\" />
			<Folder Include="Views\Cg_PurchaseReturn\" />
			@@ -957,6 +951,7 @@
			<Folder Include="Views\Gy_RoutingGroup\" />
			<Folder Include="Views\Gy_SettleStyle\" />
			<Folder Include="Views\Gy_SOPBill\" />
			<Folder Include="Views\Gy_SplitBarCode\" />
			<Folder Include="Views\Gy_Staff\" />
			<Folder Include="Views\Gy_StdMinPickQty\" />
			<Folder Include="Views\Gy_StockPlace_\" />
			@@ -1056,27 +1051,16 @@
			</ProjectReference>
			</ItemGroup>
			<ItemGroup>
			<WebReferenceUrl Include="http://122.227.133.186:8090/WEBS/WebService1.asmx">
			<WebReferenceUrl Include="http://192.168.63.3/WEBS-WMS/WebService1.asmx">
			<UrlBehavior>Dynamic</UrlBehavior>
			<RelPath>Web References\WebS\</RelPath>
			<UpdateFromURL>http://122.227.133.186:8090/WEBS/WebService1.asmx</UpdateFromURL>
			<UpdateFromURL>http://192.168.63.3/WEBS-WMS/WebService1.asmx</UpdateFromURL>
			<ServiceLocationURL>
			</ServiceLocationURL>
			<CachedDynamicPropName>
			</CachedDynamicPropName>
			<CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
			<CachedSettingsPropName>WebAPI_WebS_WebService1</CachedSettingsPropName>
			</WebReferenceUrl>
			<WebReferenceUrl Include="http://localhost:9099/WebService1.asmx">
			<UrlBehavior>Dynamic</UrlBehavior>
			<RelPath>Web References\WebS2\</RelPath>
			<UpdateFromURL>http://localhost:9099/WebService1.asmx</UpdateFromURL>
			<ServiceLocationURL>
			</ServiceLocationURL>
			<CachedDynamicPropName>
			</CachedDynamicPropName>
			<CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
			<CachedSettingsPropName>WebAPI_WebS2_WebService1</CachedSettingsPropName>
			</WebReferenceUrl>
			</ItemGroup>
			<PropertyGroup>