Merge remote-tracking branch 'origin/glccwcs' into glccwcs

Administrator

3 天以前 f18dee1034da10cdd537f4cef94a6bcbe141c6a8

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -164,7 +164,7 @@
                        }
                        String BoxNo = barcodeThread.getBarcode();
                        if (Cools.isEmpty(BoxNo)) {
                            log.error("{}号条码扫描失败，值：{}",inSta.getBarcode(),BoxNo);
                            log.error("{}号条码扫描失败，值：{}", inSta.getBarcode(), BoxNo);
                            continue;
                        }
                        TaskWrk taskWrk1 = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("barcode", BoxNo));
@@ -177,27 +177,29 @@
                            storageEscalationParam.setWCSErrorMessage(storageEscalationParam.getWCSErrorMessage() + errMsg);
                        }
                        storageEscalationParam.setBarcode(BoxNo);
                        storageEscalationParam.setMatIdList(staProtocol.getMatIdList());
                        log.info("组托入库={}", storageEscalationParam);
                        TaskWrk taskWrk = toWmsService.getLocNoFromWms(storageEscalationParam);
                        if (taskWrk == null) {
                            log.error("入库请求wms创建任务工作档为空：{}",storageEscalationParam);
                            log.error("入库请求wms创建任务工作档为空：{}", storageEscalationParam);
                            continue;
                        }
                        if (back) {
                            log.info("托盘退回==>{}，{}", BoxNo, errMsg);
                            staProtocol.setStaNo(inSta.getBackSta().shortValue());
                            devpThread.setPakMk(staProtocol.getSiteId(), false);
                            MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                            log.info("组托入库托盘退回命令推送输送线队列成功==>{}，{}", BoxNo, errMsg);
                        } else {
                            StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
                                    .eq("crn_no", taskWrk.getCrnNo()).eq("type_no", 1).eq("stn_no", staProtocol.getSiteId()));
                            if (staDesc == null) {
                                log.error("zutuo入库路径不存在，wrkNo={},crn={},stn_no={}",taskWrk.getWrkNo(),taskWrk.getCrnNo(),staProtocol.getSiteId());
                                log.error("组托入库路径不存在，wrkNo={},crn={},stn_no={}", taskWrk.getWrkNo(), taskWrk.getCrnNo(), staProtocol.getSiteId());
                                continue;
                            }
                            staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
                            staProtocol.setStaNo(staDesc.getCrnStn().shortValue());
                            MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                            log.info("组托入库命令推送输送线队列成功:{}", staProtocol);
                        }

                    }
@@ -217,46 +219,49 @@
        for (CrnSlave crnSlave : slaveProperties.getCrn()) {
            // 遍历堆垛机出库站
            for (CrnSlave.CrnStn crnStn : crnSlave.getCrnOutStn()) {
                    try {
                        // 获取堆垛机出库站信息
                        DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
                        StaProtocol staProtocol = devpThread.getStation().get(crnStn.getStaNo());
                        if (staProtocol == null) {
                            continue;
                        } else {
                            staProtocol = staProtocol.clone();
                        }
                        if (staProtocol.isAutoing() && staProtocol.isLoading() && (staProtocol.getWorkNo() == 0 || staProtocol.getStaNo() == 0)) {
                            // 查询工作档
                            TaskWrk taskWrk = taskWrkMapper.selectCrnStaWorking(crnSlave.getId(), String.valueOf(crnStn.getStaNo()-1));
                            if (taskWrk == null) {
                                continue;
                            }
                                log.info("下发输送线任务：taskWrk:" + JSON.toJSONString(taskWrk));
                                staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
                                staProtocol.setStaNo(Short.valueOf(taskWrk.getTargetPoint()));
                                boolean offer = false;
                                try {
                                    offer = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
                                } catch (Exception e) {
                                    log.error("下发输送线任务失败：异常:" + e);
                                    log.error("下发输送线任务失败：异常:offer:" + offer);
                                }
                                if (offer) {
                                    log.info("下发输送线任务成功：taskWrk:" + JSON.toJSONString(taskWrk));
                                    taskWrk.setStatus(5);
                                    taskWrk.setWrkSts(14);
                                    taskWrk.setCompleteTime(new Date());
                                    taskWrkService.updateById(taskWrk);

                                } else {
                                    log.error("下发输送线任务失败：taskWrk:" + JSON.toJSONString(taskWrk));
                                }
//                            }
                        }
                    } catch (Exception e) {
                        log.error("出库到出库站异常:异常信息：" + e);
                try {
                    // 获取堆垛机出库站信息
                    DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
                    StaProtocol staProtocol = devpThread.getStation().get(crnStn.getStaNo());
                    if (staProtocol == null) {
                        continue;
                    } else {
                        staProtocol = staProtocol.clone();
                    }
                    if (staProtocol.isAutoing() && staProtocol.isLoading() && (staProtocol.getWorkNo() == 0 || staProtocol.getStaNo() == 0)) {
                        // 查询工作档
                        TaskWrk taskWrk = taskWrkMapper.selectCrnStaWorking(crnSlave.getId(), String.valueOf(crnStn.getStaNo() - 1));
                        if (taskWrk == null) {
                            continue;
                        }
                        log.info("下发输送线任务：taskWrk:" + JSON.toJSONString(taskWrk));
                        staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
                        staProtocol.setStaNo(Short.valueOf(taskWrk.getTargetPoint()));
                        if (!Cools.isEmpty(taskWrk.getType())) {
                            staProtocol.setHeight(taskWrk.getType());
                        }
                        boolean offer = false;
                        try {
                            offer = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
                        } catch (Exception e) {
                            log.error("下发输送线任务失败：异常:" + e);
                            log.error("下发输送线任务失败：异常:offer:" + offer);
                        }
                        if (offer) {
                            log.info("下发输送线任务成功：taskWrk:" + JSON.toJSONString(taskWrk));
                            taskWrk.setStatus(5);
                            taskWrk.setWrkSts(14);
                            taskWrk.setCompleteTime(new Date());
                            taskWrkService.updateById(taskWrk);

                        } else {
                            log.error("下发输送线任务失败：taskWrk:" + JSON.toJSONString(taskWrk));
                        }
//                            }
                    }
                } catch (Exception e) {
                    log.error("出库到出库站异常:异常信息：" + e);
                }
//                }

            }
@@ -343,6 +348,15 @@
                // 获取工作状态为2（设备上走）的入库工作档
                TaskWrk taskWrk = taskWrkMapper.selectPakIn(slave.getId(), staProtocol.getWorkNo().intValue(), staDesc.getStnNo().toString());
                if (null == taskWrk) {
                    continue;
                }

                LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
                if (!locMast.getLocSts().equals("O") && taskWrk.getWrkSts() == 2) {
                    log.error("入库WMS分配库位{}有误，库位状态为{}", locMast.getLocNo(), locMast.getLocSts());
                    taskWrk.setWrkSts(5);
                    taskWrk.setMemo("WMS分配库位有误");
                    taskWrkService.updateById(taskWrk);
                    continue;
                }

@@ -438,7 +452,7 @@
                            log.info(locMast.getLocNo() + "出深库位，浅库位有货");
                            continue;
                        }
                    } else if (flag == 2){
                    } else if (flag == 2) {
                        LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>()
                                .eq("row1", (locMast.getRow1() - 1))
                                .eq("bay1", locMast.getBay1())