zjj
4 天以前 804911a9eab796dac5f0d161070af62dbcda4bf1
#移库
2个文件已修改
48 ■■■■ 已修改文件
rsf-admin/src/page/work/stockTransfer/stockTransferList.jsx 44 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
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/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) => {
@@ -308,7 +336,7 @@
                flex: 1,
                editable: false
            }))
            setColumns([...columns, ...cols, action])
            setColumns([...columns, ...cols])
        } else {
            notify(msg);
        }
@@ -340,7 +368,8 @@
            <DataGrid
                apiRef={tableRef}
                rows={tabelData}
                columns={columns}
                columns={columns}
                checkboxSelection = {false}
                disableRowSelectionOnClick
                getRowId={(row) => row.matnrId ? row.matnrId : row.id}
                disableColumnFilter
@@ -356,8 +385,7 @@
                    },
                }}
                pageSizeOptions={[10, 25, 50, 100]}
                editMode="row"
                checkboxSelection
                editMode="row"
                onRowSelectionModelChange={handleSelectionChange}
                selectionModel={selectedRows}
                sx={{
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java
@@ -61,7 +61,9 @@
    @PreAuthorize("hasAuthority('manager:loc:list')")
    @PostMapping("/loc/areaNoUse/list")
    public R areaNoUselist(@RequestBody Map<String, Object> map) {
        List<Loc> list = locService.list();
        String locCode = map.get("locCode").toString();
        Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, locCode),false);
        List<Loc> list = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getAreaId, loc.getAreaId()));
        List<String> list1 = list.stream().map(obj -> obj.getCode()).collect(Collectors.toList());
        return R.ok(list1);
    }