修改支持小品种及异型烟固定拆盘位；（Bug修复，自动拆与人工出矛盾，导至未调度出库）
Merge remote-tracking branch 'refs/remotes/thok-sw/mdj' into mdj