1

zhang

5 小时以前 d0504eb777a7ea15037acf871f92bac2ac7d9f47

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

@@ -85,7 +85,7 @@
                        }
                        // 9991是空板，9992是满板
                        if (staProtocol.getWorkNo() >= 9991 && staProtocol.getWorkNo() <= 9992) {
                            Job job = jobService.getJobByBarcode(barcode ,ConveyorStateType.INBOUND.getStatus());
                            Job job = jobService.getJobByBarcode(barcode, ConveyorStateType.INBOUND.getStatus());
                            // 申请入库
                            if (job == null || (job != null && job.getJobSts() == ConveyorStateType.CLEARSIGNAL.getStatus())) {
                                ApplyInRepsonseDto locOfWms = wmsMainService.getLocOfWms(applyIn(barcode, inSta.getStaNo() + "", staProtocol));
@@ -94,11 +94,11 @@
                                    staProtocol.setWorkNo(workNo);
                                    staProtocol.setStaNo(inSta.getTargetSta());
                                    if (MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(TaskType.WRITE, staProtocol))) {
                                        if (!jobService.insert(initJob(locOfWms, barcode, workNo,inSta.getTargetSta() + ""))) {
                                        if (!jobService.insert(initJob(locOfWms, barcode, workNo, inSta.getTargetSta() + ""))) {
                                            throw new CoolException("更新输送线任务失败," + " - " + staProtocol.getWorkNo());
                                        }
                                        log.info("入库前进：{},{}", staProtocol.getWorkNo(), inSta.getTargetSta());
                                    }else {
                                    } else {
                                        log.info("下发失败：{},{}", staProtocol.getWorkNo(), inSta.getTargetSta());
                                    }
                                } else {
@@ -116,8 +116,8 @@
    }


    private Job initJob(ApplyInRepsonseDto locOfWms, String barcode,Integer workNo, String staNo) {
        Job  job = new Job();
    private Job initJob(ApplyInRepsonseDto locOfWms, String barcode, Integer workNo, String staNo) {
        Job job = new Job();
        job.setLoc(locOfWms.getLocNo());
        job.setTaskNo(locOfWms.getTaskNo());
        job.setBatchNo(locOfWms.getBatchNo());