单位系列-页面改动
Signed-off-by: zqb <940658539@qq.com>
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
Merge remote-tracking branch 'refs/remotes/zqb/master'
wes修改多单查询。
wms修改多单分组查询
Signed-off-by: loou <loou@vip.qq.com>
Merge remote-tracking branch 'refs/remotes/zxl/master'
实现合并单元格；基本实现，效果待调整；
车载订单合并
Signed-off-by: loou <loou@vip.qq.com>
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
合并单元格修改完成；效果较好，由现场测试验证；
修改完成，按分拣线烟道顺序打印分拣备货区库区信息；
wms入库和移库显示主表添加总数量
wes部分代码删除和修改
Signed-off-by: loou <loou@vip.qq.com>
Merge branch 'master' of https://github.com/THOK-SW/wms_rfid.git
合并单元格的效果调整理，及组盘错误修改，添加单据号显示；
Merge branch 'master' of https://github.com/THOK-SW/wms_rfid.git
修改完成，按分拣线烟道顺序打印分拣备货区库区信息；修改显示数据异常，当无库存时下限设置不显示；
修改完成，按分拣线烟道顺序打印分拣备货区库区信息；修改排序；
Merge branch 'master' of https://github.com/THOK-SW/wms_rfid.git
添加合并单元格的条件；