Merge remote-tracking branch 'origin/Four-Way-Rack' into Four-Way-Rack

zjj

2024-06-18 da6ffd9b8d9687f8fb876e194da597c02f25f588

 zy-asrs-flow/src/pages/device/shuttle/index.jsx

@@ -12,7 +12,13 @@
    const [ws, setWs] = useState(null);
    const [openOpera, setOpenOpera] = useState(false);
    const [currentData, setCurrentData] = useState(null);
    const [sourceLoc, setSourceLoc] = useState("");
    const [targetLoc, setTargetLoc] = useState("");
    const [xStart, setXStart] = useState(1);
    const [xTarget, setXTarget] = useState(1);
    const [yStart, setYStart] = useState(1);
    const [yTarget, setYTarget] = useState(1);
    const [moveLocType, setMoveLocType] = useState(1);

    useEffect(() => {
        var newWs = new WebSocket("ws://127.0.0.1:9090/wcs/ws/shuttle/websocket");
@@ -83,6 +89,10 @@
        setOpenOpera(false);
    };

    const sourceLocChange = (e) => {
        setSourceLoc(e.target.value)
    }

    const targetLocChange = (e) => {
        setTargetLoc(e.target.value)
    }
@@ -93,12 +103,23 @@
                message.warning('请输入目标位置');
                return;
            }
        }else if(type == 'takeMove') {
            if (targetLoc == '') {
                message.warning('请输入目标位置');
                return;
            }

            if (sourceLoc == '') {
                message.warning('请输入起始位置');
                return;
            }
        }

        try {
            const resp = await Http.doPost('api/basShuttle/operator/shuttle', {
                shuttleNo: currentData.shuttleNo,
                shuttleTaskMode: type,
                sourceLocNo: sourceLoc,
                targetLocNo: targetLoc
            });
            if (resp.code === 200) {
@@ -112,6 +133,73 @@
            message.warning("请求失败");
            return false;
        }
    }

    const shuttleMoveLoc = async () => {
        if (xStart == '' || xTarget == '' || yStart == '' || yTarget == '') {
            message.warning('请输入参数');
            return;
        }

        try {
            const resp = await Http.doPost('api/basShuttle/moveLoc', {
                shuttleNo: currentData.shuttleNo,
                moveType: moveLocType,
                startX: xStart,
                targetX: xTarget,
                startY: yStart,
                targetY: yTarget,
            });
            if (resp.code === 200) {
                message.success("请求成功");
                return true;
            } else {
                message.warning(resp.msg);
                return false;
            }
        } catch (error) {
            message.warning("请求失败");
            return false;
        }
    }

    const shuttleMoveLocClose = async () => {
        try {
            const resp = await Http.doPost('api/basShuttle/moveLocClose', {
                shuttleNo: currentData.shuttleNo,
            });
            if (resp.code === 200) {
                message.success("请求成功");
                return true;
            } else {
                message.warning(resp.msg);
                return false;
            }
        } catch (error) {
            message.warning("请求失败");
            return false;
        }
    }


    const xStartChange = (e) => {
        setXStart(e.target.value)
    }

    const xTargetChange = (e) => {
        setXTarget(e.target.value)
    }

    const yStartChange = (e) => {
        setYStart(e.target.value)
    }

    const yTargetChange = (e) => {
        setYTarget(e.target.value)
    }

    const moveLocTypeChange = (e) => {
        setMoveLocType(e)
    }

    let codeContent = (<PageContainer
@@ -154,7 +242,7 @@
                    {
                        key: '6',
                        label: '错误码',
                        children: '0',
                        children: item.errorCode$,
                    },
                    {
                        key: '7',
@@ -186,6 +274,11 @@
                        label: '是否有托盘',
                        children: item.hasPallet ? 'Y' : 'N',
                    },
                    {
                        key: '13',
                        label: '自动',
                        children: item.mode ? 'Y' : 'N',
                    }
                ];
                return <div key={item.id} style={{ width: '45%' }}>
                    <div style={{ marginBottom: '10px' }}>
@@ -207,11 +300,19 @@
                    <div style={{ marginBottom: '15px' }}>
                        <Card title="移动指令" style={{ width: 300 }}>
                            <p>
                                <Input addonBefore="起始位置" onChange={sourceLocChange} />
                            </p>
                            <p>
                                <Input addonBefore="目标位置" onChange={targetLocChange} />
                            </p>
                            <p>
                                <Button onClick={() => shuttleOperator('moveLoc')}>移动到目标位置</Button>
                            </p>
                            <p>
                            </p>
                            <div className="commandItem">
                                <Button onClick={() => shuttleOperator('moveLoc')}>移动到目标位置</Button>
                                <Button onClick={() => shuttleOperator('takeMove')}>取放货作业</Button>
                            </div>
                        </Card>
                    </div>

@@ -230,18 +331,20 @@
                    <div style={{ marginBottom: '15px' }}>
                        <Card title="跑库系统" style={{ width: 300 }}>
                            <div className="commandItem">
                                <div><Input addonBefore="X起点" defaultValue="1" /></div>
                                <div><Input addonBefore="X终点" defaultValue="1" /></div>
                                <div><Input addonBefore="Y起点" defaultValue="1" /></div>
                                <div><Input addonBefore="Y终点" defaultValue="1" /></div>
                                <div><Input addonBefore="X起点" defaultValue="1" onChange={xStartChange} /></div>
                                <div><Input addonBefore="X终点" defaultValue="1" onChange={xTargetChange} /></div>
                                <div><Input addonBefore="Y起点" defaultValue="1" onChange={yStartChange} /></div>
                                <div><Input addonBefore="Y终点" defaultValue="1" onChange={yTargetChange} /></div>
                                <div>
                                    <Select
                                        defaultValue="0"
                                        onChange={moveLocTypeChange}
                                        style={{ width: 120 }}
                                        options={[{ value: '0', label: '跑轨道' }, { value: '1', label: '跑库位' }, { value: '2', label: '母轨道循环跑' }, { value: '3', label: '子轨道循环跑' }]}
                                        options={[{ value: '0', label: '跑轨道' }, { value: '1', label: '跑库位' }, { value: '2', label: '母轨道循环跑' }, { value: '3', label: '子轨道循环跑' }, { value: '4', label: '取放货' }]}
                                    />
                                </div>
                                <Button>跑库</Button>
                                <Button onClick={() => shuttleMoveLoc()}>跑库</Button>
                                <Button onClick={() => shuttleMoveLocClose()}>跑库关闭</Button>
                            </div>
                        </Card>
                    </div>