Merge branch 'master' of https://github.com/THOK-SW/wms_rfid.git
出库和调度改动。
Signed-off-by: loou <loou@vip.qq.com>
连接
Signed-off-by: loou <loou@vip.qq.com>
Merge branch 'master' of https://github.com/THOK-SW/wms_rfid.git
Merge branch 'master' of git://github.com/mar780/wms_rfid.git
当前库存查询增加奇偶行背景色
Signed-off-by: wu <981145751@qq.com>
Merge branch 'master' of git://github.com/loou/wms_rfid.git
文档修改。请注意查看。不对的地方要提出来
Signed-off-by: loou <loou@vip.qq.com>
修改数据库版本控制错误；
Merge remote-tracking branch 'zxl/master'

Conflicts:
	code/Authority/Wms/Web.config
Merge remote-tracking branch 'wyl/master'
Merge remote-tracking branch 'zql/master'

Conflicts:
	code/Authority/Wms/Web.config
入库细单汇总BUG修复
Signed-off-by: wu <981145751@qq.com>
PDA
Signed-off-by: loou <loou@vip.qq.com>
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
Merge remote-tracking branch 'zxl/master'
Merge remote-tracking branch 'wyl/master'
pda调试安装文档
Signed-off-by: loou <loou@vip.qq.com>
Merge remote-tracking branch 'zql/master'

Conflicts:
	code/Authority/THOK.Wms.SignalR/Allot/Service/OutBillAllotService.cs
Merge branch 'master' of git://github.com/loou/wms_rfid.git