#

1

2 天以前 69a3c374ca3afb770e3b9ffcbdda07ce362cbf58

#

 rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsWcsServiceImpl.java

@@ -67,7 +67,7 @@
            try {
                CommonResponse result = objectMapper.readValue(exchange.getBody(), CommonResponse.class);
                if (result.getCode() == 200) {
                    return R.ok().add(result.getData());
                    return R.ok(result.getMsg()).add(result.getData());
                } else {
                    return R.error(result.getMsg());
//                    throw new CoolException("任务执行状态上报失败！！");

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java

@@ -938,6 +938,14 @@
        if (waitPakins.isEmpty()) {
            throw new CoolException("单据不存在 ！！");
        }
        Task one = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, params.getBarcode()));
        if (!Cools.isEmpty(one)) {
            InTaskWcsReportParam inTaskWcsReportParam = new InTaskWcsReportParam();
            inTaskWcsReportParam.setTaskNo(one.getTaskCode());
            inTaskWcsReportParam.setLocNo(one.getTargLoc());
            inTaskWcsReportParam.setTaskPri(one.getSort());
            return R.ok("任务已存在直接下发！").add(inTaskWcsReportParam);
        }

        DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>().eq(DeviceSite::getSite,params.getSourceStaNo()).orderByDesc(DeviceSite::getId),false);
        if (Objects.isNull(deviceSite)) {
@@ -948,7 +956,7 @@
                .setSiteId(deviceSite.getId());
        R r = taskService.generateTasks(taskParams, 111L);
        if (r.get("msg").equals("任务生成完毕！")) {
            Task one = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, params.getBarcode()));
            one = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, params.getBarcode()));
            InTaskWcsReportParam inTaskWcsReportParam = new InTaskWcsReportParam();
            inTaskWcsReportParam.setTaskNo(one.getTaskCode());
            inTaskWcsReportParam.setLocNo(one.getTargLoc());