盘点作业
Merge branch 'master' of git@github.com:zyylonghai/HNXC_WMS.git
抽检单
Merge branch 'master' of git@github.com:XMTHOK/HNXC_WMS.git
Merge branch 'master' of git@github.com:zyylonghai/HNXC_WMS.git
Merge branch 'master' of git@github.com:shjstudy/HNXC_WMS.git
抽检单
Merge branch 'master' of git@github.com:XMTHOK/HNXC_WMS.git

Conflicts:
	WMS/Controllers/Wms/WMS/StockInWorkController.cs
移库单
紧急补料单
货位查询
修改货位查询
修改货位查询2
货位查询3