#
luxiaotao1123
2024-09-20 36891e38d98ea90a0a84cf2624255098d1ad383d
#
2个文件已修改
21 ■■■■ 已修改文件
zy-acs-flow/src/page/agv/AgvListFilter.jsx 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/resources/mapper/manager/AgvMapper.xml 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-flow/src/page/agv/AgvListFilter.jsx
@@ -6,9 +6,7 @@
    useTranslate,
} from 'react-admin';
import { Box } from '@mui/material';
import BusinessIcon from '@mui/icons-material/Business';
import LocalShippingIcon from '@mui/icons-material/LocalShipping';
import SupervisorAccountIcon from '@mui/icons-material/SupervisorAccount';
import CommuteIcon from '@mui/icons-material/Commute';
import FiberManualRecordIcon from '@mui/icons-material/FiberManualRecord';
import request from '@/utils/request'
@@ -37,7 +35,19 @@
                <FilterListItem label="common.enums.false" value={{ pos: '0' }} />
            </FilterList>
            <FilterList label="Sector" icon={<LocalShippingIcon />}>
            <FilterList
                label={translate('table.field.agv.agvModel')}
                icon={<CommuteIcon />}
            >
                {models.map(model => {
                    return (
                        <FilterListItem
                            key={model.id}
                            label={`${model.name}`}
                            value={{ agvModel: model.id }}
                        />
                    )
                })}
            </FilterList>
        </Box>
zy-acs-manager/src/main/resources/mapper/manager/AgvMapper.xml
@@ -16,6 +16,9 @@
        <if test="param.pos != null">
            AND mad.pos = #{param.pos}
        </if>
        <if test="param.agvModel != null">
            AND ma.agv_model = #{param.agvModel}
        </if>
        order by ma.uuid asc
    </select>