~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,11 +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" />
			<Content Include="Web References\WebS\ClsCLD_Customer_Model.datasource">
			<DependentUpon>Reference.map</DependentUpon>
			</Content>
			@@ -280,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">
			@@ -318,11 +314,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>
			<None Include="Web References\WebS2\WebService1.wsdl" />
			</Content>
			<None Include="Web References\WebS\WebService1.disco" />
			<Content Include="Web.config">
			<SubType>Designer</SubType>
			@@ -402,8 +397,13 @@
			<Compile Include="Controllers\CJGL\Cj_StationOutBillController.cs" />
			<Compile Include="Controllers\CJGL\Cj_StationInBillController.cs" />
			<Compile Include="Controllers\CJGL\Cj_StationEntrustOutBillController.cs" />
			<Compile Include="Controllers\CJGL\Sc_ProcExchRecordBackBillController.cs" />
			<Compile Include="Controllers\CJGL\Sc_ProcessSendWorkController.cs" />
			<Compile Include="Controllers\CJGL\Sc_ProcExchSendWorkBillController.cs" />
			<Compile Include="Controllers\CJGL\Sc_ProcExchWorkBackBillController.cs" />
			<Compile Include="Controllers\CJGL\Sc_WorkBillAutoSortBillMainController.cs" />
			<Compile Include="Controllers\Gy_MateMouldController.cs" />
			<Compile Include="Controllers\Gy_StdMinPickQtyController.cs" />
			<Compile Include="Controllers\MJGL\Sc_MouldDotCheckRuleBillController.cs" />
			<Compile Include="Controllers\MJGL\Sc_MouldLifeUseBillController.cs" />
			<Compile Include="Controllers\MJGL\Sc_MouldScrapRequestBillController.cs" />
			@@ -462,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" />
			@@ -475,6 +476,7 @@
			<Compile Include="Controllers\基础资料\基础资料\Gy_DutyBillController.cs" />
			<Compile Include="Controllers\基础资料\基础资料\Gy_EquipStatusController.cs" />
			<Compile Include="Controllers\基础资料\基础资料\Gy_MatePriceSupController.cs" />
			<Compile Include="Controllers\基础资料\基础资料\Gy_MaterTypeBillController.cs" />
			<Compile Include="Controllers\基础资料\基础资料\Gy_MouldStatusController.cs" />
			<Compile Include="Controllers\基础资料\基础资料\Gy_OperatorController.cs" />
			<Compile Include="Controllers\基础资料\基础资料\Gy_PaymentConditionListBillController.cs" />
			@@ -616,11 +618,13 @@
			<Compile Include="InvokeHelper.cs" />
			<Compile Include="Log.cs" />
			<Compile Include="Models\ClsGy_MateMould.cs" />
			<Compile Include="Models\ClsGy_SupMaterial.cs" />
			<Compile Include="Models\ClsSc_AssemblyBillMain.cs" />
			<Compile Include="Models\ClsSc_AssemblyBillSub.cs" />
			<Compile Include="Models\Employee.cs" />
			<Compile Include="Models\Gy_UserCustomer.cs" />
			<Compile Include="Models\Gy_UserMater.cs" />
			<Compile Include="Models\Gy_UserProcess.cs" />
			<Compile Include="Models\Gy_UserUser.cs" />
			<Compile Include="Models\JIT_Cg_PODemandPlanBillMain.cs" />
			<Compile Include="Models\JIT_Cg_PODemandPlanBillSub.cs" />
			@@ -878,11 +882,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>
			@@ -919,6 +918,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\" />
			@@ -936,6 +936,7 @@
			<Folder Include="Views\Gy_ICBomBill\" />
			<Folder Include="Views\Gy_MateMould\" />
			<Folder Include="Views\Gy_MatePriceSup\" />
			<Folder Include="Views\Gy_MaterTypeBill\" />
			<Folder Include="Views\Gy_MouldStatus\" />
			<Folder Include="Views\Gy_Operator\" />
			<Folder Include="Views\Gy_PackType\" />
			@@ -945,7 +946,9 @@
			<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_\" />
			<Folder Include="Views\Gy_StockStatusBill\" />
			<Folder Include="Views\Gy_SupplierContactBill\" />
			@@ -988,6 +991,10 @@
			<Folder Include="Views\Sc_MouldRepairSendWorkBill\" />
			<Folder Include="Views\Sc_MouldScrapRequestBill\" />
			<Folder Include="Views\Sc_MouldStatusChangeBill\" />
			<Folder Include="Views\Sc_ProcessExchangeIssueBill\" />
			<Folder Include="Views\Sc_ProcessSendWork\" />
			<Folder Include="Views\Sc_ProcExchRecordBackBill\" />
			<Folder Include="Views\Sc_ProcExchSendWorkBill\" />
			<Folder Include="Views\Sc_WorkBillAutoSortBillMain\" />
			<Folder Include="Views\Sc_WorkBillSortBill\" />
			<Folder Include="Views\Sc_WorkDemandPlanBill\" />
			@@ -1039,27 +1046,16 @@
			</ProjectReference>
			</ItemGroup>
			<ItemGroup>
			<WebReferenceUrl Include="http://47.96.97.237/WEBS-WMS/WebService1.asmx">
			<WebReferenceUrl Include="http://192.168.63.3/WEBS-WMS/WebService1.asmx">
			<UrlBehavior>Dynamic</UrlBehavior>
			<RelPath>Web References\WebS\</RelPath>
			<UpdateFromURL>http://47.96.97.237/WEBS-WMS/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>