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

Conflicts:
	code/Authority/Wms/Wms.csproj
修改货位图表按钮的显示条件
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
Merge branch 'master' of https://github.com/THOK-SW/wms_rfid.git
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
配置实时滚动出库的值。修改中软接口。
Signed-off-by: loou <loou@vip.qq.com>
Merge branch 'lgy/master'
把立式机大于20件的取消掉
Signed-off-by: loou <loou@vip.qq.com>
Merge branch 'zxl/master'
车载图形显示
Signed-off-by: loou <loou@vip.qq.com>
Merge branch 'master' of git://github.com/ITxiaolang/wms_rfid.git
Merge branch 'master' of https://github.com/THOK-SW/wms_rfid.git
下限调整，调度修改。
Signed-off-by: loou <loou@vip.qq.com>
Merge branch 'zxl/master'
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
完成实现WCS服务端，未测试；