#和得服务器

1

2 天以前 54fc241d1a44ec21a6994ce0ae37ec7b22d3e748

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

@@ -138,6 +138,9 @@
                } else {
                    staProtocol = staProtocol.clone();
                }
                if(!staProtocol.isLoading()){
                    continue;
                }

                if (barcodeThread == null) {
                    continue;
@@ -180,7 +183,7 @@
                }
                // 退回
                if (back) {
//                        News.warn("扫码入库失败，{}入库站因{}异常，托盘已被退回", inSta.getStaNo(), errMsg);
                    News.warn("扫码入库失败，{}入库站因{}异常，托盘已被退回", inSta.getStaNo(), errMsg);
                    MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errMsg));

                    if (!staProtocol.isLoading()){
@@ -194,10 +197,11 @@
                        MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errMsg));
                    }
                    staProtocol.setWorkNo(wrkNo);
                    News.info("{}入库回退：{}，任务号：{}", inSta.getStaNo(), errMsg,wrkNo);
                    News.info("异常判断{}入库回退：{}，任务号：{}", inSta.getStaNo(), errMsg,wrkNo);
                    wrkNo++;
                    staProtocol.setStaNo(inSta.getBackSta().shortValue());
                    devpThread.setPakMk(staProtocol.getSiteId(), false);
                    staProtocol.setBarcode(barcode);
                    staProtocol.setPakMk(false);
                    MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                    System.out.println(staProtocol);
