#

zjj

2024-09-20 c8f5e604019bdbc4bd67113ffc0b2dbb1a79017a

#

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/MainProcess.java

@@ -34,7 +34,7 @@
                try {

                    // 间隔
                    Thread.sleep(300);
                    Thread.sleep(1000);

                    // 系统运行状态判断
                    if (!SystemProperties.WCS_RUNNING_STATUS.get()) {

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

@@ -161,13 +161,18 @@
                    ) {

                        // 获取条码扫描仪信息
                        BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, basConveyorSta.getBarcodeId().intValue());
                        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("{}号条码扫描器检测条码信息：{}", inSta.getBarcode(), barcode);
                            News.info("{}号条码扫描器检测条码信息：{}", deviceBarcode.getId(), barcode);

                            if ("NG".endsWith(barcode) || "NoRead".equals(barcode) || "empty".equals(barcode) || "00000000".equals(barcode)) {
                                staProtocol.setWorkNo((short) 32002);
                                staProtocol.setStaNo(inSta.getBackSta().shortValue());
@@ -213,7 +218,7 @@
                            param.setBarcode(barcode);
                            param.setIoType(1);
                            param.setSourceStaNo(inSta.getStaNo());
                            param.setLocType1(staProtocol.getLocType1().shortValue());
                            param.setLocType1((short)1);
                            String response = new HttpHandler.Builder()
                                    .setUri(wmsUrl)
                                    .setPath("/rpc/pakin/loc/v1")
@@ -458,7 +463,7 @@
            if (Cools.isEmpty(basConveyorSta.getTaskNo())){
                continue;
            }
            if (!basConveyorSta.getTaskNo().toString().equals(task.getTaskNo())){
            if (!basConveyorSta.getTaskNo().toString().equals(task.getWmsTaskNo())){
                continue;
            }
            DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Conveyor, basConveyor.getDeviceId().intValue());

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

@@ -1,5 +1,6 @@
package com.zy.asrs.wcs.core.timer;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wcs.core.entity.Task;
import com.zy.asrs.wcs.core.kernel.command.*;
@@ -51,8 +52,18 @@
                if (executingMotion.getSync() == 1) {//当前执行中的动作是同步动作，等待执行完成后再执行下一个动作
                    continue;
                }

                //异步动作，只允许下一条动作被执行
                Motion nextMotion = motionService.getOne(new LambdaQueryWrapper<Motion>().eq(Motion::getUuid, executingMotion.getUuid()).eq(Motion::getPriority, executingMotion.getPriority() - 1));
                if (nextMotion != null) {
                    if (!(nextMotion.getMotionSts() == MotionStsType.INIT.val() || nextMotion.getMotionSts() == MotionStsType.WAITING.val())) {
                        continue;//下一条动作已经被执行，不允许再执行后续动作
                    }
                }
            }



            Motion motion = motionService.selectOfTop1(task.getUuid(), MotionStsType.INIT.val(), task.getHostId());
            if (null != motion) {
                boolean result = this.executeMotion(motion);