From bea0dac85e865e3d5dae5b3fd641eb07a4b1b80c Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 21 二月 2025 10:19:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
rsf-admin/src/page/matnr/MatnrCreate.jsx | 2 +-
rsf-admin/src/page/matnr/MatnrList.jsx | 34 ++++++++++++++++++----------------
rsf-admin/src/page/components/ImportModal.jsx | 4 ++--
3 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/rsf-admin/src/page/components/ImportModal.jsx b/rsf-admin/src/page/components/ImportModal.jsx
index 76e7713..501cb22 100644
--- a/rsf-admin/src/page/components/ImportModal.jsx
+++ b/rsf-admin/src/page/components/ImportModal.jsx
@@ -23,10 +23,10 @@
const refresh = useRefresh();
const translate = useTranslate();
- const { processBatch } = useCodeImport();
+ // const { processBatch } = useCodeImport();
const { importer, parseCsv, reset } = usePapaParse({
batchSize: onceBatch,
- processBatch,
+ // processBatch,
});
const [file, setFile] = useState(null);
diff --git a/rsf-admin/src/page/matnr/MatnrCreate.jsx b/rsf-admin/src/page/matnr/MatnrCreate.jsx
index ed05d0d..0d7a4cc 100644
--- a/rsf-admin/src/page/matnr/MatnrCreate.jsx
+++ b/rsf-admin/src/page/matnr/MatnrCreate.jsx
@@ -126,7 +126,7 @@
<Grid item xs={6} display="flex" gap={1}>
<ReferenceInput
source="rglarId"
- reference="batchRegular"
+ reference="rglarId"
>
<AutocompleteInput
label="table.field.matnr.rglarId"
diff --git a/rsf-admin/src/page/matnr/MatnrList.jsx b/rsf-admin/src/page/matnr/MatnrList.jsx
index 1ef6208..9c8e8f3 100644
--- a/rsf-admin/src/page/matnr/MatnrList.jsx
+++ b/rsf-admin/src/page/matnr/MatnrList.jsx
@@ -43,6 +43,7 @@
import MyField from "../components/MyField";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import * as Common from '@/utils/common';
+import ImportButton from "../components/ImportButton";
import MatListAside from './MatnrListAside';
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
@@ -72,8 +73,8 @@
<ReferenceInput source="groupId" label="table.field.matnr.groupId" reference="matnrGroup" >
<AutocompleteInput label="table.field.matnr.groupId" optionText="code" filterToQuery={(val) => ({ code: val })} />
</ReferenceInput>,
- <ReferenceInput source="batchRegularId" label="table.field.matnr.batchRegularId" reference="batchRegular">
- <AutocompleteInput label="table.field.matnr.batchRegularId" optionText="code" filterToQuery={(val) => ({ code: val })} />
+ <ReferenceInput source="rglarId" label="table.field.matnr.rglarId" reference="rglarId">
+ <AutocompleteInput label="table.field.matnr.rglarId" optionText="code" filterToQuery={(val) => ({ code: val })} />
</ReferenceInput>,
<TextInput source="erpCode" label="table.field.matnr.erpCode" />,
<TextInput source="spec" label="table.field.matnr.spec" />,
@@ -84,9 +85,9 @@
<TextInput source="describle" label="table.field.matnr.describle" />,
<NumberInput source="nromNum" label="table.field.matnr.nromNum" />,
<TextInput source="unit" label="table.field.matnr.unit" />,
- <TextInput source="purchaseUnit" label="table.field.matnr.purchaseUnit" />,
+ <TextInput source="purchaseUnit" label="table.field.matnr.purUnit" />,
<TextInput source="stockUnit" label="table.field.matnr.stockUnit" />,
- <SelectInput source="stockLeval" label="table.field.matnr.stockLeval"
+ <SelectInput source="stockLeval" label="table.field.matnr.stockLevel"
choices={[
{ id: 0, name: ' A' },
{ id: 1, name: ' B' },
@@ -99,12 +100,12 @@
{ id: 1, name: ' 鏄�' },
]}
/>,
- <NumberInput source="safetyQty" label="table.field.matnr.safetyQty" />,
+ <NumberInput source="safeQty" label="table.field.matnr.safeQty" />,
<NumberInput source="minQty" label="table.field.matnr.minQty" />,
<NumberInput source="maxQty" label="table.field.matnr.maxQty" />,
- <NumberInput source="stagnate" label="table.field.matnr.stagnate" />,
- <NumberInput source="validity" label="table.field.matnr.validity" />,
- <NumberInput source="validityWarr" label="table.field.matnr.validityWarr" />,
+ <NumberInput source="stagn" label="table.field.matnr.stagn" />,
+ <NumberInput source="valid" label="table.field.matnr.valid" />,
+ <NumberInput source="validWarn" label="table.field.matnr.validWarn" />,
<NumberInput source="flagCheck" label="table.field.matnr.flagCheck" />,
<TextInput label="common.field.memo" source="memo" />,
@@ -153,7 +154,7 @@
<ReferenceField source="groupId" label="table.field.matnr.groupId" reference="matnrGroup" link={false} sortable={false}>
<TextField source="code" />
</ReferenceField>
- <ReferenceField source="batchRegularId" label="table.field.matnr.batchRegularId" reference="batchRegular" link={false} sortable={false}>
+ <ReferenceField source="rglarId" label="table.field.matnr.rglarId" reference="rglarId" link={false} sortable={false}>
<TextField source="code" />
</ReferenceField>
<TextField source="erpCode" label="table.field.matnr.erpCode" />
@@ -165,16 +166,16 @@
<TextField source="describle" label="table.field.matnr.describle" />
<NumberField source="nromNum" label="table.field.matnr.nromNum" />
<TextField source="unit" label="table.field.matnr.unit" />
- <TextField source="purchaseUnit" label="table.field.matnr.purchaseUnit" />
+ <TextField source="purchaseUnit" label="table.field.matnr.purUnit" />
<TextField source="stockUnit" label="table.field.matnr.stockUnit" />
- <TextField source="stockLeval$" label="table.field.matnr.stockLeval" sortable={false} />
+ <TextField source="stockLeval$" label="table.field.matnr.stockLevel" sortable={false} />
<TextField source="isLabelMange$" label="table.field.matnr.isLabelMange" sortable={false} />
- <NumberField source="safetyQty" label="table.field.matnr.safetyQty" />
+ <NumberField source="safeQty" label="table.field.matnr.safeQty" />
<NumberField source="minQty" label="table.field.matnr.minQty" />
<NumberField source="maxQty" label="table.field.matnr.maxQty" />
- <NumberField source="stagnate" label="table.field.matnr.stagnate" />
- <NumberField source="validity" label="table.field.matnr.validity" />
- <NumberField source="validityWarr" label="table.field.matnr.validityWarr" />
+ <NumberField source="stagn" label="table.field.matnr.stagn" />
+ <NumberField source="valid" label="table.field.matnr.valid" />
+ <NumberField source="validWarn" label="table.field.matnr.validWarn" />
<NumberField source="flagCheck" label="table.field.matnr.flagCheck" />
<ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
@@ -224,6 +225,7 @@
<FilterButton />
<MyCreateButton onClick={() => { setCreateDialog(true) }} />
<SelectColumnsButton preferenceKey='matnr' />
+ <ImportButton />
<MyExportButton />
</TopToolbar>
)}
@@ -246,4 +248,4 @@
)
}
-export default MatnrList;
+export default MatnrList;
\ No newline at end of file
--
Gitblit v1.9.1