1

zhang

12 小时以前 389500879e866f8d9dcc44aca4df7b89e77d3e5a

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

@@ -1,5 +1,6 @@
package com.zy.core.operation.handler;

import com.core.common.Cools;
import com.zy.asrs.controller.vo.ApplyInDto;
import com.zy.asrs.controller.vo.ApplyInRepsonseDto;
import com.zy.asrs.entity.Job;
@@ -62,7 +63,6 @@
                    SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
                    StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
                    BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, devp.getId());

                    if (staProtocol == null) {
                        return;
                    } else {
@@ -75,13 +75,14 @@
                    if (staProtocol.getWorkNo() > 0 && staProtocol.isAutoing()) {
                        Job job = jobService.getJobByJobNoAndJobSts(staProtocol.getWorkNo(), 2);
                        if (job != null) {
                            String barcode = barcodeThread.getBarcode();
                            if (Cools.isEmpty(barcode)) {
                                log.info("未扫到码值：{}",barcode);
                                return;
                            }
                            ApplyInDto applyInDto = new ApplyInDto();
                            applyInDto.setStaNo(inSta.getStaNo() + "");
                            applyInDto.setBarcode(barcodeThread.getBarcode());
                            //TODO
//                            ApplyInRepsonseDto locOfWms =new ApplyInRepsonseDto();
//                            locOfWms.setTaskNo(System.currentTimeMillis()+"");
//                            locOfWms.setBatchNo(System.currentTimeMillis()+"");
                            applyInDto.setBarcode(barcode);
                            ApplyInRepsonseDto locOfWms = wmsMainService.getLocOfWms(applyInDto);
                            if (locOfWms != null) {
                                job.setLoc(locOfWms.getLocNo());