运行没问题初版

zwl

2026-01-15 bfaade97ef4858616d30ebafc51a1c2a7b1bf84a

运行没问题初版

 src/main/java/com/zy/asrs/entity/TransParent.java

@@ -35,5 +35,6 @@

    //请求类型
    private String method;
    private String startStation;

}

 src/main/java/com/zy/asrs/enums/RcsRetMethodEnum.java

@@ -10,6 +10,7 @@
    APPLY_IN_OFF_STATION("applyInOffStation", "取货离站请求"),
    APPLY_OFF_STATION("applyOutOffStation", "放货离站请求"),
    ARRIVE_ON_STATION("arriveOnStation", "到站完成"),
    ARRIVE_PUT_STATION("arrivePutStation", "放货到站完成"),
    ARRIVE_OFF_STATION("arriveOffStation", "离站完成"),



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

@@ -134,6 +134,7 @@
                            transParent.setTaskno(task.getTaskNo() + "-" + (task.getCtnType() - 1));
                            transParent.setTaskname(task.getTaskNo() + "-" + (task.getCtnType() - 1));
                            transParent.setStationId(task.getStaNo());
                            transParent.setStartStation(task.getSourceStaNo());
                            transParent.setAgvCode("2");//连接器库
                            //08-1是空托盘转序任务
                            //08-2是物料转序任务
@@ -223,6 +224,7 @@
                            transParent.setTaskno(task.getTaskNo() + "-" + (task.getCtnType() - 1));
                            transParent.setTaskname(task.getTaskNo() + "-" + (task.getCtnType() - 1));
                            transParent.setStationId(task.getStaNo());
                            transParent.setStartStation(task.getSourceStaNo());
                            transParent.setAgvCode("2");//连接器库
                            //08-1是空托盘转序任务
                            //08-2是物料转序任务
@@ -298,6 +300,7 @@
                            transParent.setTaskno(task.getTaskNo() + "-" + (task.getCtnType() - 1));
                            transParent.setTaskname(task.getTaskNo() + "-" + (task.getCtnType() - 1));
                            transParent.setStationId(task.getStaNo());
                            transParent.setStartStation(task.getSourceStaNo());
                            transParent.setAgvCode("2");//连接器库
                            //08-1是空托盘转序任务
                            //08-2是物料转序任务
@@ -363,6 +366,7 @@
                            transParent.setTaskno(task.getTaskNo() + "-" + (task.getCtnType() - 1));
                            transParent.setTaskname(task.getTaskNo() + "-" + (task.getCtnType() - 1));
                            transParent.setStationId(task.getStaNo());
                            transParent.setStartStation(task.getSourceStaNo());
                            transParent.setAgvCode("2");//连接器库
                            //08-1是空托盘转序任务
                            //08-2是物料转序任务
@@ -378,10 +382,6 @@
                            //取货离开站点
                            int i = AGVDepartureCompleted(transParent);
                            if (i == 1) {
                                // 更新任务状态等内部逻辑
                                task.setWrkSts(304L);   // 301 任务下发、302 任务执行、303 任务中断、304 任务结束
                                task.setModiTime(new Date());
                                agvTaskService.updateById(task);
                                rcsReturn.setCode("SUCCESS");
                                rcsReturn.setMessage("");
                                JSONObject data = new JSONObject();
@@ -433,6 +433,7 @@
                            transParent.setTaskno(task.getTaskNo() + "-" + (task.getCtnType() - 1));
                            transParent.setTaskname(task.getTaskNo() + "-" + (task.getCtnType() - 1));
                            transParent.setStationId(task.getStaNo());
                            transParent.setStartStation(task.getSourceStaNo());
                            transParent.setAgvCode("2");//连接器库
                            //08-1是空托盘转序任务
                            //08-2是物料转序任务
@@ -498,6 +499,7 @@
                            transParent.setTaskno(task.getTaskNo() + "-" + (task.getCtnType() - 1));
                            transParent.setTaskname(task.getTaskNo() + "-" + (task.getCtnType() - 1));
                            transParent.setStationId(task.getStaNo());
                            transParent.setStartStation(task.getSourceStaNo());
                            transParent.setAgvCode("2");//连接器库
                            //08-1是空托盘转序任务
                            //08-2是物料转序任务
@@ -543,6 +545,52 @@
                            transParent.setTaskno(task.getTaskNo() + "-" + (task.getCtnType() - 1));
                            transParent.setTaskname(task.getTaskNo() + "-" + (task.getCtnType() - 1));
                            transParent.setStationId(task.getStaNo());
                            transParent.setStartStation(task.getSourceStaNo());
                            transParent.setAgvCode("2");//连接器库
                            //08-1是空托盘转序任务
                            //08-2是物料转序任务
                            if (task.getTaskType().equals("ZX-AGV-08-1")) {
                                transParent.setTransType("08-1");
                            } else if (task.getTaskType().equals("ZX-AGV-08-2")) {
                                transParent.setTransType("08-2");
                            } else if (task.getTaskType().equals("PP-AGV")) {
                                transParent.setTransType("10");
                            } else if (task.getTaskType().equals("ZP-AGV")) {
                                transParent.setTransType("11");
                            }
                            int i = AGVArrivalCompletedFit(transParent);
                            if (i == 1) {
                                rcsReturn.setCode("SUCCESS");
                                rcsReturn.setMessage("");
                                JSONObject data = new JSONObject();
                                data.put("robotTaskCode", robotTaskCode);
                                rcsReturn.setData(data);
                            } else {
                                // 返回RCS
                                rcsReturn.setCode("Err_Internal");
                                rcsReturn.setMessage("");
                                JSONObject data = new JSONObject();
                                data.put("robotTaskCode", robotTaskCode);
                                rcsReturn.setData(data);
                            }
                        }
                        break;
                    }
                    //到站完成
                    case ARRIVE_PUT_STATION: {
                        if (task.getStaNo().equals("401") || task.getStaNo().equals("402") || task.getStaNo().equals("307")) {
                            // 返回RCS
                            rcsReturn.setCode("SUCCESS");
                            rcsReturn.setMessage("");
                            JSONObject data = new JSONObject();
                            data.put("robotTaskCode", robotTaskCode);
                            rcsReturn.setData(data);
                        } else {
                            TransParent transParent = new TransParent();
                            transParent.setTaskno(task.getTaskNo() + "-" + (task.getCtnType() - 1));
                            transParent.setTaskname(task.getTaskNo() + "-" + (task.getCtnType() - 1));
                            transParent.setStationId(task.getStaNo());
                            transParent.setStartStation(task.getSourceStaNo());
                            transParent.setAgvCode("2");//连接器库
                            //08-1是空托盘转序任务
                            //08-2是物料转序任务