Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git

Conflicts:
	code/Authority/Wms/Wms.csproj
123
Signed-off-by: ITxiaoliu <495005393@qq.com>
修改货位图表按钮的显示条件
Signed-off-by: zqloon <zqloon@gmail.com>
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
合并要更改数据库（分拣线、罚没区等）库区的layer、col两个字段，不要让两个货位重合
Signed-off-by: zqloon <zqloon@gmail.com>
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git

Conflicts:
	code/Authority/Wms/Wms.csproj

Signed-off-by: zqb <940658539@qq.com>
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
修改wcs ID列的显示，卷烟尺寸界面修改
Signed-off-by: yaojianfeng <759775741@qq.com>
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
修改货位位置页面完成

Signed-off-by: yaojianfeng <759775741@qq.com>
Merge branch 'yjf/master'
下载入库单调整，下载卷烟信息调整。
车载改成播放循环音乐
Signed-off-by: loou <loou@vip.qq.com>
Merge branch 'master' of https://github.com/THOK-SW/wms_rfid.git
货位位置页面，卷烟尺寸信息页面修改完成

Signed-off-by: yaojianfeng <759775741@qq.com>
Merge branch 'yjf/master'
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
修改日结，细化日结到库区；
Merge branch 'zxl/master'
配置实时滚动出库的值。修改中软接口。
Signed-off-by: loou <loou@vip.qq.com>