From 89b19f453e03402aa2c8a588e5be1f491c007141 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期二, 11 三月 2025 13:49:03 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.97.1.152:5880/r/wms-master into front
---
rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx b/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
index 5480867..e2e4c63 100644
--- a/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
+++ b/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
@@ -76,7 +76,7 @@
<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="platCode" label="table.field.matnr.platCode" />,
<TextInput source="spec" label="table.field.matnr.spec" />,
<TextInput source="model" label="table.field.matnr.model" />,
<NumberInput source="weight" label="table.field.matnr.weight" />,
@@ -143,7 +143,7 @@
rowClick={(id, resource, record) => false}
expand={() => <MatnrPanel />}
expandSingle={true}
- omit={['id','shipperId','erpCode','spec','model','weight','color','size','describle'
+ omit={['id','shipperId','platCode','spec','model','weight','color','size','describle'
,'nromNum','unit','purchaseUnit','stockUnit','stockLeval','isLabelMange','safeQty'
,'minQty','maxQty','stagn','valid','validWarn','flagCheck','updateTime', 'updateBy'
, 'createTime', 'createBy', 'memo']}
@@ -160,7 +160,7 @@
<ReferenceField source="rglarId" label="table.field.matnr.rglarId" reference="batchRegular" link={false} sortable={false}>
<TextField source="code" />
</ReferenceField>
- <TextField source="erpCode" label="table.field.matnr.erpCode" />
+ <TextField source="platCode" label="table.field.matnr.platCode" />
<TextField source="spec" label="table.field.matnr.spec" />
<TextField source="model" label="table.field.matnr.model" />
<NumberField source="weight" label="table.field.matnr.weight" />
--
Gitblit v1.9.1