rsf-admin/src/i18n/zh.js
@@ -633,7 +633,7 @@ }, asnOrderItem: { asnId: "主单标识", asnCode: "主单编码", asnCode: "单号", poDetlId: "PO单ID", poDetlCode: "PO单", platItemId: '行号', rsf-admin/src/page/orders/wave/WavePanel.jsx
@@ -1,85 +1,78 @@ import React, { useState, useRef, useEffect, useMemo } from "react"; import { Box, Card, CardContent, Grid, Typography, Tooltip } from '@mui/material'; import { useTranslate, List, DatagridConfigurable, useRecordContext, useTranslate, TextField, NumberField, DateField, BooleanField, ReferenceField, } from 'react-admin'; import PanelTypography from "../../components/PanelTypography"; import * as Common from '@/utils/common' import { styled } from '@mui/material/styles'; const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({ '& .css-1vooibu-MuiSvgIcon-root': { height: '.9em' }, '& .RaDatagrid-row': { cursor: 'auto' }, '& .column-name': { }, '& .opt': { width: 200 }, })); const WavePanel = () => { const record = useRecordContext(); if (!record) return null; const translate = useTranslate(); const [createDialog, setCreateDialog] = useState(false); const [drawerVal, setDrawerVal] = useState(false); return ( <> <Card sx={{ width: { xs: 300, sm: 500, md: 600, lg: 800 }, margin: 'auto' }}> <CardContent> <Grid container spacing={2}> <Grid item xs={12} sx={{ display: 'flex', justifyContent: 'space-between' }}> <Typography variant="h6" gutterBottom align="left" sx={{ maxWidth: { xs: '100px', sm: '180px', md: '260px', lg: '360px' }, whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', }}> {Common.camelToPascalWithSpaces(translate('table.field.wave.id'))}: {record.id} </Typography> {/* inherit, primary, secondary, textPrimary, textSecondary, error */} <Typography variant="h6" gutterBottom align="right" > ID: {record.id} </Typography> </Grid> </Grid> <Grid container spacing={2}> <Grid item xs={12} container alignContent="flex-end"> <Typography variant="caption" color="textSecondary" sx={{ wordWrap: 'break-word', wordBreak: 'break-all' }}> {Common.camelToPascalWithSpaces(translate('common.field.memo'))}:{record.memo} </Typography> </Grid> </Grid> <Box height={20}> </Box> <Grid container spacing={2}> <Grid item xs={6}> <PanelTypography title="table.field.wave.code" property={record.code} /> </Grid> <Grid item xs={6}> <PanelTypography title="table.field.wave.type" property={record.type$} /> </Grid> <Grid item xs={6}> <PanelTypography title="table.field.wave.exceStatus" property={record.exceStatus$} /> </Grid> <Grid item xs={6}> <PanelTypography title="table.field.wave.anfme" property={record.anfme} /> </Grid> <Grid item xs={6}> <PanelTypography title="table.field.wave.qty" property={record.qty} /> </Grid> <Grid item xs={6}> <PanelTypography title="table.field.wave.orderNum" property={record.orderNum} /> </Grid> </Grid> </CardContent> </Card > <Box display="flex"> <List resource="waveOrderRela" sx={{ flexGrow: 1, transition: (theme) => theme.transitions.create(['all'], { duration: theme.transitions.duration.enteringScreen, }), marginRight: !!drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0, }} filter={{ waveId: record.id }} pagination={false} empty={false} actions={false} > <StyledDatagrid preferenceKey='waveOrderRela' bulkActionButtons={false} rowClick={false} expandSingle omit={['id', 'createTime', 'createBy', 'memo', 'taskId', 'orderId', 'orderItemId', 'matnrId']} > <NumberField source="id" />, <TextField source="asnCode" label="table.field.asnOrderItem.asnCode" /> <TextField source="matnrCode" label="table.field.asnOrderItem.matnrCode" /> <TextField source="maktx" label="table.field.asnOrderItem.maktx" /> <TextField source="splrBatch" label="table.field.asnOrderItem.splrBatch" /> <TextField source="platOrderCode" label="table.field.asnOrderItem.platOrderCode" /> <TextField source="spec" label="table.field.asnOrderItem.spec" /> <TextField source="model" label="table.field.asnOrderItem.model" /> <NumberField source="anfme" label="table.field.asnOrderItem.anfme" /> <TextField source="stockUnit" label="table.field.asnOrderItem.stockUnit" /> <TextField source="splrName" label="table.field.asnOrderItem.splrName" /> </StyledDatagrid> </List> </Box> </> ); }; rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveOrderRelaController.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; @@ -25,12 +26,12 @@ @Autowired private WaveOrderRelaService waveOrderRelaService; @PreAuthorize("hasAuthority('manager:waveOrderRela:list')") @PreAuthorize("hasAuthority('manager:waveItem:list')") @PostMapping("/waveOrderRela/page") public R page(@RequestBody Map<String, Object> map) { BaseParam baseParam = buildParam(map, BaseParam.class); PageParam<WaveOrderRela, BaseParam> pageParam = new PageParam<>(baseParam, WaveOrderRela.class); return R.ok().add(waveOrderRelaService.page(pageParam, pageParam.buildWrapper(true))); Map<String, Object> param = new HashMap<>(); BaseParam baseParam = buildParam(param, BaseParam.class); return waveOrderRelaService.relaPage(baseParam, map); } @PreAuthorize("hasAuthority('manager:waveOrderRela:list')") rsf-server/src/main/java/com/vincent/rsf/server/manager/service/WaveOrderRelaService.java
@@ -1,8 +1,15 @@ package com.vincent.rsf.server.manager.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.IService; import com.vincent.rsf.framework.common.R; import com.vincent.rsf.server.common.domain.BaseParam; import com.vincent.rsf.server.common.domain.PageParam; import com.vincent.rsf.server.manager.entity.WaveOrderRela; import java.util.Map; public interface WaveOrderRelaService extends IService<WaveOrderRela> { R relaPage(BaseParam map, Map<String, Object> params); } rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveOrderRelaServiceImpl.java
@@ -1,12 +1,42 @@ package com.vincent.rsf.server.manager.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.vincent.rsf.framework.common.R; import com.vincent.rsf.server.common.domain.BaseParam; import com.vincent.rsf.server.common.domain.PageParam; import com.vincent.rsf.server.manager.entity.AsnOrderItem; import com.vincent.rsf.server.manager.mapper.WaveOrderRelaMapper; import com.vincent.rsf.server.manager.entity.WaveOrderRela; import com.vincent.rsf.server.manager.service.AsnOrderItemService; import com.vincent.rsf.server.manager.service.WaveOrderRelaService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @Service("waveOrderRelaService") public class WaveOrderRelaServiceImpl extends ServiceImpl<WaveOrderRelaMapper, WaveOrderRela> implements WaveOrderRelaService { @Autowired private AsnOrderItemService asnOrderItemService; @Override public R relaPage(BaseParam baseParam, Map<String, Object> params) { List<WaveOrderRela> orderRelas = this.baseMapper.selectList(new LambdaQueryWrapper<WaveOrderRela>() .eq(WaveOrderRela::getWaveId, Long.parseLong(params.get("waveId").toString()))); if (orderRelas.isEmpty()) { return R.ok(); } List<Long> orderIds = orderRelas.stream().map(WaveOrderRela::getOrderItemId).collect(Collectors.toList()); PageParam<AsnOrderItem, BaseParam> pageParam = new PageParam<>(baseParam, AsnOrderItem.class); QueryWrapper<AsnOrderItem> wrapper = pageParam.buildWrapper(true); wrapper.in("id", orderIds); return R.ok().add(asnOrderItemService.page(pageParam, wrapper)); } }
