Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

2025-05-30 6a33ccb0568d490f31c4ce08f97846de249f25be

 rsf-admin/src/page/work/stockTransfer/stockTransferList.jsx

@@ -75,19 +75,47 @@
    tableRef.current = useGridApiRef();
    const translate = useTranslate();

    const [orgLoc, setOrgLoc] = useState([]);
    const [tarLoc, setTarLoc] = useState([]);
    const [orgLoc, setOrgLoc] = useState("");
    const [tarLoc, setTarLoc] = useState("");
    const [tarLocList, setTarLocList] = useState([]);

    useEffect(() => {
        selectAreaNoUse();
        if (orgLoc === "" || orgLoc.length < 7) {
            return;
        }
        selectLocItem().then((is) => {            
            if (is) {
                selectAreaNoUse();
            }

        });
    },[orgLoc])


    const selectLocItem = async() =>{
        const {
            data: { code, data, msg },
        } = await request.post("/locItem/useO/page",{
            locCode: orgLoc,
            current: 1,
            pageSize: 100,
            orderBy: "create_time desc"
        });
        if (code === 200) {
            if(data.total !== 0) {                
                setTableData(data.records);  
                return true;
            }
              
        }
        return false;  
    }

    const selectAreaNoUse = async() =>{
        const {
            data: { code, data, msg },
        } = await request.post("/loc/areaNoUse/list",{

            locCode: orgLoc            
        });
        if (code === 200) {
            const newData = data.map((item) => {
@@ -154,7 +182,8 @@
                                <Stack direction='row' spacing={2} minWidth={200}>
                                    <SubmitButton
                                        orgLoc={orgLoc}
                                        tarLoc={tarLoc}                                        
                                        tarLoc={tarLoc} 
                                        tabelData={tabelData}                                       
                                    />
                                </Stack>
                            </Box>
@@ -185,17 +214,21 @@
    const notify = useNotify();
    const redirect = useRedirect();
    const refresh = useRefresh();
    const { orgLoc, tarLoc } = props;
    const { orgLoc, tarLoc, tabelData } = props;
    const move = () => {
        console.log(orgLoc, tarLoc);
        if (orgLoc === "" || orgLoc === undefined || orgLoc === null) {
            notify("请选择站点");
            notify("请输入源库位");
            return;
        }
        if (tarLoc === "" || tarLoc === undefined || tarLoc === null) {
            notify("请选择站点");
        // if (tarLoc === "" || tarLoc === undefined || tarLoc === null) {
        //     notify("请输入目标库位");
        //     return;
        // }   
        if (tabelData.length === 0) {
            notify("源库位明细无，请检查库位状态");
            return;
        }        
        }     
        http(orgLoc, tarLoc?.id)
    }
    const http = async (orgLoc, tarLoc) => {
@@ -308,7 +341,7 @@
                flex: 1,
                editable: false
            }))
            setColumns([...columns, ...cols, action])
            setColumns([...columns, ...cols])
        } else {
            notify(msg);
        }
@@ -340,7 +373,8 @@
            <DataGrid
                apiRef={tableRef}
                rows={tabelData}
                columns={columns}
                columns={columns}                
                checkboxSelection = {false}
                disableRowSelectionOnClick
                getRowId={(row) => row.matnrId ? row.matnrId : row.id}
                disableColumnFilter
@@ -356,8 +390,7 @@
                    },
                }}
                pageSizeOptions={[10, 25, 50, 100]}
                editMode="row"
                checkboxSelection
                editMode="row"                
                onRowSelectionModelChange={handleSelectionChange}
                selectionModel={selectedRows}
                sx={{