#

zjj

3 天以前 c904f735e0b8a488ef56744c08f8e10258639bce

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

@@ -162,7 +162,7 @@

        JSONObject jsonObject = JSON.parseObject(response);

        apiLogService.save("wms请求入库码头接口"
        apiLogService.save("请求入库码头接口"
                ,wmsUrl+"wcsManager/wcsInterface/inboundTaskApply"
                ,null
                ,"127.0.0.1"
@@ -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();

    }

@@ -289,7 +296,7 @@
                    staProtocol = staProtocol.clone();
                }
                Short workNo = staProtocol.getWorkNo();
                if (workNo == 0 && !staProtocol.isLoading()){
                if (workNo == 0 && !staProtocol.isLoading() && staProtocol.isAutoing()){
                    if (Cools.isEmpty( map.get(inSta.getStaNo()))){
                        continue;
                    }
@@ -335,10 +342,20 @@
                    staProtocol = staProtocol.clone();
                }
                Short workNo = staProtocol.getWorkNo();
                if (workNo == 0 && !staProtocol.isLoading()){
                if (workNo == 0 && !staProtocol.isLoading() && staProtocol.isAutoing()){
                    if (Cools.isEmpty( map.get(inSta.getStaNo()))){
                        continue;
                    }
                    BasCrnp crnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", map.get(inSta.getStaNo())));
                    if (Cools.isEmpty(crnp)){
                        continue;
                    }
                    if (crnp.getInEnable().equals("N")){
                        continue;
                    }
                    if (crnp.getCrnSts()!=3){
                        continue;
                    }
                    list.add( map.get(inSta.getStaNo()));
                }
            }