@@ -209,7 +213,8 @@
                        && staProtocol.isLoading()
                        && staProtocol.isInEnable()
                        && !staProtocol.isEmptyMk()
                        && staProtocol.isPakMk()) {
                        && staProtocol.isPakMk()
                ) {
                    if(Cools.isEmpty(barcode) || "NG".endsWith(barcode) || "NoRead".equals(barcode)) {
//                        News.error(JSON.toJSONString(staProtocol));
                        News.info("{}号条码扫描器检测条码信息：{}", inSta.getBarcode(), barcode);
@@ -219,9 +224,10 @@
                            MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
                        }
                        staProtocol.setWorkNo(wrkNo);
                        News.info("{}入库回退：{}，任务号：{}", inSta.getStaNo(), errMsg,wrkNo);
                        News.info("条码判断{}入库回退：{}，任务号：{}", inSta.getStaNo(), errMsg,wrkNo);
                        wrkNo++;
                        staProtocol.setStaNo(inSta.getBackSta().shortValue());
                        staProtocol.setBarcode(barcode);
                        devpThread.setPakMk(staProtocol.getSiteId(), false);
                        MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                        log.error("输送线下发1："+wrkNo+","+inSta.getBackSta());
@@ -248,9 +254,10 @@
                        if (wrkNo1 != 0){
                            News.error(barcode + "条码已存在状态为（ 2.设备上走 ）的数据,请查看WCS输送线界面,工作号={}", wrkMast.getWrkNo());
                            StaProtocol staProtocolNew = new StaProtocol();
                            staProtocolNew.setWorkNo(wrkNo1);
                            staProtocolNew.setWorkNo(wrkMast.getWrkNo());
                            staProtocolNew.setStaNo(RouteUtils.SouStaEnd(wrkMast.getStaNo(),wrkMast.getSourceStaNo()));
                            staProtocolNew.setSiteId(staProtocol.getSiteId());
                            staProtocolNew.setBarcode(barcode);
                            MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocolNew));
                            if (ledThread != null) {
                                News.error(methodName + ":扫码失败，请重试");
@@ -261,6 +268,8 @@
                        barcodeThread.setBarcode("");
                        staProtocol.setWorkNo(wrkMast.getWrkNo());
                        staProtocol.setStaNo(RouteUtils.SouStaEnd(null,wrkMast.getSourceStaNo()));
                        staProtocol.setBarcode(barcode);

                        devpThread.setPakMk(staProtocol.getSiteId(), false);
                        boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                        log.info("输送线下发(存在设备上走的工作档，直接下发！))："+wrkMast.getWrkNo()+","+wrkMast.getStaNo());
@@ -349,7 +358,7 @@
                            staProtocol.setStaNo(inSta.getBackSta().shortValue());
                            devpThread.setPakMk(staProtocol.getSiteId(), false);
                            MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
//
                            News.info("任务下发判断{}入库回退：{}，任务号：{}", inSta.getStaNo(), errMsg,wrkNo);
//                            if (ledThread != null) {
                                String errorMsg = jsonObject.getString("msg");
                                if (!Cools.isEmpty(errorMsg)) {
@@ -3063,6 +3072,7 @@
            }
            if(rgvProtocol.getStatusType1() == RgvStatusType.WORKING){
                rgvThread.setPaking(true);
                continue;
            }
            //小车无任务时跳过
            if(rgvProtocol.getTaskNo1() ==0 && rgvProtocol.getTaskNo2() == 0 ){
@@ -3106,26 +3116,31 @@
                    }
                    BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvProtocol.getRgvNo());
                    basRgvMap.setNowRoute(rgvProtocol.getRgvPosI()); //更新小车当前位置站点号
                    Integer workNo = rgvProtocol.getTaskNo2() !=0 ? rgvProtocol.getTaskNo2() : rgvProtocol.getTaskNo1(); //入库放货优先工位2执行
                    Integer workNo = 0;
                    if(rgvProtocol.getTaskNo2() > 9999|| rgvProtocol.getTaskNo1() > 9999){
                        workNo = rgvProtocol.getTaskNo1() !=0 ? rgvProtocol.getTaskNo1() : rgvProtocol.getTaskNo2();
                    }else{
                        workNo = rgvProtocol.getTaskNo2() !=0 ? rgvProtocol.getTaskNo2() : rgvProtocol.getTaskNo1();
                    }
                    WrkMastSta wrkMastSta = wrkMastStaMapper.selectByWrkNoPut(workNo);
                    WrkMast wrkMast = wrkMastMapper.selectByWrkNo(workNo);
                    if( null == wrkMastSta ) {
                        News.infoNoLog( " - 1" + " - 4" + " - 查询无待入库数据--wrk_sts0, 工作号={}", staProtocol.getWorkNo());
                        continue;
                    }


                    boolean sign = rgvTakeFullAll(basRgvMap.getRgvNo(), wrkMastSta); //命令下发
                    if (sign){
                        try{
                            rgvThread.setPaking(false);
                            wrkMast.setSheetNo("2");
                            if(wrkMast != null){
                                wrkMast.setSheetNo("2");
                                wrkMastMapper.updateById(wrkMast);
                            }
                            wrkMastSta.setWrkSts(2);
                            wrkMastStaMapper.updateById(wrkMastSta);
                            wrkMastMapper.updateById(wrkMast);
                            log.error("更新小车任务成功");
                        }catch (Exception e){
                            log.error("更新小车任务失败");
                            log.error("更新小车任务失败"+ e);
                        }
                    } else {
                        log.error("工作号{}所属任务下发失败",wrkMastSta.getWrkNo());
@@ -3175,6 +3190,7 @@
                    }

                    WrkMastSta wrkMastSta = wrkMastStaMapper.selectByWrkNoPut(workNo);//根据站点工作号和小车工作范围检索任务档
                    WrkMast wrkMast = wrkMastMapper.selectByWrkNo(workNo);

                    if( null == wrkMastSta ) {
                        News.infoNoLog( " - 1" + " - 4" + " - 查询无待出库数据--wrk_sts0, 工作号={}", staProtocol.getWorkNo());
@@ -3184,6 +3200,10 @@
                    if (sign){
                        try{
                            rgvThread.setPaking(false);
                            if(wrkMast != null){
                                wrkMast.setSheetNo("2");
                                wrkMastMapper.updateById(wrkMast);
                            }
                            wrkMastSta.setWrkSts(2);
                            wrkMastStaMapper.updateById(wrkMastSta);
                            log.error("更新小车任务成功");
@@ -3412,8 +3432,12 @@
                    News.error("" + mark + " - 1" + " - 2" + " - 入库 ===>>Rgv站点在数据库不存在, 站点编号={}", rgvStn.getStaNo());
                    continue;
                }

                wrkMastSta3 = wrkMastStaMapper.selectByWrkNo(staProtocol2.getWorkNo());
            }
//            if(rgvProtocol.getTaskNo2() > 9999){
//                continue;
//            }

            if (staProtocol == null) {
                News.infoNoLog("" + mark + " - 1" + " - 1" + " - Rgv入库站信息(staProtocol!=null继续执行)：staProtocol=" + staProtocol);
@@ -3469,24 +3493,25 @@
            boolean sign = false;
            sign = rgvTakeFullAll(basRgvMap.getRgvNo(), wrkMastSta); //命令下发
            if (sign){
                if(wrkMastSta3 != null){
                    wrkMastSta3.setMk(1);
                    basRgv.setPakAll("0");
                    basRgvService.updateById(basRgv);

                    try{
                        wrkMastStaMapper.updateById(wrkMastSta3);
                        log.error("锁定相隔站点任务");
                    }catch (Exception e){
                        log.error("锁定相隔站点任务失败");
                if(wrkMastSta3 != null ){
                    List<WrkMastSta> wrkMastStaPaking = wrkMastStaService.selectPakingWrk(wrkMastSta3.getStaStart());
                    if(wrkMastStaPaking.size() < 1){//已有标记不再标记
                        wrkMastSta3.setMk(1);
                        basRgv.setPakAll("0");
                        basRgvService.updateById(basRgv);

                        try{
                            wrkMastStaMapper.updateById(wrkMastSta3);
                            log.error("锁定相隔站点任务");
                        }catch (Exception e){
                            log.error("锁定相隔站点任务失败");
                        }
                    }

                }
                basRgv.setPakOut("0");
                basRgv.setPakOut("0");//出库不允许
                basRgvService.updateById(basRgv);
                rgvThread.setPaking(false);
//                rgvThread.setPakOut(false);//出库不允许
//                basRgvService.updateById(basRgv);
                rgvThread.setPaking(false);//任务下发锁定

                try{
                    wrkMastSta.setWrkSts(1);
@@ -3568,6 +3593,7 @@
                case 2: route = RouteUtils.getRouteTwo();break;
            }
            basRgvMap.setNowRoute(rgvProtocol.getRgvPosI2()); //更新小车当前位置站点号
            basRgvMapService.updateById(basRgvMap);
            WrkMastSta wrkMastSta = wrkMastStaMapper.selectNoInterfere(route, route, Long.valueOf(staProtocol.getWorkNo()));//根据站点工作号和小车工作范围检索任务档
            if( null == wrkMastSta ) {
                News.infoNoLog("" + mark + " - 1" + " - 4" + " - 查询无待入库数据--wrk_sts0, 工作号={}", staProtocol.getWorkNo());
@@ -3596,15 +3622,20 @@

//                    rgvThread.setPakToCrn(false); //锁定小车只能接接驳任务
                }
                if(wrkMastSta3 != null){
                    wrkMastSta3.setMk(1);
                    try{
                        wrkMastStaMapper.updateById(wrkMastSta3);
                        log.error("锁定相隔站点任务");
                    }catch (Exception e){
                        log.error("锁定相隔站点任务失败");
                    }

                if(wrkMastSta3 != null ){
                    List<WrkMastSta> wrkMastStaPaking = wrkMastStaService.selectPakingWrk(wrkMastSta3.getStaStart());
                    if(wrkMastStaPaking.size() < 1){
                        wrkMastSta3.setMk(1);
                        basRgv.setPakAll("0");
                        basRgvService.updateById(basRgv);
                        try{
                            wrkMastStaMapper.updateById(wrkMastSta3);
                            log.error("锁定相隔站点任务");
                        }catch (Exception e){
                            log.error("锁定相隔站点任务失败");
                        }
                    }
                }
                basRgv.setPakIn("0");
                basRgvService.updateById(basRgv);