#
vincentlu
2026-03-25 2ad0e05e28227b88e0983fbc8a313cb7818de726
#
7个文件已修改
22 ■■■■ 已修改文件
zy-acs-flow/src/page/agvModel/AgvModelCreate.jsx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-flow/src/page/agvModel/AgvModelEdit.jsx 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-hk/zy-acs-hk-latent/pom.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-hk/zy-acs-hk-latent/src/main/java/com/zy/acs/hk/latent/controller/HkMqttDemoController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TransferStationHandler.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/AgvModelService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvModelServiceImpl.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-flow/src/page/agvModel/AgvModelCreate.jsx
@@ -167,7 +167,7 @@
                                    <NumberInput
                                        label="table.field.agvModel.backpack"
                                        source="backpack"
                                        validate={required()}
                                        validate={[required(), minValue(1)]}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
zy-acs-flow/src/page/agvModel/AgvModelEdit.jsx
@@ -19,6 +19,7 @@
    required,
    useRecordContext,
    DeleteButton,
    minValue,
} from 'react-admin';
import { useWatch, useFormContext } from "react-hook-form";
import { Stack, Grid, Box, Typography } from '@mui/material';
@@ -132,6 +133,7 @@
                            <NumberInput
                                label="table.field.agvModel.backpack"
                                source="backpack"
                                validate={[required(), minValue(1)]}
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
zy-acs-hk/zy-acs-hk-latent/pom.xml
@@ -10,11 +10,11 @@
        <relativePath>../pom.xml</relativePath>
    </parent>
    <artifactId>zy-acs-hk-latent</artifactId>
    <artifactId>acs-hk-latent</artifactId>
    <version>1.0.0</version>
    <packaging>jar</packaging>
    <name>zy-acs-hk-latent</name>
    <name>hk-latent</name>
    <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
zy-acs-hk/zy-acs-hk-latent/src/main/java/com/zy/acs/hk/latent/controller/HkMqttDemoController.java
@@ -46,4 +46,5 @@
        result.put("message", message);
        return result;
    }
}
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/TransferStationHandler.java
@@ -26,6 +26,8 @@
    @Autowired
    private AgvService agvService;
    @Autowired
    private AgvModelService agvModelService;
    @Autowired
    private AgvDetailService agvDetailService;
    @Autowired
    private CodeService codeService;
@@ -44,6 +46,9 @@
            throw new NullPointerException("segment is null in hasDelayAtSta.");
        }
        Long agvId = currSeg.getAgvId();
        if (agvModelService.isSingleBasket(agvId)) {
            return false;
        }
        // 判断AGV是否在滚动输送线前
        Code currentCode = agvDetailService.getCurrentCode(agvId);
        if (null == currentCode) {
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/AgvModelService.java
@@ -11,4 +11,6 @@
    AgvModel getByAgvNo(String agvNo);
    Boolean isSingleBasket(Long agvId);
}
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvModelServiceImpl.java
@@ -63,4 +63,10 @@
        return agvModel;
    }
    @Override
    public Boolean isSingleBasket(Long agvId) {
        AgvModel model = this.getByAgvId(agvId);
        return model.getBackpack() <= 1;
    }
}