#

luxiaotao1123

2024-10-17 f5a92e88504ab10c55f7ba864456f76666d08ab8

#

 zy-acs-flow/src/i18n/en.js

@@ -398,6 +398,8 @@
                workDistance: "mileage",
                backpack: "backpack",
                password: "password",
                online: 'online',
                task: 'task',
            },
            actionSts: {
                uuid: "uuid",
@@ -641,6 +643,9 @@
                save: 'Save Map',
                clear: 'Clear Map',
                adapt: 'ADAPT',
                disable: 'DISABLE',
                enable: 'ENABLE',
                reset: 'RESET',
            },
            mode: {
                observer: 'OBSERVER',

 zy-acs-flow/src/i18n/zh.js

@@ -397,6 +397,8 @@
                workDistance: "累计里程",
                backpack: "背篓",
                password: "密码",
                online: '在线',
                task: '任务',
            },
            actionSts: {
                uuid: "编号",
@@ -640,6 +642,9 @@
                save: '保存地图',
                clear: '清空地图',
                adapt: '适配',
                disable: '禁用',
                enable: '启用',
                reset: '重置',
            },
            mode: {
                observer: '观察模式',

 zy-acs-flow/src/map/insight/agv/AgvMain.jsx

@@ -13,6 +13,8 @@
} from '@mui/material';
import AgvThree from './AgvThree';
import { getAgvInfo } from '../../http';
import BoolValueIcon from '../BoolValueIcon';
import ConfirmButton from '../../../page/components/ConfirmButton';

let three;

