更新进度（备货调拨）
Merge branch 'master' of github.com:antme/pms

Conflicts:
	doc/闇€姹?杞欢鍕樿/alpha鐗堟祴璇?0816.doc
Merge branch 'master' of github.com:antme/pms