1

zhang

昨天 9d82e56ee05e2be1150b98da80b720b4f93f6afd

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

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

import com.zy.acs.common.utils.News;
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.conveyor.controller.vo.ApplyInDto;
import com.zy.acs.conveyor.controller.vo.ApplyInRepsonseDto;
@@ -82,12 +83,12 @@
                    if (staProtocol.getWorkNo() > 0 && staProtocol.isAutoing()) {
                        String barcode = staProtocol.getBarcode();
                        if (Cools.isEmpty(barcode)) {
                            log.error("站点：{}，未扫到码值：{}", staProtocol.getSiteId(), barcode);
                            News.error("站点：{}，未扫到码值：{}", staProtocol.getSiteId(), barcode);
                            return;
                        }
                        // 9991是空板，9992是满板
                        if (staProtocol.getWorkNo() >= 9991 && staProtocol.getWorkNo() <= 9992) {
                            Job job = jobService.getJobByBarcode(barcode, ConveyorStateType.INBOUND.getStatus());
                            Job job = jobService.getJobByBarcode(barcode);
                            // 申请入库
                            if (job == null || (job != null && job.getJobSts() == ConveyorStateType.CLEARSIGNAL.getStatus())) {
                                ApplyInRepsonseDto locOfWms = wmsMainService.getLocOfWms(applyIn(barcode, inSta.getStaNo() + "", staProtocol));
@@ -97,10 +98,10 @@
                                    staProtocol.setStaNo(inSta.getTargetSta());
                                    redis.push(RedisConveyorConstant.CONVEYOR_TASK_FLAG, staProtocol);
                                    if (jobService.insert(initJob(locOfWms, barcode, workNo, inSta.getTargetSta() + ""))) {
                                        log.info("申请入库成功，条码：{},站点：{}", barcode, inSta.getStaNo());
                                        News.info("申请入库成功，条码：{},站点：{}", barcode, inSta.getStaNo());
                                    }
                                } else {
                                    log.info("WMS未返回库位信息，条码：{},站点：{}", barcode, inSta.getStaNo());
                                    News.error("WMS未返回库位信息，条码：{},站点：{}", barcode, inSta.getStaNo());
                                }
                            }
                        }
@@ -135,7 +136,7 @@
        ApplyInDto applyInDto = new ApplyInDto();
        applyInDto.setStaNo(staNo);
        applyInDto.setBarcode(barcode);
        applyInDto.setFull(staProtocol.getWorkNo() == 9992);
        applyInDto.setFull(staProtocol.isFullPlt());
        return applyInDto;
    }
}