#

lty

3 天以前 a454c4e3e56ed63a7676348f260a240fa18be481

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

@@ -97,6 +97,8 @@

    @Value("${wms.url}")
    private String wmsUrl;
    @Value("${wcs-slave.isToOrigin}")
    private boolean isToOrigin;

    public Integer wrkNo = 10000;

@@ -148,14 +150,23 @@
                    errMsg = "右超限";
                    back = true;
                }
                if (!back && staProtocol.isWeightErr()) {
                    errMsg = "超重";
                if (!back && staProtocol.getWeight() > 1000) {
                    errMsg = "超重或未读取";
                    back = true;
                }
                if (!back && staProtocol.isBarcodeErr()) {
                    errMsg = "扫码失败";
                    back = true;
                }
//                if(staProtocol.getWeight() <= 0 ){
//                    continue;
//                }
//                if (!back && staProtocol.getWeight() == 0.0) {
//                    errMsg = "重量获取失败";
//                    back = true;
//                }

//                News.info("{}重量", staProtocol.getWeight());

                // 退回
                if (back) {
@@ -238,10 +249,12 @@
                        LocTypeDto locTypeDto = new LocTypeDto(staProtocol);

                        SearchLocParam param = new SearchLocParam();
                        locTypeDto.setLocType1((short) 1);
                        param.setBarcode(barcode);
                        param.setIoType(1);
                        param.setSourceStaNo(inSta.getStaNo());
                        param.setLocType1(locTypeDto.getLocType1());
                        param.setWeight(staProtocol.getWeight());
                        String response = new HttpHandler.Builder()
                                .setTimeout(30,TimeUnit.SECONDS)
                                .setUri(wmsUrl)
@@ -298,7 +311,8 @@
                            staProtocol.setStaNo(inSta.getBackSta().shortValue());
                            devpThread.setPakMk(staProtocol.getSiteId(), false);
                            MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
//
                            log.error("输送线下发2：" + staProtocol.getWorkNo() + "," + staProtocol.getStaNo());

//                            if (ledThread != null) {
                            String errorMsg = jsonObject.getString("msg");
                            if (!Cools.isEmpty(errorMsg)) {
@@ -409,7 +423,7 @@
                StaProtocol staProtocol = devpThread.getStation().get(pickSta.getStaNo());

                if(staProtocol == null) {
                    News.error("站点信息未获得");
//                    News.error("站点信息未获得");
                    continue;
                }
                // 尺寸检测异常
@@ -443,6 +457,9 @@
                    errMsg = "扫码失败";
                    back = true;
                }
                if(staProtocol.getSiteId() > 400){
                    back = false;
                }

                // 退回
                if (back) {
@@ -470,23 +487,26 @@
                    }
                    continue;
                }
                if (!Cools.isEmpty(barcode)) {
                    News.infoNoLog("" + mark + " - 1" + " - {}号条码扫描器检测条码信息：{}", pickSta.getBarcode(), barcode);
                    if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
                if(staProtocol.getSiteId() < 400){
                    if (!Cools.isEmpty(barcode)) {
                        News.infoNoLog("" + mark + " - 1" + " - {}号条码扫描器检测条码信息：{}", pickSta.getBarcode(), barcode);
                        if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
                            continue;
                        }
                    } else {
                        continue;
                    }
                } else {
                    continue;
                }


                if (!Cools.isEmpty(barcode)) {
                    if (!Cools.isEmpty(barcode)) {
//                    News.info(""+mark+" - 1"+" - {}号条码扫描器检测条码信息：{}", pickSta.getBarcode(), barcode);
                    if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
                        if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
                            continue;
                        }
                    } else {
                        continue;
                    }
                } else {
                    continue;

                }


