#

Junjie

2023-12-04 0263267cd527f57f991b565bc3015fd9345f3f01

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

@@ -1422,7 +1422,7 @@
                if(!("NG".endsWith(barcode) || "NoRead".equals(barcode) || "empty".equals(barcode))) {
                    //存在条码值，判断是否和当前工作档一致
                    if (!barcode.equals(wrkMast.getBarcode())) {
                        News.info("{}任务，条码器{}值{}与工作档条码值不一致，系统跳过执行", wrkMast.getWrkNo(), sourceBasDevp.getDevNo(), barcodeId, barcode);
                        News.info("{}任务,{}站点，条码器{}值{}与工作档条码值{}不一致，系统跳过执行", wrkMast.getWrkNo(), sourceBasDevp.getDevNo(), barcodeId, barcode,wrkMast.getBarcode());
                        return false;//站点不可入
                    }
                }
@@ -2489,7 +2489,9 @@
                        RobotUtils.sendTask(staProtocol303.getWorkNo().toString(), wrkDetls.size(), "303");
                    }
                }
            }else if (staProtocol317.isAutoing() && staProtocol317.isLoading() && staProtocol317.getWorkNo() != 0) {
            }

            if (staProtocol317.isAutoing() && staProtocol317.isLoading() && staProtocol317.getWorkNo() != 0) {
                //调度机械臂
                //查询是否有工作档
                WrkMast wrkMast = wrkMastMapper.selectByWorkNo(staProtocol317.getWorkNo().intValue());
@@ -3017,9 +3019,18 @@
                    continue;
                }

                if (shuttleProtocol.getVoltage() < 5630) {
                    continue;//电压不够继续充电
                //***************判断是否满充校准***************
                EntityWrapper<Config> wrapper1 = new EntityWrapper<>();
                wrapper.eq("code", "shuttleMaxPowerVerify");
                Config config1 = configService.selectOne(wrapper1);
                if (config1 != null) {
                    if (config1.getValue().equals("true")) {
                        if (shuttleProtocol.getVoltage() < 5630) {
                            continue;//电压不够继续充电
                        }
                    }
                }
                //***************判断是否满充校准***************

                //小车满电，结束充电任务
                NyShuttleHttpCommand chargeCommand = NyHttpUtils.getChargeCommand(shuttle.getId(), wrkCharge.getWrkNo(), false);