lsh#

1

16 小时以前 29de5e9bf0fcd2771836f3135214e9de9e7f5204

lsh#

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/WcsController.java

@@ -143,6 +143,9 @@
    @OperationLog("WCS任务上报通知")
    @PostMapping("/task/report")
    public R wcsTaskReport(@RequestBody TaskReportParam params) {
        if (params.getType() != 0){
            return wcsService.wcsTaskReport2(params);
        }
        return wcsService.wcsTaskReport(params);
    }


 rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/TaskReportParam.java

@@ -37,4 +37,7 @@
    @ApiModelProperty("消息数据")
    private String data;

    @ApiModelProperty("类别")
    private Integer type = 0;

}

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

@@ -19,6 +19,7 @@
    R pubWcsTask(WcsTaskParams params);
    R wcsCreateInTask(CreateInTaskParam params);
    R wcsTaskReport(TaskReportParam params);
    R wcsTaskReport2(TaskReportParam params);
    R wcsReassignLoc(ReassignLocParam params);
    R wcsChangeLoc(ChangeLocParam params);
}

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

@@ -1007,6 +1007,40 @@
    }

    /**
     * WCS任务上报通知
     *
     * @return
     */
    @Override
    public R wcsTaskReport2(TaskReportParam params) {
        if (Objects.isNull(params)) {
            return R.error("参数不能为空！！");
        }
        Task one = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getTaskCode, params.getSuperTaskNo()));
        if (Cools.isEmpty(one)) {
            return R.error(params.getSuperTaskNo()+"任务号==>未查询到相关任务！！！");
        }
        if (params.getMsgType().equals(WcsMsgTypeEvent.TASK_COMPLETE.event)){
            if (!Cools.isEmpty(one)) {
                one.setTaskStatus(TaskStsType.GENERATE_IN.id);
                one.setOrgSite(one.getTargSite());
                if (!taskService.updateById(one)) {
//                    throw new CoolException("完成任务失败");
                    return R.error("完成任务失败").add(one);
                }
                return R.ok("任务完成成功").add(one);
            }
        } else if (params.getMsgType().equals(WcsMsgTypeEvent.TASK_CANCEL.event)){
//            if (!Cools.isEmpty(one)) {
//                one.setTaskStatus(one.getTaskType() < 100 ? TaskStsType.COMPLETE_IN.id : TaskStsType.AWAIT.id);
//                return R.ok("！").add(one);
//            }
            return R.error("暂不允许取消");
        }
        return R.error("数据异常");
    }

    /**
     * WCS申请任务重新分配入库
     *
     * @return

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java

@@ -624,6 +624,11 @@
            if (StringUtils.isBlank(ruleCode)) {
                throw new CoolException("编码错误：请确认编码「SYS_TASK_CODE」是否已生成!!");
            }

            String staNoEnd = basStation.getStationName();
            if (basStation.getIsWcs()!=0){
                staNoEnd = "B102";
            }
            Task task = new Task();
            task.setTaskCode(ruleCode)
                    .setTaskStatus(TaskStsType.WCS_EXECUTE_IN.id)
@@ -632,7 +637,7 @@
                    .setTargLoc(targetLoc)
                    .setBarcode(pakin.getBarcode())
                    .setOrgSite(basStation.getStationName())
                    .setTargSite(basStation.getStationName())
                    .setTargSite(staNoEnd)
                    .setCreateBy(loginUserId)
                    .setUpdateBy(loginUserId);