订单修改。ebay库存修改
Merge remote-tracking branch 'kewei/ttt' into jmyd2

Conflicts:
	KeWeiOMS.Web/KeWeiOMS.Web.csproj
	KeWeiOMS.Web/Web.config
	KeWeiOMS.v11.suo
打印修改。
Merge remote-tracking branch 'kewei/ttt' into jmyd2

Conflicts:
	KeWeiOMS.Web/Common/OrderHelper.cs
	KeWeiOMS.Web/Controllers/HomeController.cs
	KeWeiOMS.Web/Controllers/OrderController.cs
	KeWeiOMS.Web/Controllers/PlanDaoController.cs
	KeWeiOMS.Web/Controllers/ProductController.cs
	KeWeiOMS.Web/Controllers/ProductController.cs.orig
	KeWeiOMS.Web/KeWeiOMS.Web.csproj.orig
	KeWeiOMS.Web/Web.config
	KeWeiOMS.v11.suo
Merge remote-tracking branch 'KeWeiOMS/jmyd2' into ttt

Conflicts:
	KeWeiOMS.Web/Controllers/OrderController.cs
	KeWeiOMS.v11.suo