#

vincentlu

2025-12-16 6c8b7680bb4c5164a02c088fe1eb282670e107a9

#

 zy-acs-flow/src/map/areaSettings/AreaBasicTab.jsx

@@ -34,6 +34,10 @@
        return option?.uuid ?? '';
    };

    const checkoutAgvNo = (agvId) => {
        return "1"
    }

    const getOptionId = (option) => {
        return option?.id;
    };
@@ -81,7 +85,9 @@
                    options={agvOptions || []}
                    value={agvList || []}
                    getOptionLabel={getOptionLabel}
                    isOptionEqualToValue={(option, value) => getOptionId(option) === getOptionId(value)}
                    isOptionEqualToValue={(option, value) => {
                        return getOptionId(option) === value;
                    }}
                    onChange={(event, newValue) => {
                        setAgvList(newValue);
                    }}
@@ -89,8 +95,8 @@
                        value.map((option, index) => (
                            <Chip
                                {...getTagProps({ index })}
                                key={getOptionId(option)}
                                label={getOptionLabel(option)}
                                key={index}
                                label={checkoutAgvNo(option)}
                                size="small"
                                sx={{ mr: 0.5, fontWeight: 'bold' }}
                            />

 zy-acs-flow/src/map/areaSettings/index.jsx

@@ -20,6 +20,8 @@
import { getAreaInfo, fetchAgvListAll, updateAreaData, removeArea } from '../http';

const getAgvOptionId = (option) => {
    // console.log(option);

    if (typeof option === 'string') {
        return option;
    }
@@ -96,6 +98,8 @@

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

            setName(curAreaInfo.name || '');
            setCode(curAreaInfo.code || '');
            setMaxCount(curAreaInfo.maxCount ?? '');
@@ -104,11 +108,11 @@
            setPriority(curAreaInfo.priority ?? '');

            const selected = curAreaInfo.agvList || [];
            const normalizedSelection = mapSelectionToOptions(selected, agvOptions);
            setAgvList(normalizedSelection);
            // const normalizedSelection = mapSelectionToOptions(selected, agvOptions);
            setAgvList(selected);
            setInitialBasic({
                name: curAreaInfo.name || '',
                agvIds: normalizedSelection.map(getAgvOptionId)
                agvIds: selected
            });

            const codes = curAreaInfo.codeList || [];
@@ -130,13 +134,16 @@
            name,
            agvIds: agvList.map(getAgvOptionId),
        };
        const success = await updateAreaData(payload);
        if (success) {
            setInitialBasic({
                name,
                agvIds: payload.agvIds,
            });
            fetchAreaInfo(id);
        const data = await updateAreaData(payload);
        if (data) {
            console.log(data);

            setCurAreaInfo(data);
            // setInitialBasic({
            //     name,
            //     agvIds: payload.agvIds,
            // });
            // fetchAreaInfo(id);
        }
    };


 zy-acs-flow/src/map/http.js

@@ -434,17 +434,17 @@
export const updateAreaData = async (payload = {}) => {
    try {
        const res = await request.post('/map/area/update', payload);
        const { code, msg } = res.data;
        const { code, msg, data } = res.data;
        if (code === 200) {
            notify.success?.(msg);
            return true;
            notify.success(msg);
            return data;
        }
        notify?.error?.(msg);
        notify.error(msg);
    } catch (error) {
        notify.error(error.message);
        console.error(error.message);
    }
    return false;
    return null;
};

export const removeArea = async (areaId) => {

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/AreaService.java

@@ -2,12 +2,13 @@

import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.acs.manager.manager.controller.param.MapAreaParam;
import com.zy.acs.manager.manager.controller.result.MapAreaResult;
import com.zy.acs.manager.manager.entity.Area;

public interface AreaService extends IService<Area> {

    Area saveMapArea(MapAreaParam param, Long loginUserId);

    Area modifyMapArea(MapAreaParam param, Long loginUserId);
    MapAreaResult modifyMapArea(MapAreaParam param, Long loginUserId);

}

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AreaServiceImpl.java

@@ -7,6 +7,7 @@
import com.zy.acs.manager.common.domain.AreaShapeDto;
import com.zy.acs.manager.core.service.AreaGovernService;
import com.zy.acs.manager.manager.controller.param.MapAreaParam;
import com.zy.acs.manager.manager.controller.result.MapAreaResult;
import com.zy.acs.manager.manager.entity.Area;
import com.zy.acs.manager.manager.entity.AreaAgv;
import com.zy.acs.manager.manager.enums.StatusType;
@@ -71,7 +72,7 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public Area modifyMapArea(MapAreaParam param, Long loginUserId) {
    public MapAreaResult modifyMapArea(MapAreaParam param, Long loginUserId) {
        Long areaId = param.getId();
        Area area = this.getById(areaId);

@@ -101,7 +102,7 @@
            }
        }

        return area;
        return new MapAreaResult().sync(area);
    }

}