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

skyouc

2025-04-03 7f26038db785f902097422bfeaccfd52767fc7e1

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

 rsf-admin/src/i18n/zh.js

@@ -311,9 +311,9 @@
            },
            warehouseAreas: {
                uuid: "唯一编码",
                name: "名称",
                name: "库区名称",
                wareId: "所属仓库",
                code: "编码",
                code: "库区编码",
                shipperId: "货主",
                supplierId: "供应商",
                flagMinus: "允许负库存",
@@ -342,7 +342,7 @@
            loc: {
                warehouseId: "所属仓库",
                areaId: "所属库区",
                code: "编码",
                code: "库位编码",
                type: "库位类型",
                name: "名称",
                flagLogic: "虚拟库位",

 rsf-admin/src/page/asnOrder/AsnOrderPanel.jsx

@@ -49,7 +49,8 @@
        },
        {
            field: 'asnCode',
            headerName: translate('table.field.asnOrderItem.asnCode')
            headerName: translate('table.field.asnOrderItem.asnCode'),
            width: 150,
        },
        {
            field: 'poDetlId',
@@ -61,7 +62,8 @@
        },
        {
            field: 'matnrCode',
            headerName: translate('table.field.asnOrderItem.matnrCode')
            headerName: translate('table.field.asnOrderItem.matnrCode'),
            width: 150,
        },
        {
            field: 'maktx',

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

@@ -152,9 +152,12 @@


                            <Grid item xs={4}>
                                <ReferenceArrayInput source="typeIds" reference="dictData" filter={{}}>
                                    <SelectArrayInput label="table.field.loc.type" onChange={(e) => handleChange(e.target.value, 'typeIds')} validate={[required()]} />
                                <ReferenceArrayInput source="typeIds" reference="locType" >
                                    <SelectArrayInput label="table.field.loc.type" validate={[required()]} onChange={(e) => handleChange(e.target.value, 'typeIds')} />
                                </ReferenceArrayInput>
                                {/* <ReferenceArrayInput source="typeIds" reference="dictData" filter={{}}>
                                    <SelectArrayInput label="table.field.loc.type" onChange={(e) => handleChange(e.target.value, 'typeIds')} validate={[required()]} />
                                </ReferenceArrayInput> */}
                            </Grid>

                            <Grid item xs={4}>

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

@@ -87,7 +87,6 @@

const filters = [
    <SearchInput source="condition" alwaysOn />,

    <ReferenceInput
        source="warehouseId"
        label="table.field.loc.warehouseId"

 rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx

@@ -63,7 +63,17 @@

const filters = [
    <SearchInput source="condition" alwaysOn />,
    <TextField source="warehouseId" label="table.field.warehouseAreas.wareId" />,
    <ReferenceInput
        source="warehouseId"
        label="table.field.loc.warehouseId"
        reference="warehouse"
    >
        <AutocompleteInput
            label="table.field.loc.warehouseId"
            optionText="name"
            filterToQuery={(val) => ({ name: val })}
        />
    </ReferenceInput>,
    <TextInput source="uuid" label="table.field.warehouseAreas.uuid" />,
    <TextInput source="name" label="table.field.warehouseAreas.name" />,
    <TextInput source="code" label="table.field.warehouseAreas.code" />,
@@ -122,7 +132,7 @@
                title={"menu.warehouseAreas"}
                empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
                filters={filters}
                sort={{ field: "create_time", order: "desc" }}
                sort={{ field: "warehouseId", order: "desc" }}
                actions={(
                    <TopToolbar>
                        <FilterButton />