Merge branch 'refs/heads/rcs_master' into ctu_conveyor

zhang

昨天 af5081bc0d0668d526a204076557a171097ddb8d

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/wms/TaskReportService.java

@@ -102,7 +102,7 @@
        // params
        TaskUplinkParam param = new TaskUplinkParam();
        if (null != task.getBusId()) {
            Bus bus = busService.getById(task);
            Bus bus = busService.getById(task.getBusId());
            param.setBatchNo(bus.getBusNo());
        }
        param.setTaskNo(task.getSeqNum());