1

zhang

12 小时以前 286eadc0913fe9974ab2f2fd188fb707dc16ad40

 zy-acs-cv/src/main/java/com/zy/core/operation/handler/AppleLocOperationHandler.java

@@ -65,28 +65,26 @@
                    StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
                    BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, devp.getId());
                    if (staProtocol == null) {
                        return;
                        continue;
                    } else {
                        staProtocol = staProtocol.clone();
                    }
                    // 判断是否满足条件
                    if (!staProtocol.isLoading()) {
                        return;
                        continue;
                    }
                    if (staProtocol.getWorkNo() > 0 && staProtocol.isAutoing()) {
                        String barcode = barcodeThread.getBarcode();
                        if (Cools.isEmpty(barcode)) {
                            log.info("未扫到码值：{}", barcode);
                        if (barcodeThread == null || Cools.isEmpty(barcode)) {
                            log.error("站点：{}，未扫到码值：{}", staProtocol.getSiteId(), barcode);
                            return;
                        }
                        // 9991是空板，9992是满板
                        if (staProtocol.getWorkNo() >= 9991 && staProtocol.getWorkNo() <= 9992) {
                            Job job = jobService.getJobByBarcode(barcode);
                            // 申请入库
                            if (job == null || (job != null && job.getJobSts() == 8)) {
                                ApplyInDto applyInDto = new ApplyInDto();
                                applyInDto.setStaNo(inSta.getStaNo() + "");
                                applyInDto.setBarcode(barcode);
                                applyInDto.setFull(staProtocol.getWorkNo() == 9992);
                                ApplyInRepsonseDto locOfWms = wmsMainService.getLocOfWms(applyInDto);
                                ApplyInRepsonseDto locOfWms = wmsMainService.getLocOfWms(applyIn(barcode, inSta.getStaNo() + "", staProtocol));
                                if (locOfWms != null) {
                                    job = new Job();
                                    job.setLoc(locOfWms.getLocNo());
@@ -95,11 +93,11 @@
                                    job.setBarcode(barcode);
                                    job.setStaNo(inSta.getTargetSta() + "");
                                    job.setJobNo(wrkLastnoService.nextWorkNo(WorkNoTypeType.WORK_NO_TYPE.type));
                                    job.setJobSts(4);
                                    job.setJobSts(ConveyorStateType.APPLYLOC.getStatus());
                                    job.setWmsTime(new Date());
                                    jobService.insert(job);
                                } else {
                                    log.info("WMS未返回库位信息，{}", applyInDto);
                                    log.info("WMS未返回库位信息，条码：{},站点：{}", barcode, inSta.getStaNo());
                                }
                            }
                        }
@@ -111,4 +109,12 @@
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
        }
    }

    private ApplyInDto applyIn(String barcode, String staNo, StaProtocol staProtocol) {
        ApplyInDto applyInDto = new ApplyInDto();
        applyInDto.setStaNo(staNo);
        applyInDto.setBarcode(barcode);
        applyInDto.setFull(staProtocol.getWorkNo() == 9992);
        return applyInDto;
    }
}