From 8eaee61fbbdea1eaa294b0f1a7d9f2a10da9ade9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 10 三月 2025 17:06:37 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.97.1.152:5880/r/wms-master into dev

---
 rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx |   20 ++++++++------------
 1 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx b/rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx
index 4f4eb57..2d234a2 100644
--- a/rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx
+++ b/rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx
@@ -86,24 +86,26 @@
                             <Grid container rowSpacing={2} columnSpacing={2}>
                                 <Grid item xs={6} display="flex" gap={1}>
                                     <TextInput
-                                        label="table.field.warehouse.name"
-                                        source="name"
+                                        label="table.field.warehouse.factory"
+                                        source="factory"
                                         validate={[required()]}
                                         parse={v => v}
                                         autoFocus
                                     />
+
                                 </Grid>
                                 <Grid item xs={6} display="flex" gap={1}>
                                     <TextInput
                                         label="table.field.warehouse.code"
                                         source="code"
+                                        validate={[required()]}
                                         parse={v => v}
                                     />
                                 </Grid>
                                 <Grid item xs={6} display="flex" gap={1}>
                                     <TextInput
-                                        label="table.field.warehouse.factory"
-                                        source="factory"
+                                        label="table.field.warehouse.name"
+                                        source="name"
                                         validate={[required()]}
                                         parse={v => v}
                                     />
@@ -122,9 +124,7 @@
                                         source="longitude"
                                         parse={v => v}
                                     />
-                                </Grid>
-                                <Grid item xs={6} display="flex" gap={1}>
-                                    <TextInput
+                                     <TextInput
                                         label="table.field.warehouse.latgitude"
                                         source="latgitude"
                                         parse={v => v}
@@ -135,14 +135,10 @@
                                         label="table.field.warehouse.length"
                                         source="length"
                                     />
-                                </Grid>
-                                <Grid item xs={6} display="flex" gap={1}>
-                                    <NumberInput
+                                     <NumberInput
                                         label="table.field.warehouse.width"
                                         source="width"
                                     />
-                                </Grid>
-                                <Grid item xs={6} display="flex" gap={1}>
                                     <NumberInput
                                         label="table.field.warehouse.height"
                                         source="height"

--
Gitblit v1.9.1