Merge branch 'master' of https://github.com/zqb971/wms_rfid.git
数据库有更新
Signed-off-by: git1207 <git1302@163.com>
插入和修改 测试完毕（LINQ TO XML）
Signed-off-by: git1207 <git1302@163.com>
手动分配排除不可用的货位，
车载串口读取修改
Signed-off-by: loou <loou@vip.qq.com>
Merge branch 'master' of git://github.com/git1207/wms_rfid.git

Conflicts:
	code/Authority/Wms/Service/WMSService.asmx.cs
Merge remote-tracking branch 'refs/remotes/zxl/master'