#

zjj

2024-07-22 3c7c81ce7f573322c46618aabd455a2d06fe879a

#

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

@@ -422,34 +422,42 @@
        for (Task task : taskService.selectWaitAnalyzeInBoundTask()) {
            BasConveyorSta basConveyorSta = basConveyorStaService.getOne(new LambdaQueryWrapper<BasConveyorSta>().eq(BasConveyorSta::getSiteNo, task.getDestSite()));
            if (basConveyorSta == null) {
                log.error("解析入库任务退出，输送");
                continue;
            }
            BasConveyor basConveyor = basConveyorService.getById(basConveyorSta.getConveyorId());
            if (basConveyor == null) {
                log.error("解析入库任务退出，输送2");
                continue;
            }
            DeviceBarcode deviceBarcode = deviceBarcodeService.getById(basConveyorSta.getBarcodeId());
            if (deviceBarcode == null) {
                log.error("解析入库任务退出，条码");
                continue;
            }
            BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, Integer.parseInt(deviceBarcode.getDeviceId()));
            if (barcodeThread == null) {
                log.error("解析入库任务退出，条码线程");
                continue;
            }
            if (!barcodeThread.getBarcode().equals(task.getZpallet())) {
                log.error("解析入库任务退出，条码不符合");
                continue;
            }
            DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Conveyor, basConveyor.getDeviceId().intValue());
            if (devpThread == null) {
                log.error("解析入库任务退出，输送线程");
                continue;
            }
            StaProtocol staProtocol = devpThread.getStation().get(basConveyorSta.getSiteNo());
            if (staProtocol == null) {
                log.error("解析入库任务退出，输送站点");
                continue;
            }
            if (!(staProtocol.isAutoing()
                    && staProtocol.isLoading()
                    && staProtocol.isInEnable())) {
                log.error("解析入库任务退出，输送信号不符合："+staProtocol.isAutoing()+","+staProtocol.isLoading()+","+staProtocol.isInEnable());
                continue;
            }

@@ -472,8 +480,16 @@
            }

            // generate motion list
            List<Motion> motionList = analyzeService.generateMotion(task);
            List<Motion> motionList = null;
            try {
                motionList = analyzeService.generateMotion(task);
            }catch (Exception e) {
                log.error("motion解析出错："+e.getMessage());
                continue;
            }

            if (motionList.isEmpty()) {
                log.error("motion为空退出");
                continue;
            }
            motionService.batchInsert(motionList, task.getUuid(), Integer.valueOf(task.getTaskNo()), task.getHostId());

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java

@@ -128,7 +128,7 @@

        Map<String, Object> map = new HashMap<>();
        map.put("carrierCode",task.getZpallet());
        map.put("siteCode",task.getMemo());
        map.put("siteCode","06YZ0001");
        map.put("extra",null);
        try {
            response = new HttpHandler.Builder()