#

Junjie

2024-06-22 62f1b31c5de20f02bc89684937c0d4f3ec3d2c82

#

 zy-asrs-flow/src/pages/map/index.jsx

@@ -1,7 +1,7 @@
import * as React from 'react'
import * as TWEEDLE from 'tweedle.js';
import { FormattedMessage, useIntl, useModel } from '@umijs/max';
import { Layout, Button, Flex, Row, Col, FloatButton, Select, notification, Segmented, message } from 'antd';
import { Layout, Button, Flex, Row, Col, FloatButton, Select, notification, Segmented, message, Popconfirm } from 'antd';
const { Header, Content } = Layout;
import {
    AppstoreAddOutlined,
@@ -250,6 +250,10 @@
    }, [curSprite]);
    const prevCurSprite = prevCurSpriteRef.current;

    const clearLockPathConfirm = (e) => {
        clearLockPath(curFloor);
    };

    const clearLockPath = async (floor) => {
        const hide = message.loading(intl.formatMessage({ id: 'page.clearing', defaultMessage: '正在清空' }));
        try {
@@ -345,15 +349,21 @@

                                {model === MapModel.OBSERVER_MODEL && (
                                    <>
                                        <Button
                                            className='map-header-button'
                                            size={'large'}
                                            onClick={() => {
                                                clearLockPath(curFloor)
                                            }}
                                        <Popconfirm
                                            title="清空路径"
                                            description="此操作可能导致小车碰撞，确认清空路径吗？"
                                            onConfirm={clearLockPathConfirm}
                                            okText="确认"
                                            cancelText="取消"
                                        >
                                            <FormattedMessage id='map.clearLockPath' defaultMessage='清空路径' />
                                        </Button>
                                            <Button
                                                className='map-header-button'
                                                size={'large'}
                                            >
                                                <FormattedMessage id='map.clearLockPath' defaultMessage='清空路径' />
                                            </Button>
                                        </Popconfirm>


                                        <Button
                                            className='map-header-button'

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/domain/dto/MotionDto.java

@@ -29,6 +29,9 @@

    protected Integer wrkNo;

    //同步 1: 是  0: 否
    private Integer sync;

    public static MotionDto build(BuildSupport<MotionDto> support) {
        MotionDto dto = new MotionDto();


 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java

@@ -634,6 +634,7 @@
                            dto.setLiftNo(transferLiftDevice.getId().intValue());
                            dto.setLev(5);//索牌项目5层是输送线层
                            dto.setStaNo(1);//提升机左侧
                            dto.setSync(0);//异步执行
                        }))
                ));

@@ -892,6 +893,7 @@
                            dto.setLiftNo(transferLiftDevice.getId().intValue());
                            dto.setLev(5);//索牌项目5层是输送线层
                            dto.setStaNo(1);//提升机左侧
                            dto.setSync(0);//异步执行
                        }))
                ));


 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/KernelService.java

@@ -84,6 +84,10 @@
            }
            motion.setTarget(String.valueOf(liftDispatcher.getLiftLevOffset(target.getLiftNo(), target.getLev())));
            motion.setTarDrt(target.getStaNo());//目标站

            if (target.getSync() != null) {
                motion.setSync(target.getSync());
            }
        }));

        return motionList;

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

@@ -48,7 +48,9 @@
        for (Task task : taskService.selectByAnalyzeSts()) {
            Motion executingMotion = motionService.selectOfTop1(task.getUuid(), MotionStsType.EXECUTING.val(), task.getHostId());
            if (executingMotion != null) {//存在正在执行的motion
                continue;
                if (executingMotion.getSync() == 1) {//当前执行中的动作是同步动作，等待执行完成后再执行下一个动作
                    continue;
                }
            }

            Motion motion = motionService.selectOfTop1(task.getUuid(), MotionStsType.INIT.val(), task.getHostId());
@@ -112,7 +114,9 @@
        for (Task taskCharge : taskService.selectChargeByAnalyzeSts()) {
            Motion executingMotion = motionService.selectOfTop1(taskCharge.getUuid(), MotionStsType.EXECUTING.val(), taskCharge.getHostId());
            if (executingMotion != null) {//存在正在执行的motion
                continue;
                if (executingMotion.getSync() == 1) {//当前执行中的动作是同步动作，等待执行完成后再执行下一个动作
                    continue;
                }
            }

            Motion motion = motionService.selectOfTop1(taskCharge.getUuid(), MotionStsType.INIT.val(), taskCharge.getHostId());
@@ -175,7 +179,9 @@
        for (Task task : taskService.selectManualByAnalyzeSts()) {
            Motion executingMotion = motionService.selectOfTop1(task.getUuid(), MotionStsType.EXECUTING.val(), task.getHostId());
            if (executingMotion != null) {//存在正在执行的motion
                continue;
                if (executingMotion.getSync() == 1) {//当前执行中的动作是同步动作，等待执行完成后再执行下一个动作
                    continue;
                }
            }

            Motion motion = motionService.selectOfTop1(task.getUuid(), MotionStsType.INIT.val(), task.getHostId());
@@ -232,7 +238,9 @@
        for (Task task : taskService.selectMoveByAnalyzeSts()) {
            Motion executingMotion = motionService.selectOfTop1(task.getUuid(), MotionStsType.EXECUTING.val(), task.getHostId());
            if (executingMotion != null) {//存在正在执行的motion
                continue;
                if (executingMotion.getSync() == 1) {//当前执行中的动作是同步动作，等待执行完成后再执行下一个动作
                    continue;
                }
            }

            Motion motion = motionService.selectOfTop1(task.getUuid(), MotionStsType.INIT.val(), task.getHostId());