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

skyouc

2025-04-18 60f974487c6212f4cf0604dcd69ef54196031c05

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

 rsf-admin/src/page/basicInfo/loc/InitModal.jsx

@@ -58,14 +58,15 @@
const InitModal = ({ open, setOpen }) => {
    const refresh = useRefresh();
    const translate = useTranslate();

    const {filterValues} = useListContext(); // 获取列表上下文   
    

    const notify = useNotify();
    const [disabled, setDisabled] = useState(false)

    const [formData, setFormData] = useState({
        "warehouseId": null,
        "areaId": undefined,
        "warehouseId": filterValues.warehouseId,
        "areaId": filterValues.areaId,
        "endBay": undefined,
        "endLev": undefined,
        "endRow": undefined,
@@ -109,7 +110,7 @@

    return (
        <Dialog open={open} maxWidth="md" fullWidth>
            <Form onSubmit={handleSubmit}>
            <Form onSubmit={handleSubmit} defaultValues={filterValues}>
                <DialogCloseButton onClose={handleClose} />
                <DialogTitle>{translate('toolbar.locInit')}</DialogTitle>
                <DialogContent sx={{ mt: 2 }}>
@@ -121,6 +122,7 @@
                                    reference="warehouse"
                                >
                                    <AutocompleteInput
                                        debounce
                                        label="table.field.loc.warehouseId"
                                        optionText="name"
                                        onChange={(value) => handleChange(value, 'warehouseId')}

 rsf-admin/src/page/basicInfo/loc/LocList.jsx

@@ -251,6 +251,10 @@
                    </WrapperField>

                </StyledDatagrid>
                <InitModal
                open={initDialog}
                setOpen={setInitDialog}
                />
            </List>
            <LocCreate
                open={createDialog}
@@ -262,11 +266,8 @@
                setDrawerVal={setDrawerVal}
            >
            </PageDrawer>

            <InitModal
                open={initDialog}
                setOpen={setInitDialog}
            />
            
            
        </Box>
    )
}

 rsf-admin/src/page/basicInfo/loc/LocListAside.jsx

@@ -67,7 +67,7 @@
        if (row.flagWare === 1) {
            setFilters({ warehouseId: row.id, areaId: '' });
        } else if (row.flagWare === 0) {
            setFilters({ areaId: row.id, warehouseId: '' });
            setFilters({ areaId: row.id, warehouseId: row.warehouseId });
        }

    };

 rsf-admin/src/page/orders/asnOrder/AsnOrderModal.jsx

@@ -318,7 +318,8 @@
        getOptions();
    }, []);
    const getOptions = async () => {        
        const parmas = {            
        const parmas = {    
            "type": "supplier"       
        }
        const {
            data: { code, data, msg },
@@ -361,7 +362,8 @@
        getOptions();
    }, []);
    const getOptions = async () => {        
        const parmas = {            
        const parmas = {    
            "type": "supplier"       
        }
        const {
            data: { code, data, msg },

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemLogController.java

@@ -1,6 +1,7 @@
package com.vincent.rsf.server.manager.controller;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
@@ -104,7 +105,10 @@
    @PreAuthorize("hasAuthority('manager:asnOrderItemLog:list')")
    @PostMapping("/asnOrderItemLog/export")
    public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
        ExcelUtil.build(ExcelUtil.create(asnOrderItemLogService.list(), AsnOrderItemLog.class), response);
        LambdaQueryWrapper<AsnOrderItemLog> itemLogLambdaQueryWrapper = new LambdaQueryWrapper<>();
        itemLogLambdaQueryWrapper.like(AsnOrderItemLog::getLogId, map.get("logId"));
        List<AsnOrderItemLog> list = asnOrderItemLogService.list(itemLogLambdaQueryWrapper);
        ExcelUtil.build(ExcelUtil.create(list, AsnOrderItemLog.class), response);
    }

}