pda相关功能开发完善

pang.jiabao

4 天以前 4aebedd582c7b1beb23df39829c341b40343e2ce

 src/main/java/com/zy/asrs/service/impl/MesServiceImpl.java

@@ -983,7 +983,7 @@
                        transTask.setAgvFactory(1);
                        JSONObject sendAgvTask = submitTask(transTask);
                        if (!"1".equals(sendAgvTask.getString("Success"))) {
                            log.error("出库下发agv运输任务失败", JSONObject.toJSONString(transTask));
                            log.error("出库下发agv运输任务失败:{}", JSONObject.toJSONString(transTask));
                        }
                    }
                } else {
@@ -1073,7 +1073,6 @@

    /**
     * 9.1下发运输任务
     * TODO:其他库的任务全部转到滑块库统一调度
     *
     * @param transTask
     * @return
@@ -1123,12 +1122,6 @@
        // 转发给海康或华晓RCS
        RcsReturn rcsReturn = rcsService.submitTask(rcsTaskSubmit, transTask.getAgvFactory());
        if (rcsReturn.getCode().equals("SUCCESS")) {
            if (Cools.isEmpty(transTask.getTaskno())) {
                JSONObject data = rcsReturn.getData();
                String robotTaskCode = data.getString("robotTaskCode");
                transTask.setTaskno(robotTaskCode);
                result.put("taskno", transTask.getTaskno());
            }
            int workNo = commonService.getWorkNo(WorkNoType.OTHER.type);
            Date now = new Date();
            Task task = new Task();
@@ -1160,7 +1153,7 @@
            taskDetl.setSpecs(mat.getSpecs());
            taskDetl.setOrderNo(transTask.getOrderNo());
            taskDetl.setZpallet(transTask.getTuoPanId());
            taskDetl.setMemo(barCodeListToStr(transTask.getItemBarcode()));
            taskDetl.setMemo(Cools.isEmpty(transTask.getItemBarcode()) ? "":barCodeListToStr(transTask.getItemBarcode()));
            taskDetl.setModiUser(defaultUserId);
            taskDetl.setModiTime(now);
            taskDetl.setAppeUser(defaultUserId);