lsh#

1

昨天 0549921b6ec1197a65c096a3741ff92001f411cd

lsh#

 rsf-server/src/main/java/com/vincent/rsf/server/api/entity/enums/CallBackEvent.java

@@ -11,6 +11,7 @@
    CALL_BACK_EVENT_START("START", "取箱完成"),
    CALL_BACK_EVENT_OBIT("OTBIN", "搬运中"),
    CALL_BACK_EVENT_END("END", "放箱完成"),
    CALL_BACK_EVENT_TRANSFER("TRANSFER", "中转"),
    ;

    CallBackEvent( String event,  String desc) {

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

@@ -17,6 +17,9 @@
    @ApiModelProperty("标记类型{HKRCS: 海康, WCS: 立库WCS, OTHER: 其它}")
    private String sign;

    @ApiModelProperty("标记类型{0:站到库  1：库到站 2：站到站 3：库到库}")
    private String signType = "0";

    @ApiModelProperty("批次")
    private String batch;


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

@@ -539,6 +539,20 @@
                    throw new CoolException("任务状态修改失败！！");
                }
            }
        } else if (params.getEventType().equals(CallBackEvent.CALL_BACK_EVENT_TRANSFER.event)) {
            if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)
                    || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type)
                    || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type)
                    || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_IN.type)
                    || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_IN.type)
                    || task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
                if (!taskService.update(new LambdaUpdateWrapper<Task>()
                        .lt(Task::getTaskStatus, TaskStsType.WCS_EXECUTE_IN.id)
                        .eq(Task::getTaskCode, task.getTaskCode())
                        .set(Task::getTaskStatus, TaskStsType.WCS_EXECUTE_IN.id))) {
                    throw new CoolException("任务状态修改失败！！");
                }
            }
        }
        log.info(JSONObject.toJSONString(params));
        return R.ok(JSONObject.toJSONString(params));

 rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskStsType.java

@@ -3,12 +3,12 @@
public enum TaskStsType {

    //任务状态

    GENERATE_IN("1", "创建入库任务"),

    WCS_EXECUTE_IN("2", "RCS任务已下发"),

    WCS_CONTAINER_RECEIVE("3", "RCS容器到达"),

    WCS_CONVEYOR_START("4", "RCS容器流动任务已下发"),

    WCS_TOTE_LOAD("5", "RCS取箱完成"),

    WCS_TOTE_UNLOAD("6", "RCS放箱完成"),

    WCS_PUTAWAY_SUCESS("7", "RCS任务完成"),

    WCS_EXECUTE_IN("2", "WCS、RCS任务已下发"),

    WCS_CONTAINER_RECEIVE("3", "WCS、RCS容器到达"),

    WCS_CONVEYOR_START("4", "WCS、RCS容器流动任务已下发"),

    WCS_TOTE_LOAD("5", "WCS、RCS取箱完成"),

    WCS_TOTE_UNLOAD("6", "WCS、RCS放箱完成"),

    WCS_PUTAWAY_SUCESS("7", "WCS、RCS任务完成"),



//    WCS_PUTAWAY_FAILED(11L, "任务失败"),

//

@@ -24,17 +24,17 @@


    GENERATE_OUT("101", "创建出库任务"),



    WCS_EXECUTE_OUT("102", "RCS出库任务已下发"),

    WCS_EXECUTE_OUT("102", "WCS、RCS出库任务已下发"),



    WCS_EXECUTE_OUT_TOTE_LOAD("103", "RCS取箱完成"),

    WCS_EXECUTE_OUT_TOTE_LOAD("103", "WCS、RCS取箱完成"),



    WCS_EXECUTE_OUT_TOTE_UNLOAD("104", "RCS放箱完成"),

    WCS_EXECUTE_OUT_TOTE_UNLOAD("104", "WCS、RCS放箱完成"),



    WCS_EXECUTE_OUT_TASK_DONE("105", "RCS任务完成"),

    WCS_EXECUTE_OUT_TASK_DONE("105", "WCS、RCS任务完成"),



    WCS_EXECUTE_OUT_ARRIVED("106", "RCS容器已到达"),

    WCS_EXECUTE_OUT_ARRIVED("106", "WCS、RCS容器已到达"),



    WCS_EXECUTE_OUT_CONVEYOR("107", "RCS容器流动任务已下发"),

    WCS_EXECUTE_OUT_CONVEYOR("107", "WCS、RCS容器流动任务已下发"),



    AWAIT("196","等待确认"),




 rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java

@@ -411,6 +411,14 @@
                if (stationS.getType().equals(StationTypeEnum.STATION_TYPE_MUTI.type)) {
                    taskParams.setSign(LocStsWcsOrOtherType.LOC_STS_TYPE_WCS.type);
                } else {
                    Loc locEnd = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getTargLoc()));
                    if (Objects.isNull(locEnd)) {
                        throw new CoolException("源库位不存在！！");
                    }
                    String type = LocStsWcsOrOtherType.getApiType(locEnd.getAreaId$());
                    if (type.equals(LocStsWcsOrOtherType.LOC_STS_TYPE_WCS.type)) {
                        taskParams.setSignType("2");
                    }
                    taskParams.setSign(LocStsWcsOrOtherType.LOC_STS_TYPE_RCS.type);
                }
            }