wms 修改分拣卷烟库存小于6件就实时提醒出库。
wes 修改点其它按钮停止播放音乐
Signed-off-by: loou <loou@vip.qq.com>
权限系统 打印功能
Signed-off-by: zqb <940658539@qq.com>
分拣下限添加字段sort_type
Signed-off-by: loou <loou@vip.qq.com>
关于立式机大于20件去整托盘的和通道机取整托盘调度修改
Signed-off-by: loou <loou@vip.qq.com>
分拣下限页面添加修改
Signed-off-by: loou <loou@vip.qq.com>
wms 修改综合查询移库打印问题，修改移库打印两条线互移问题
Signed-off-by: loou <loou@vip.qq.com>
Merge branch 'master' of https://github.com/THOK-SW/wms_rfid.git

Conflicts:
	code/Authority/THOK.Wms.SignalR/Dispatch/Service/SortWorkDispatchService.cs
Merge branch 'zqb/master'

Conflicts:
	code/Authority/Wms/Wms.csproj
Merge branch 'zxl/master'
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>