#

Junjie

2025-04-07 901f9ca15fb0ce3bcf2ebf956c569c260050c561

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java

@@ -170,18 +170,23 @@
                            continue;
                        }

                        // 获取条码扫描仪信息
                        DeviceBarcode deviceBarcode = deviceBarcodeService.getById(basConveyorSta.getBarcodeId());
                        if(deviceBarcode == null) {
                            continue;
                        }
                        BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, Integer.parseInt(deviceBarcode.getDeviceId()));
                        if (barcodeThread == null) {
                            continue;
                        }
                        String barcode = barcodeThread.getBarcode();
//                        // 获取条码扫描仪信息
//                        DeviceBarcode deviceBarcode = deviceBarcodeService.getById(basConveyorSta.getBarcodeId());
//                        if(deviceBarcode == null) {
//                            continue;
//                        }
//                        BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, Integer.parseInt(deviceBarcode.getDeviceId()));
//                        if (barcodeThread == null) {
//                            continue;
//                        }
//                        String barcode = barcodeThread.getBarcode();
//                        if (!Cools.isEmpty(barcode)) {
//                            News.info("{}号条码扫描器检测条码信息：{}", deviceBarcode.getId(), barcode);
//                        }

                        String barcode = staProtocol.getBarcode();
                        if (!Cools.isEmpty(barcode)) {
                            News.info("{}号条码扫描器检测条码信息：{}", deviceBarcode.getId(), barcode);
                            News.info("条码扫描器检测条码信息：{}", barcode);
                        }

                        // 判断重复工作档
@@ -192,7 +197,7 @@
                        if (task1 != null) {
                            News.error("工作档已存在,工作号={}", task1.getTaskNo());
                            if (staProtocol.getWorkNo().intValue() != Integer.parseInt(task1.getTaskNo())) {
                                devpThread.writeWorkSta(staProtocol.getSiteId(), Short.parseShort(task1.getTaskNo()), Short.parseShort(task1.getDestSite()));
                                devpThread.writeWorkSta(staProtocol.getSiteId(), Short.parseShort(task1.getTaskNo()), Short.parseShort(task1.getOriginSite()));
                                devpThread.setPakMk(staProtocol.getSiteId(), false);
                                News.info("输送线入库命令下发，任务数据={}", JSON.toJSON(task1));
                            }
@@ -519,6 +524,11 @@
                            //穿梭车进提升机待机位库位号  输送线位置
                            String standbyLocNoTo = shuttleStandbyTo.getDeviceStandbyLoc();

                            //不走提升机
                            if (staProtocol.getSiteId() == 1015 || staProtocol.getSiteId() == 1026) {
                                standbyLocNoTo = staProtocol.getLocNo();
                            }

                            if (Cools.isEmpty(task.getShuttleNo())) {
                                //分配小车
                                //调度空闲车去取货待机位