@@ -502,6 +522,9 @@
                if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() && staProtocol.isPakMk()) {
                    News.warnNoLog("" + mark + " - 0" + " - 开始执行");
                    WrkMast wrkMast = wrkMastMapper.selectPickStep(barcode);
                    if(staProtocol.getSiteId() > 400){
                        wrkMast = wrkMastMapper.selectPickStep3(staProtocol.getWorkNo());
                    }
//                    WrkMast wrkMast = wrkMastMapper.selectPakInStep3(staProtocol.getWorkNo().intValue());
                    if (wrkMast == null) {
                        // 无拣料数据
@@ -586,7 +609,9 @@

                    // 更新站点信息 且 下发plc命令
                    staProtocol.setWorkNo(wrkMast.getWrkNo());
                    staProtocol.setStaNo(Short.valueOf(wrkMast.getStaNo().toString()));
                    if(staProtocol.getSiteId() < 400){
                        staProtocol.setStaNo(Short.valueOf(wrkMast.getStaNo().toString()));
                    }
                    devpThread.setPakMk(staProtocol.getSiteId(), false);
                    boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                    log.error("输送线下发5：" + wrkMast.getWrkNo() + "," + wrkMast.getStaNo());
@@ -832,7 +857,7 @@
                        }

                    } else {
                        News.errorNoLog("" + mark + " - 6" + " - 堆垛机信息不符合入库条件！！！"
                         News.errorNoLog("" + mark + " - 6" + " - 堆垛机信息不符合入库条件！！！"
                                + " 堆垛机状态：" + crnProtocol.modeType + "==自动AUTO：" + CrnModeType.AUTO
                                + "、堆垛机任务号：" + crnProtocol.getTaskNo() + "==工作档任务号：" + wrkMast.getWrkNo().shortValue()
                                + "、状态枚举：" + crnProtocol.statusType + "==WAITING：90 //任务完成等待WCS确认)：" + CrnStatusType.WAITING
@@ -844,6 +869,27 @@
        }
//        News.infoNoLog(""+mark+" - 0"+" - 堆垛机站出库到出库站  ===》执行完成");
    }
    /**
     * 堆垛机默认回原点
     */
    public synchronized void crnToInStn(Integer mark) {
        if(isToOrigin){
            for (CrnSlave crn : slaveProperties.getCrn()){
                // 获取堆垛机信息
                CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
                CrnProtocol crnProtocol = crnThread.getCrnProtocol();
                if (crnProtocol == null) {
                    continue;
                }
                BasCrnp basCrnp = basCrnpService.selectById(crn.getId());
                if (basCrnp == null) {
                    News.error("" + mark + " - 1" + " - {}号堆垛机尚未在数据库进行维护！", crn.getId());
                    continue;
                }
            }
        }
    }


    /**
     * 入出库  ===>>  堆垛机入出库作业下发
@@ -982,6 +1028,9 @@
                News.error("" + mark + " - 1" + " - 2" + " - 入库 ===>> 堆垛机站点在数据库不存在, 站点编号={}", crnStn.getStaNo());
                continue;
            }
//            if(staProtocol.getWorkNo() == 9998){
//                continue;
//            }
            if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() > 0 && staProtocol.isInEnable()
                    && staDetl.getCanining() != null && staDetl.getCanining().equals("Y")) {
                flag = true;
@@ -1080,7 +1129,7 @@
            crnCommand.setDestinationPosX((short) (locMast.getRow1() + slave.getOffset()));     // 目标库位排
            crnCommand.setDestinationPosY((short) (locMast.getBay1() + slave.getOffset()));     // 目标库位列
            crnCommand.setDestinationPosZ((short) (locMast.getLev1() + slave.getOffset()));     // 目标库位层
            crnCommand.setTraySize(locMast.getLocType1() == 2);
//            crnCommand.setTraySize(locMast.getLocType1() == 2);
            if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
                News.error("" + mark + " - 1" + " - 16" + " - 堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
            } else {
@@ -1666,8 +1715,8 @@

                    try {
                        LocTypeDto locTypeDto = new LocTypeDto(staProtocol);

                        SearchLocParam param = new SearchLocParam();
                        locTypeDto.setLocType1((short) 1);
                        param.setIoType(10);
                        param.setSourceStaNo(emptyInSta.getStaNo());
                        param.setLocType1(locTypeDto.getLocType1());
@@ -1777,6 +1826,12 @@
                    case 10:
                        ledCommand.setTitle("空板入库");
                        break;
                    case 53:
                        ledCommand.setTitle("拣料再入库");
                        break;
                    case 57:
                        ledCommand.setTitle("盘点再入库");
                        break;
                    case 101:
                        ledCommand.setTitle("全板出库");
                        break;
@@ -1812,14 +1867,14 @@
                        } else {
                            total = locDetl.getAnfme();
                        }
                        if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 1) {
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(), total));
                        if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 1 || wrkMast.getIoType() == 53 || wrkMast.getIoType() == 57) {
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getOrderNo(),wrkDetl.getOutOrderNo(),wrkDetl.getUnit(),wrkDetl.getWeight(),wrkDetl.getSupp(),wrkDetl.getLength() ,wrkDetl.getTemp1(), wrkDetl.getProType(),wrkDetl.getAnfme(),wrkDetl.getTemp2(), total));
                        }
                        if (wrkMast.getIoType() == 103 && (null == wrkDetl.getInspect() || 0 == wrkDetl.getInspect())) {
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(), total));
                        if (wrkMast.getIoType() == 103 ) {
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getOrderNo(),wrkDetl.getOutOrderNo(),wrkDetl.getUnit(),wrkDetl.getWeight(),wrkDetl.getSupp(),wrkDetl.getLength() ,wrkDetl.getTemp1(), wrkDetl.getProType(),wrkDetl.getAnfme(),wrkDetl.getTemp2(), total));
                        }
                        if (wrkMast.getIoType() == 107) {
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(), total));
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getOrderNo(),wrkDetl.getOutOrderNo(),wrkDetl.getUnit(),wrkDetl.getWeight(),wrkDetl.getSupp(),wrkDetl.getLength() ,wrkDetl.getTemp1(), wrkDetl.getProType(),wrkDetl.getAnfme(),wrkDetl.getTemp2(), total));
                        }
                    });
                }