#

luxiaotao1123

2024-04-10 deb10b28cff67e731d0f6b268a91b9af5e76c3d9

#

 zy-asrs-flow/src/locales/en-US/map.ts

@@ -12,6 +12,18 @@
    '': '',
    '': '',
    'map.loc.no': 'Location Number',
    'map.task.no': 'Task Number',
    'map.device.status': 'Device Status',
    'map.origin.site': 'Origin Site',
    'map.origin.loc': 'Origin Location',
    'map.dest.site': 'Destination Site',
    'map.dest.loc': 'Destination Location',
    'map.error': 'Error',
    'map.pakmk': 'PakMk',
    '': '',
    '': '',
    '': '',
    '': '',
    'map.pallet.barcode': 'Pallet Barcode',
    'map.is.enable': 'Enable or Not',
    'map.loc.operation': 'Location Operation',
@@ -28,6 +40,13 @@
    '': '',
    '': '',
    'map.shuttle.no': 'Shuttle Number',
    'map.shuttle.current.code': 'Current Code',
    'map.shuttle.batter.power': 'Batter Power',
    'map.shuttle.batter.voltage': 'Batter Voltage',
    'map.shuttle.batter.temp': 'Batter Temperature',
    'map.shuttle.has.lift': 'Has Lift',
    'map.shuttle.has.pallet': 'Has Pallet',
    'map.shuttle.has.charge': 'Charging',
    '': '',
    '': '',
    '': '',

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

@@ -49,6 +49,10 @@
        fetchShuttleInfo(data.no);
    }, [data]);

    useEffect(() => {
        console.log(info);
    }, [info])

    return (
        <>
            <div className={styles.infoBox}>
@@ -59,18 +63,83 @@
                        <Descriptions
                            bordered
                            title=''
                            size='small'
                            layout="vertical"
                            size='middle'    // default | middle | small
                            layout="vertical"   // horizontal | vertical
                            column={3}
                            items={
                                [
                                    {
                                        key: '1',
                                        label: intl.formatMessage({ id: 'map.conveyor.no', defaultMessage: '穿梭车编号' }),
                                        label: intl.formatMessage({ id: 'map.shuttle.no', defaultMessage: '穿梭车编号' }),
                                        children: info?.shuttleNo,
                                    },
                                    {
                                        key: '1',
                                        label: intl.formatMessage({ id: 'map.task.no', defaultMessage: '任务号' }),
                                        children: info?.taskNo,
                                    },
                                    {
                                        key: '1',
                                        label: intl.formatMessage({ id: 'map.device.status', defaultMessage: '设备状态' }),
                                        children: info?.status,
                                    },
                                    {
                                        key: '1',
                                        label: intl.formatMessage({ id: 'map.origin.loc', defaultMessage: '起始库位' }),
                                        children: info?.originLocNo,
                                    },
                                    {
                                        key: '1',
                                        label: intl.formatMessage({ id: 'map.dest.loc', defaultMessage: '目标库位' }),
                                        children: info?.destLocNo,
                                    },
                                    {
                                        key: '1',
                                        label: intl.formatMessage({ id: 'map.shuttle.current.code', defaultMessage: '定位条码' }),
                                        children: info?.currentCode,
                                    },
                                    {
                                        key: '1',
                                        label: intl.formatMessage({ id: 'map.shuttle.batter.power', defaultMessage: '电池电量' }),
                                        children: info?.batteryPower,
                                    },
                                    {
                                        key: '1',
                                        label: intl.formatMessage({ id: 'map.shuttle.batter.voltage', defaultMessage: '电池电压' }),
                                        children: info?.batteryVoltage,
                                    },
                                    {
                                        key: '1',
                                        label: intl.formatMessage({ id: 'map.shuttle.batter.temp', defaultMessage: '电池温度' }),
                                        children: info?.batteryTemp,
                                    },
                                    {
                                        key: '1',
                                        label: intl.formatMessage({ id: 'map.shuttle.has.lift', defaultMessage: '顶升信号' }),
                                        children: info?.hasLift,
                                    },
                                    {
                                        key: '1',
                                        label: intl.formatMessage({ id: 'map.shuttle.has.pallet', defaultMessage: '托盘信号' }),
                                        children: info?.hasPallet,
                                    },
                                    {
                                        key: '1',
                                        label: intl.formatMessage({ id: 'map.shuttle.has.charge', defaultMessage: '充电信号' }),
                                        children: info?.hasCharge,
                                    },
                                    {
                                        key: '1',
                                        label: intl.formatMessage({ id: 'map.error', defaultMessage: '异常信号' }),
                                        children: info?.errorCode,
                                    },
                                    {
                                        key: '1',
                                        label: intl.formatMessage({ id: 'map.pakmk', defaultMessage: '作业标记' }),
                                        children: info?.pakMk,
                                    },
                                    {
                                        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/result/ShuttleVo.java

@@ -8,6 +8,32 @@
@Data
public class ShuttleVo {

    private String shuttleNo;
    private String shuttleNo = "-";

    private String taskNo = "-";

    private String status = "-";

    private String originLocNo = "-";

    private String destLocNo = "-";

    private String currentCode = "-";

    private String batteryPower = "-";

    private String batteryVoltage = "-";

    private String batteryTemp = "-";

    private Boolean hasLift = false;

    private Boolean hasPallet = false;

    private Boolean hasCharge = false;

    private String errorCode = "-";

    private Boolean pakMk = false;

}

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

@@ -10,6 +10,7 @@
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.rcs.model.protocol.ShuttleProtocol;
import com.zy.asrs.wcs.system.entity.Dict;
import com.zy.asrs.wcs.system.service.DictService;
import com.zy.asrs.wcs.system.service.UserService;
@@ -95,7 +96,21 @@
    public ShuttleVo getShuttleInfo(String shuttleNo) {
        ShuttleVo vo = new ShuttleVo();
        vo.setShuttleNo(shuttleNo);

        ShuttleProtocol protocol = new ShuttleProtocol();
        // todo checkout protocol
//        vo.setTaskNo(String.valueOf(protocol.getTaskNo()));
//        vo.setStatus(protocol.getProtocolStatusType().desc);
//        vo.setOriginLocNo(protocol.getSourceLocNo());
//        vo.setDestLocNo(protocol.getLocNo());
//        vo.setCurrentCode(protocol.getCurrentCode());
//        vo.setBatteryPower(protocol.getBatteryPower());
//        vo.setErrorCode(protocol.getErrorCode());
//        vo.setBatteryTemp(protocol.getBatteryTemp());
//        vo.setHasLift(protocol.getHasLift());
//        vo.setHasPallet(protocol.getHasPallet());
//        vo.setHasCharge(protocol.getHasCharge());
//        vo.setBatteryVoltage(String.valueOf(protocol.getBatteryVoltage()));
//        vo.setPakMk(protocol.getPakMk());
        return vo;
    }