挤出需求查询新增车间库存和仓库库存信息
Merge branch 'master' of https://github.com/druidwang/Sconit

Conflicts:
	Sconit5/branch/Shenya/src/Core.5.0.0/Service/Impl/Mrp/MrpMgrImpl.cs