Signed-off-by: Dong-Yang <772369620@qq.com>
作业调度对非正常分拣线进行功能完善
修改任务完成时生成重复的移回及叠空托盘任务。
增加补货计划信息表数据生成
Merge remote-tracking branch 'JJ/yzyc' into yzyc
和JJ解决冲突
Conflicts:
	code/Authority/THOK.SMS.Bll/THOK.SMS.Bll.csproj
Merge remote-tracking branch 'ZZB/master'
分拣烟道信息表增加补货缓存位置字段，线路调度编辑功能增加
生成补货计划方法修改
分拣补货查询
分拣补货查询
Merge remote-tracking branch 'yuedong/yzyc' into yzyc

Conflicts:
	code/Authority/THOK.SMS.Bll/THOK.SMS.Bll.csproj
	code/Authority/THOK.Wms.Repository/Migrations/Configuration.cs
	code/Authority/THOK.Wms.Repository/THOK.Wms.Repository.csproj
	code/Authority/Wms/Web.config
	code/Authority/Wms/Wms.csproj
汉字编码
汉字编码
Merge remote-tracking branch 'wms_rfid_mdj_ljj/yzyc' into yzyc
Merge remote-tracking branch 'wms_rfid_mdj_zwh/master' into yzyc
Merge remote-tracking branch 'wms_rfid_mdj_zys/mdjyc' into yzyc