From cebd9afa05ca5b17ca62b672010c29d115b89d60 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 18 二月 2025 09:47:03 +0800
Subject: [PATCH] #新增 1. 添加批次规则信息 2. 物料添加控制属性

---
 rsf-admin/src/page/matnr/MatnrList.jsx |   32 ++++++++++++++++++++++++++------
 1 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/rsf-admin/src/page/matnr/MatnrList.jsx b/rsf-admin/src/page/matnr/MatnrList.jsx
index a2abf5a..f823136 100644
--- a/rsf-admin/src/page/matnr/MatnrList.jsx
+++ b/rsf-admin/src/page/matnr/MatnrList.jsx
@@ -63,13 +63,16 @@
     <DateInput label='common.time.after' source="timeStart" alwaysOn />,
     <DateInput label='common.time.before' source="timeEnd" alwaysOn />,
 
+    <TextInput source="name" label="table.field.matnr.name" />,
+    <TextInput source="code" label="table.field.matnr.code" />,
     <ReferenceInput source="shipperId" label="table.field.matnr.shipperId" reference="shipper">
         <AutocompleteInput label="table.field.matnr.shipperId" optionText="name" filterToQuery={(val) => ({ name: val })} />
     </ReferenceInput>,
-    <TextInput source="name" label="table.field.matnr.name" />,
-    <TextInput source="code" label="table.field.matnr.code" />,
     <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>,
     <TextInput source="erpCode" label="table.field.matnr.erpCode" />,
     <TextInput source="spec" label="table.field.matnr.spec" />,
@@ -77,7 +80,7 @@
     <NumberInput source="weight" label="table.field.matnr.weight" />,
     <TextInput source="color" label="table.field.matnr.color" />,
     <TextInput source="size" label="table.field.matnr.size" />,
-    <TextInput source="desc" label="table.field.matnr.desc" />,
+    <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" />,
@@ -95,6 +98,13 @@
             { id:  1, name: ' 鏄�' },
         ]}
     />,
+    <NumberInput source="safetyQty" label="table.field.matnr.safetyQty" />,
+    <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="flagCheck" label="table.field.matnr.flagCheck" />,
 
     <TextInput label="common.field.memo" source="memo" />,
     <SelectInput
@@ -148,12 +158,15 @@
                     omit={['id', 'createTime', 'createBy', 'memo']}
                 >
                     <NumberField source="id" />
+                    <TextField source="name" label="table.field.matnr.name" />
+                    <TextField source="code" label="table.field.matnr.code" />
                     <ReferenceField source="shipperId" label="table.field.matnr.shipperId" reference="shipper" link={false} sortable={false}>
                         <TextField source="name" />
                     </ReferenceField>
-                    <TextField source="name" label="table.field.matnr.name" />
-                    <TextField source="code" label="table.field.matnr.code" />
                     <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}>
                         <TextField source="code" />
                     </ReferenceField>
                     <TextField source="erpCode" label="table.field.matnr.erpCode" />
@@ -162,13 +175,20 @@
                     <NumberField source="weight" label="table.field.matnr.weight" />
                     <TextField source="color" label="table.field.matnr.color" />
                     <TextField source="size" label="table.field.matnr.size" />
-                    <TextField source="desc" label="table.field.matnr.desc" />
+                    <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="stockUnit" label="table.field.matnr.stockUnit" />
                     <TextField source="stockLeval$" label="table.field.matnr.stockLeval" sortable={false} />
                     <TextField source="isLabelMange$" label="table.field.matnr.isLabelMange" sortable={false} />
+                    <NumberField source="safetyQty" label="table.field.matnr.safetyQty" />
+                    <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="flagCheck" label="table.field.matnr.flagCheck" />
 
                     <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
                         <TextField source="nickname" />

--
Gitblit v1.9.1