#

luxiaotao1123

2024-04-10 83820ff6205f8a4502576f5cec48c911eb5f48a1

#

 zy-asrs-flow/src/pages/map/drawer/shuttle/view.jsx

@@ -27,20 +27,26 @@
    }
})



const ShuttleView = (props) => {
    const intl = useIntl();
    const { styles } = useStyles();

    const { data } = props;
    const [loading, setLoading] = React.useState(false);
    const [info, setInfo] = React.useState(null);

    useEffect(() => {
        setLoading(true);

        setTimeout(() => {

        const fetchShuttleInfo = async (shuttleNo) => {
            const res = await Http.doGet('/api/map/shuttle/info', { shuttleNo: shuttleNo });
            if (res?.data) {
                setInfo(res.data);
            }
            setLoading(false);
        }, 300)
        }
        fetchShuttleInfo(data.no);
    }, [data]);

    return (
@@ -60,6 +66,11 @@
                                [
                                    {
                                        key: '1',
                                        label: intl.formatMessage({ id: 'map.conveyor.no', defaultMessage: '穿梭车编号' }),
                                        children: info?.shuttleNo,
                                    },
                                    {
                                        key: '1',
                                        label: intl.formatMessage({ id: 'map.loc.no', defaultMessage: '库位号' }),
                                        children: <Badge status="processing" text="Running" />,
                                    },

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/MapController.java

@@ -45,6 +45,12 @@
        return R.ok().add(mapService.getShelfLocNoList(locNo));
    }

    // 穿梭车 --------------------------------------------------------
    @GetMapping("/shuttle/info")
    public R shuttleInfo(@RequestParam String shuttleNo) {
        return R.ok().add(mapService.getShuttleInfo(shuttleNo));
    }


    // 输送线 - 库位 --------------------------------------------------------
//    @GetMapping("/conveyor/plc/list")

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/result/ShuttleVo.java

New file
@@ -0,0 +1,13 @@
package com.zy.asrs.wcs.core.map.controller.result;

import lombok.Data;

/**
 * Created by vincent on 3/29/2024
 */
@Data
public class ShuttleVo {

    private String shuttleNo;

}

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/service/MapService.java

@@ -8,6 +8,7 @@
import com.zy.asrs.wcs.core.map.controller.param.MapDataParam;
import com.zy.asrs.wcs.core.map.controller.param.MapQueryParam;
import com.zy.asrs.wcs.core.map.controller.result.LocVo;
import com.zy.asrs.wcs.core.map.controller.result.ShuttleVo;
import com.zy.asrs.wcs.core.utils.Utils;
import com.zy.asrs.wcs.system.entity.Dict;
import com.zy.asrs.wcs.system.service.DictService;
@@ -91,6 +92,13 @@
        return locVos;
    }

    public ShuttleVo getShuttleInfo(String shuttleNo) {
        ShuttleVo vo = new ShuttleVo();
        vo.setShuttleNo(shuttleNo);

        return vo;
    }

    private String getMapKey(Integer floor) {
        if (null != floor) {
            return "map-" + floor;