| rsf-admin/src/config/setting.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| rsf-admin/src/i18n/zh.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| rsf-admin/src/page/basicInfo/basStation/CrossZoneAreaField.jsx | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
rsf-admin/src/config/setting.js
@@ -25,7 +25,7 @@ export const ABORT_SIGNAL = false; export const DEFAULT_PAGE_SIZE = 20; export const DEFAULT_PAGE_SIZE = 10; export const DEFAULT_ITEM_PAGE_SIZE = 10;
@@ -199,9 +199,9 @@ outAble: '能出', useStatus: '状态', status: '状态', area: '所属库区类型', area: '所属库区', isCrossZone: '是否跨区', crossZoneArea: '可跨区类型', crossZoneArea: '可跨库区', isWcs: '是否WCS站站点', wcsData: 'wcs数据', containerType: '容器类型', rsf-admin/src/page/basicInfo/basStation/BasStationList.jsx
@@ -45,6 +45,7 @@ import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting'; import * as Common from '@/utils/common'; import WarehouseAreaField from "./WarehouseAreaField"; import CrossZoneAreaField from "./CrossZoneAreaField"; const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({ '& .css-1vooibu-MuiSvgIcon-root': { @@ -95,7 +96,7 @@ const [createDialog, setCreateDialog] = useState(false); const [drawerVal, setDrawerVal] = useState(false); const [areaFieldDialog, setAreaFieldDialog] = useState(false); return ( <Box display="flex"> <List @@ -147,8 +148,12 @@ label="table.field.basStation.isCrossZone" render={record => record.inAble === 1 ? '是' : '否'} /> <TextField source="crossZoneArea" label="table.field.basStation.crossZoneArea" /> <WrapperField cellClassName="crossZoneArea" label="table.field.basStation.crossZoneArea"> <CrossZoneAreaField open={areaFieldDialog} setOpen={setAreaFieldDialog} /> </WrapperField> <FunctionField source="isWcs" label="table.field.basStation.isWcs" @@ -170,16 +175,18 @@ </ReferenceField> <DateField source="createTime" label="common.field.createTime" showTime /> <TextField source="memo" label="common.field.memo" sortable={false} /> <WrapperField cellClassName="opt" label="common.field.opt"> <WrapperField cellClassName="opt" label="common.field.opt"> <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} /> <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} /> </WrapperField> </WrapperField> </StyledDatagrid> </List> <BasStationCreate open={createDialog} setOpen={setCreateDialog} /> <PageDrawer title='BasStation Detail' drawerVal={drawerVal} rsf-admin/src/page/basicInfo/basStation/CrossZoneAreaField.jsx
New file @@ -0,0 +1,118 @@ import * as React from 'react'; import { Stack, Chip, Dialog, DialogTitle, DialogContent, IconButton, CircularProgress } from '@mui/material'; import { useTranslate, useRecordContext } from 'react-admin'; import CloseIcon from '@mui/icons-material/Close'; import request from '@/utils/request'; const CrossZoneAreaField = () => { const translate = useTranslate(); const record = useRecordContext(); const [open, setOpen] = React.useState(false); const [areaNames, setAreaNames] = React.useState([]); const [loading, setLoading] = React.useState(false); const handleOpen = () => { setOpen(true); }; const handleClose = () => { setOpen(false); }; const fetchAreaNames = async () => { if (!record?.areaIds || record.areaIds.length === 0) return; setLoading(true); try { const res = await request.post(`/warehouseAreas/many/${record.areaIds.join(',')}`); if (res?.data?.code === 200) { setAreaNames(res.data.data || []); } } catch (error) { console.error('获取区域名称失败:', error); } finally { setLoading(false); } }; React.useEffect(() => { if (record?.areaIds && record.areaIds.length > 0) { fetchAreaNames(); } }, [record]); if (loading) { return <CircularProgress size={20} />; } return ( <> <Stack direction="row" gap={1} flexWrap="wrap" onClick={handleOpen} sx={{ cursor: 'pointer' }} > {areaNames.slice(0, 1).map((item, idx) => ( <Chip size="small" key={item.id} label={item.name || item.id} /> ))} {areaNames.length > 1 && ( <Chip size="small" label={`+${areaNames.length - 1}`} /> )} {areaNames.length === 0 && record.areaIds && record.areaIds.length > 0 && ( <Chip size="small" label={`${record.areaIds.length} 个区域`} /> )} </Stack> <Dialog open={open} onClose={handleClose} maxWidth="md" fullWidth > <DialogTitle> {translate('table.field.basStation.crossZoneArea')} <IconButton aria-label="close" onClick={handleClose} sx={{ position: 'absolute', right: 8, top: 8, }} > <CloseIcon /> </IconButton> </DialogTitle> <DialogContent> {loading ? ( <CircularProgress /> ) : ( <Stack direction="row" gap={1} flexWrap="wrap" sx={{ mt: 1 }}> {areaNames.map((item) => ( <Chip size="small" key={item.id} label={item.name || item.id} /> ))} </Stack> )} </DialogContent> </Dialog> </> ); }; export default CrossZoneAreaField; rsf-admin/src/page/warehouseAreasItem/WarehouseAreasItemList.jsx
@@ -170,17 +170,17 @@ const { data: { code, data, msg }, } = await request.get("/fields/enable/list"); if (code == 200) { const arr = [ <NumberField source="id" />, <TextField source="asnCode" label="table.field.warehouseAreasItem.asnCode" />, <NumberField source="areaId" label="table.field.warehouseAreasItem.areaId" />, <TextField source="areaName" label="table.field.warehouseAreasItem.areaName" />, <NumberField source="matnrId" label="table.field.warehouseAreasItem.matnrId" />, <TextField source="maktx" label="table.field.warehouseAreasItem.matnrName" />, <TextField source="matnrCode" label="table.field.warehouseAreasItem.matnrCode" />, <TextField source="trackCode" label="table.field.warehouseAreasItem.barcode" />, <NumberField source="anfme" label="table.field.warehouseAreasItem.anfme" />, <NumberField source="workQty" label="table.field.warehouseAreasItem.workQty" />, <NumberField source="qty" label="table.field.warehouseAreasItem.qty" />, <NumberField key="id" source="id" />, <TextField key="asnCode" source="asnCode" label="table.field.warehouseAreasItem.asnCode" />, <NumberField key="areaId" source="areaId" label="table.field.warehouseAreasItem.areaId" />, <TextField key="areaName" source="areaName" label="table.field.warehouseAreasItem.areaName" />, <NumberField key="matnrId" source="matnrId" label="table.field.warehouseAreasItem.matnrId" />, <TextField key="maktx" source="maktx" label="table.field.warehouseAreasItem.matnrName" />, <TextField key="matnrCode" source="matnrCode" label="table.field.warehouseAreasItem.matnrCode" />, <TextField key="trackCode" source="trackCode" label="table.field.warehouseAreasItem.barcode" />, <NumberField key="anfme" source="anfme" label="table.field.warehouseAreasItem.anfme" />, <NumberField key="workQty" source="workQty" label="table.field.warehouseAreasItem.workQty" />, <NumberField key="qty" source="qty" label="table.field.warehouseAreasItem.qty" />, // <MyField source="isptQty" label="table.field.qlyIsptItem.anfme" // onClick={(event, record, val) => { // event.stopPropagation(); @@ -188,25 +188,25 @@ // setDrawerVal(!!drawerVal && drawerVal === val ? null : val); // }} // />, <TextField source="splrBatch" label="table.field.warehouseAreasItem.splrBtch" />, <TextField source="batch" label="table.field.warehouseAreasItem.batch" />, <TextField source="unit" label="table.field.warehouseAreasItem.unit" />, <TextField source="stockUnit" label="table.field.warehouseAreasItem.stockUnit" />, <TextField source="brand" label="table.field.warehouseAreasItem.brand" />, <TextField source="shipperId" label="table.field.warehouseAreasItem.shipperId" />, <TextField source="splrId" label="table.field.warehouseAreasItem.splrId" />, <TextField source="isptResult$" label="table.field.warehouseAreasItem.isptResult" sortable={false} />, <NumberField source="weight" label="table.field.warehouseAreasItem.weight" />, <TextField source="prodTime" label="table.field.warehouseAreasItem.prodTime" />, <TextField key="splrBatch" source="splrBatch" label="table.field.warehouseAreasItem.splrBtch" />, <TextField key="batch" source="batch" label="table.field.warehouseAreasItem.batch" />, <TextField key="unit" source="unit" label="table.field.warehouseAreasItem.unit" />, <TextField key="stockUnit" source="stockUnit" label="table.field.warehouseAreasItem.stockUnit" />, <TextField key="brand" source="brand" label="table.field.warehouseAreasItem.brand" />, <TextField key="shipperId" source="shipperId" label="table.field.warehouseAreasItem.shipperId" />, <TextField key="splrId" source="splrId" label="table.field.warehouseAreasItem.splrId" />, <TextField key="isptResult" source="isptResult$" label="table.field.warehouseAreasItem.isptResult" sortable={false} />, <NumberField key="weight" source="weight" label="table.field.warehouseAreasItem.weight" />, <TextField key="prodTime" source="prodTime" label="table.field.warehouseAreasItem.prodTime" />, ] const fields = data.map(el => <TextField key={el.fields} source={`extendFields.[${el.fields}]`} label={el.fieldsAlise} />) const lastArr = [ <TextField source="updateBy$" label="common.field.updateBy" />, <DateField source="updateTime" label="common.field.updateTime" showTime />, <TextField source="createBy$" label="common.field.createBy" />, <DateField source="createTime" label="common.field.createTime" showTime />, <BooleanField source="statusBool" label="common.field.status" sortable={false} />, <TextField source="memo" label="common.field.memo" sortable={false} />, <TextField key="updateBy" source="updateBy$" label="common.field.updateBy" />, <DateField key="updateTime" source="updateTime" label="common.field.updateTime" showTime />, <TextField key="createBy" source="createBy$" label="common.field.createBy" />, <DateField key="createTime" source="createTime" label="common.field.createTime" showTime />, <BooleanField key="statusBool" source="statusBool" label="common.field.status" sortable={false} />, <TextField key="memo" source="memo" label="common.field.memo" sortable={false} />, ] setColumns([...arr, ...fields, ...lastArr]); //filters添加过滤字段 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -924,14 +924,15 @@ */ @Override public R getUnItemByContainer(Map<String, Object> params) { if (Objects.isNull(params.get("barcode"))) { throw new CoolException("参数不能为空！！"); if (Cools.isEmpty(params.get("barcode")) && Cools.isEmpty(params.get("code"))){ throw new CoolException("容器号与组托档编码不能全为空"); } //获取组拖未生成任务的组拖档 // List<Short> asList = Arrays.asList(Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val), Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val)); WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>() .eq(WaitPakin::getBarcode, params.get("barcode").toString()) .eq(!Cools.isEmpty(params.get("barcode")),WaitPakin::getBarcode, params.get("barcode").toString()) .eq(!Cools.isEmpty(params.get("code")),WaitPakin::getCode, params.get("code").toString()) .eq(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_DONE.val)); if (Objects.isNull(waitPakin)) { return R.error("未找到该容器码的组托明细，请检查组托状态");
