#

zjj

2024-03-29 05aa23e4bce89c2028985e0c98b6ef82e91fc506

#

 src/main/java/com/zy/asrs/controller/OpenController.java

@@ -80,8 +80,16 @@
        if (Cools.isEmpty(param.getStatus())){
            return R.error("完成标记[status]不能为空");
        }
        openService.getAgvTaskOver(param);
        return R.ok();
        R agvTaskOver = openService.getAgvTaskOver(param);
        apiLogService.save("AGV请求任务完成"
                ,request.getRemoteAddr()+request.getRequestURI()
                ,appkey
                ,request.getRemoteAddr()
                ,JSON.toJSONString(param)
                ,agvTaskOver.toString()
                ,true
        );
        return agvTaskOver;
    }

    //创建任务

 src/main/java/com/zy/asrs/service/OpenService.java

@@ -15,5 +15,5 @@

    R AgvToWCSToWms(WMSAndAGVInterfaceParam param) throws IOException;

    void getAgvTaskOver(TaskOverParam param);
    R getAgvTaskOver(TaskOverParam param);
}

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

@@ -213,13 +213,13 @@
    }

    @Override
    public void getAgvTaskOver(TaskOverParam param) {
    public R getAgvTaskOver(TaskOverParam param) {
        // 根据输送线plc遍历
        for (DevpSlave devp : slaveProperties.getDevp()) {
            StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
                    .eq("stn_desc", param.getWharfCode()));
            if (Cools.isEmpty(staDesc)){
                throw new RuntimeException("未查询到站点信息");
                throw new CoolException("未查询到站点信息");
            }
            // 获取入库站信息
            DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
@@ -237,10 +237,13 @@
                    staProtocol.setStaNo((short)0);
                    boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol));
                    if (result) {

                        return R.ok("取货完成");
                    } else {
                        throw new RuntimeException("agv返回完成后，命令下发失败");
                        throw new CoolException("agv返回完成后，命令下发失败");
                    }
                }else {
                    return R.error("取货站点状态有误,有物信号："+staProtocol.isLoading()
                            +",车辆信号："+staProtocol.isCar()+",工作号："+staProtocol.getWorkNo());
                }
            }else {
                for (DevpSlave.Sta inSta : devp.getInSta()) {
@@ -252,16 +255,20 @@
                            staProtocol.setStaNo(inSta.getStaNo().shortValue());
                            boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol));
                            if (result) {

                                return R.ok("放货完成");
                            } else {
                                throw new RuntimeException("agv返回完成后，命令下发失败");
                                throw new CoolException("agv返回完成后，命令下发失败");
                            }
                        }else {
                            return R.error("放货站点状态有误,有物信号："+staProtocol.isLoading()
                                    +",车辆信号："+staProtocol.isCar()+",工作号："+staProtocol.getWorkNo());
                        }

                    }
                }
            }
        }
        return R.ok();

    }