@@ -91,8 +93,7 @@

    useEffect(() => {
        if (info) {
            console.log(info);

            // console.log(info);
            endThree();
            setLoading(true);
            setTimeout(() => {
@@ -138,44 +139,55 @@
                    <Box>
                        <Grid container spacing={2} style={{ marginTop: '0px' }}>
                            <Grid item xs={12}>
                                <KeyValuePair label={translate('table.field.agv.uuid')} value={info?.uuid || 'N/A'} />
                                <KeyValuePair label={translate('table.field.agv.uuid')} value={info?.agvNo} />
                            </Grid>
                            <Grid item xs={12}>
                                <KeyValuePair label={translate('table.field.loc.row')} value={info?.row || 'N/A'} />
                                <KeyValuePair label={translate('table.field.agvDetail.online')} value={info?.online} bool />
                            </Grid>
                            <Grid item xs={12}>
                                <KeyValuePair label={translate('table.field.loc.bay')} value={info?.bay || 'N/A'} />
                                <KeyValuePair label={translate('table.field.agvDetail.pos')} value={info?.pos} bool />
                            </Grid>
                            <Grid item xs={12}>
                                <KeyValuePair label={translate('table.field.loc.lev')} value={info?.lev || 'N/A'} />
                                <KeyValuePair label={translate('common.field.status')} value={info?.agvStatus} />
                            </Grid>
                            <Grid item xs={12}>
                                <KeyValuePair label={translate('table.field.loc.offset')} value={info?.offset || 'N/A'} />
                                <KeyValuePair label={translate('table.field.agvDetail.vol')} value={info?.vol} />
                            </Grid>
                            <Grid item xs={12}>
                                <KeyValuePair label={translate('table.field.loc.locSts')} value={info?.locSts$ || 'N/A'} />
                                <KeyValuePair label={translate('table.field.agvDetail.soc')} value={info?.soc} />
                            </Grid>
                            <Grid item xs={12}>
                                <KeyValuePair label={translate('table.field.loc.zoneId')} value={info?.zoneId$ || 'N/A'} />
                                <KeyValuePair label={translate('table.field.agvDetail.agvAngle')} value={info?.direction} />
                            </Grid>
                            <Grid item xs={12}>
                                <KeyValuePair label={translate('table.field.loc.code')} value={info?.code$ || 'N/A'} />
                                <KeyValuePair label={translate('table.field.agvDetail.backpack')} value={info?.backpack.filter(item => item.loaded === true).length} />
                            </Grid>
                            <Grid item xs={12}>
                                <KeyValuePair label={translate('table.field.agvDetail.task')} value={info?.taskIds?.join(',')} />
                            </Grid>
                        </Grid>
                    </Box>

                    <Grid container spacing={2} style={{ marginTop: '0px' }}>
                        <Grid item xs={12}>
                            <Typography variant="subtitle1">
                                {translate('common.field.opt')}
                            </Typography>
                            <Stack spacing={2} mt={2}>
                                <Button variant="contained" fullWidth>
                                    {translate('page.map.insight.shelf.updateStatus')}
                                </Button>
                                <Button variant="contained" color="error" disabled={info?.locStsEl !== 'STOCK'} fullWidth>
                                    {translate('page.map.insight.shelf.outbound')}
                                </Button>
                                <ConfirmButton
                                    label="page.map.action.reset"
                                    color="info"
                                    variant="contained"
                                    onConfirm={() => {
                                        alert(1)
                                    }}
                                />
                                {info && (
                                    info.status === 1
                                        ? <Button variant="contained" color="error" fullWidth>
                                            {translate('page.map.action.disable')}
                                        </Button>
                                        : <Button variant="contained" fullWidth>
                                            {translate('page.map.action.enable')}
                                        </Button>
                                )}
                            </Stack>
                        </Grid>
                    </Grid>
@@ -185,24 +197,33 @@
    );
}

const KeyValuePair = ({ label, value }) => (
    <>
        <Stack direction="row" alignItems="center" spacing={1} sx={{ mb: 1 }}>
            <Typography
                variant="body2"
                sx={{ width: '80px', fontWeight: 'bold', color: 'text.secondary', textAlign: 'left' }}
            >
                {label}:
            </Typography>
            <Typography
                variant="body2"
                sx={{ flexGrow: 1, color: 'text.primary', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis' }}
            >
                {value}
            </Typography>
        </Stack>
        <Divider />
    </>
);
const KeyValuePair = ({ label, value, bool }) => {
    console.log({ label, value, bool });

    return (
        <>
            <Stack direction="row" alignItems="center" spacing={1} sx={{ mb: 1 }}>
                <Typography
                    variant="body2"
                    sx={{ width: '80px', fontWeight: 'bold', color: 'text.secondary', textAlign: 'left' }}
                >
                    {label}:
                </Typography>
                {bool
                    ? <BoolValueIcon
                        value={value}
                    />
                    : <Typography
                        variant="body2"
                        sx={{ flexGrow: 1, color: 'text.primary', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis' }}
                    >
                        {value}
                    </Typography>
                }
            </Stack>
            <Divider />
        </>
    )
};

export default AgvMain;

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MissionAssignService.java

@@ -43,7 +43,7 @@

        Agv hit = null;

        List<Agv> agvList = agvService.list(new LambdaQueryWrapper<>());
        List<Agv> agvList = agvService.list(new LambdaQueryWrapper<Agv>().eq(Agv::getStatus, 1));
        Collections.shuffle(agvList);
        for (Agv agv : agvList) {
            AgvModel agvModel = agvModelService.getById(agv.getAgvModel());

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java

@@ -136,12 +136,13 @@
        AgvDetail agvDetail = agvDetailService.selectByAgvNo(agvNo);
        MapAgvVo vo = new MapAgvVo();
        vo.setAgvNo(agv.getUuid());
        vo.setStatus(agv.getStatus());
        if (null != agvDetail) {
            vo.setOnline(agvService.judgeOnline(agvDetail.getAgvId()));
            vo.setAgvStatus(agvDetail.getStatusDesc());
            vo.setVol(String.valueOf(agvDetail.getVol()));
            vo.setSoc(String.valueOf(agvDetail.getSoc()));
            vo.setPos(String.valueOf(agvDetail.getPos()));
            vo.setPos(agvDetail.getPos() != null && agvDetail.getPos() == 1);
            vo.setCode(codeService.getById(agvDetail.getRecentCode()).getData());
            vo.setDirection(agvDetail.getAgvAngle());
            vo.setBackpack(GsonUtils.fromJsonToList(agvDetail.getBackpack(), BackpackDto.class));

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MapAgvVo.java

@@ -14,6 +14,8 @@

    private String agvNo;

    private Integer status;

    private Boolean online = Boolean.FALSE;

    private String agvStatus = "-";
@@ -22,7 +24,7 @@

    private String soc = "-";

    private String pos = "-";
    private Boolean pos = Boolean.FALSE;

    private String code = "-";