123
Signed-off-by: ITxiaoliu <495005393@qq.com>
Merge branch 'master' of git://github.com/THOK-SW/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 'master' of git://github.com/THOK-SW/wms_rfid.git

Conflicts:
	code/Authority/Wms/Wms.csproj

Signed-off-by: ITxiaoliu <495005393@qq.com>
线路分配-作业调度增加已调度的作业数据查询，分拣调度增加了已调度的作业数据查询，
下限设置显示调整，调整可以在下线设置界面修改取整、或不取整
Signed-off-by: ITxiaoliu <495005393@qq.com>
Merge branch 'lgy/master'
把立式机大于20件的取消掉
Signed-off-by: loou <loou@vip.qq.com>
Merge branch 'zxl/master'