1

zhang

9 小时以前 25650bd51704793cf78408d28853c89fda837c4c

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

@@ -81,12 +81,12 @@
                    if (staProtocol.getWorkNo() == 0) {
                        continue;
                    }
                    if (!staProtocol.isLoading()) {
                        News.error("{}：站点：{}，无物", config.getMark(), staProtocol.getSiteId());
                    if (!staProtocol.isAutoing()) {
                        //News.error("{}：站点：{}，非自动", config.getMark(), staProtocol.getSiteId());
                        continue;
                    }
                    if (!staProtocol.isAutoing()) {
                        News.error("{}：站点：{}，非自动", config.getMark(), staProtocol.getSiteId());
                    if (!staProtocol.isLoading()) {
                        News.error("{}：站点：{}，无物", config.getMark(), staProtocol.getSiteId());
                        continue;
                    }
                    String barcode = staProtocol.getBarcode();
@@ -94,13 +94,14 @@
                        News.error("站点：{}，未扫到码值：{}", staProtocol.getSiteId(), barcode);
                        continue;
                    }
                    Job job = jobService.getJobByBarcode(barcode);
                    Job job = jobService.getJobByJobNo(staProtocol.getWorkNo());
                    //Job job = jobService.getJobByBarcode(barcode);
                    if (job == null) {
                        News.error("{}：站点：{}，找不到任务", config.getMark(), staProtocol.getSiteId());
                        continue;
                    }
                    if (job.getJobSts() != ConveyorStateType.STARTUP.getStatus()) {
                        if (job.getJobSts() == ConveyorStateType.INBOUND.getStatus()){
                        if (job.getJobSts() == ConveyorStateType.INBOUND.getStatus()) {
                            continue;
                        }
                        News.error("{}：站点：{}，任务状态不对，{}", config.getMark(), staProtocol.getSiteId(), JSON.toJSON(job));
@@ -113,8 +114,16 @@
                        staProtocol.setWorkNo(workNo);
                        staProtocol.setStaNo(inSta.getTargetSta());
                        redis.push(RedisConveyorConstant.CONVEYOR_TASK_FLAG, staProtocol);
                        if (jobService.insert(initJob(locOfWms, barcode, workNo, inSta.getTargetSta() + ""))) {
                        job.setLoc(locOfWms.getLocNo());
                        job.setTaskNo(locOfWms.getTaskNo());
                        job.setBatchNo(locOfWms.getBatchNo());
                        job.setBarcode(barcode);
                        job.setWmsTime(new Date());
                        job.setJobSts(ConveyorStateType.INBOUND.getStatus());
                        //if (jobService.insert(initJob(locOfWms, barcode, workNo, inSta.getTargetSta() + ""))) {
                        if (jobService.updateById(job)) {
                            News.info("申请入库成功，条码：{},站点：{}", barcode, inSta.getStaNo());

                        }
                    } else {
                        News.error("WMS未返回库位信息，条码：{},站点：{}", barcode, inSta.getStaNo());