From 17f9f7d74b7f2f3344b335441f9bf1653cff03f0 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 30 四月 2025 15:38:52 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-admin/src/page/locItem/LocItemEdit.jsx |  177 +++++++++++++++++++++++++++-------------------------------
 1 files changed, 82 insertions(+), 95 deletions(-)

diff --git a/rsf-admin/src/page/orderItem/OrderItemEdit.jsx b/rsf-admin/src/page/locItem/LocItemEdit.jsx
similarity index 70%
rename from rsf-admin/src/page/orderItem/OrderItemEdit.jsx
rename to rsf-admin/src/page/locItem/LocItemEdit.jsx
index 2133716..f9d7aa1 100644
--- a/rsf-admin/src/page/orderItem/OrderItemEdit.jsx
+++ b/rsf-admin/src/page/locItem/LocItemEdit.jsx
@@ -40,7 +40,7 @@
     )
 }
 
-const OrderItemEdit = () => {
+const LocItemEdit = () => {
     const translate = useTranslate();
 
     return (
@@ -65,140 +65,127 @@
                         </Typography>
                         <Stack direction='row' gap={2}>
                             <NumberInput
-                                label="table.field.orderItem.orderId"
-                                source="orderId"
+                                label="table.field.locItem.locId"
+                                source="locId"
                                 autoFocus
                             />
                         </Stack>
                         <Stack direction='row' gap={2}>
                             <TextInput
-                                label="table.field.orderItem.orderCode"
-                                source="orderCode"
+                                label="table.field.locItem.locCode"
+                                source="locCode"
                                 parse={v => v}
                             />
                         </Stack>
                         <Stack direction='row' gap={2}>
-                            <TextInput
-                                label="table.field.orderItem.sourceItemId"
-                                source="sourceItemId"
-                                parse={v => v}
+                            <NumberInput
+                                label="table.field.locItem.orderId"
+                                source="orderId"
                             />
                         </Stack>
                         <Stack direction='row' gap={2}>
                             <TextInput
-                                label="table.field.orderItem.matnrId"
+                                label="table.field.locItem.type"
+                                source="type"
+                                parse={v => v}
+                            />
+                        </Stack>
+                        <Stack direction='row' gap={2}>
+                            <NumberInput
+                                label="table.field.locItem.orderItemId"
+                                source="orderItemId"
+                            />
+                        </Stack>
+                        <Stack direction='row' gap={2}>
+                            <NumberInput
+                                label="table.field.locItem.wkType"
+                                source="wkType"
+                            />
+                        </Stack>
+                        <Stack direction='row' gap={2}>
+                            <NumberInput
+                                label="table.field.locItem.matnrId"
                                 source="matnrId"
+                            />
+                        </Stack>
+                        <Stack direction='row' gap={2}>
+                            <TextInput
+                                label="table.field.locItem.maktx"
+                                source="maktx"
                                 parse={v => v}
                             />
                         </Stack>
                         <Stack direction='row' gap={2}>
                             <TextInput
-                                label="table.field.orderItem.matnrCode"
+                                label="table.field.locItem.matnrCode"
                                 source="matnrCode"
                                 parse={v => v}
                             />
                         </Stack>
                         <Stack direction='row' gap={2}>
                             <TextInput
-                                label="table.field.orderItem.maktx"
-                                source="maktx"
-                                parse={v => v}
-                            />
-                        </Stack>
-                        <Stack direction='row' gap={2}>
-                            <NumberInput
-                                label="table.field.orderItem.anfme"
-                                source="anfme"
-                                validate={required()}
-                            />
-                        </Stack>
-                        <Stack direction='row' gap={2}>
-                            <TextInput
-                                label="table.field.orderItem.stockUnit"
-                                source="stockUnit"
-                                parse={v => v}
-                            />
-                        </Stack>
-                        <Stack direction='row' gap={2}>
-                            <NumberInput
-                                label="table.field.orderItem.workQty"
-                                source="workQty"
-                                validate={required()}
-                            />
-                        </Stack>
-                        <Stack direction='row' gap={2}>
-                            <NumberInput
-                                label="table.field.orderItem.purQty"
-                                source="purQty"
-                                validate={required()}
-                            />
-                        </Stack>
-                        <Stack direction='row' gap={2}>
-                            <TextInput
-                                label="table.field.orderItem.purUnit"
-                                source="purUnit"
-                                parse={v => v}
-                            />
-                        </Stack>
-                        <Stack direction='row' gap={2}>
-                            <NumberInput
-                                label="table.field.orderItem.qty"
-                                source="qty"
-                            />
-                        </Stack>
-                        <Stack direction='row' gap={2}>
-                            <TextInput
-                                label="table.field.orderItem.splrCode"
-                                source="splrCode"
-                                parse={v => v}
-                            />
-                        </Stack>
-                        <Stack direction='row' gap={2}>
-                            <TextInput
-                                label="table.field.orderItem.batch"
-                                source="batch"
-                                parse={v => v}
-                            />
-                        </Stack>
-                        <Stack direction='row' gap={2}>
-                            <TextInput
-                                label="table.field.orderItem.splrBatch"
-                                source="splrBatch"
-                                parse={v => v}
-                            />
-                        </Stack>
-                        <Stack direction='row' gap={2}>
-                            <TextInput
-                                label="table.field.orderItem.splrName"
-                                source="splrName"
-                                parse={v => v}
-                            />
-                        </Stack>
-                        <Stack direction='row' gap={2}>
-                            <TextInput
-                                label="table.field.orderItem.trackCode"
+                                label="table.field.locItem.trackCode"
                                 source="trackCode"
                                 parse={v => v}
                             />
                         </Stack>
                         <Stack direction='row' gap={2}>
                             <TextInput
-                                label="table.field.orderItem.barcode"
-                                source="barcode"
+                                label="table.field.locItem.unit"
+                                source="unit"
+                                parse={v => v}
+                            />
+                        </Stack>
+                        <Stack direction='row' gap={2}>
+                            <NumberInput
+                                label="table.field.locItem.anfme"
+                                source="anfme"
+                            />
+                        </Stack>
+                        <Stack direction='row' gap={2}>
+                            <NumberInput
+                                label="table.field.locItem.qty"
+                                source="qty"
+                            />
+                        </Stack>
+                        <Stack direction='row' gap={2}>
+                            <NumberInput
+                                label="table.field.locItem.workQty"
+                                source="workQty"
+                            />
+                        </Stack>
+                        <Stack direction='row' gap={2}>
+                            <TextInput
+                                label="table.field.locItem.batch"
+                                source="batch"
                                 parse={v => v}
                             />
                         </Stack>
                         <Stack direction='row' gap={2}>
                             <TextInput
-                                label="table.field.orderItem.prodTime"
-                                source="prodTime"
+                                label="table.field.locItem.splrBatch"
+                                source="splrBatch"
                                 parse={v => v}
                             />
                         </Stack>
                         <Stack direction='row' gap={2}>
                             <TextInput
-                                label="table.field.orderItem.packName"
-                                source="packName"
+                                label="table.field.locItem.spec"
+                                source="spec"
+                                parse={v => v}
+                            />
+                        </Stack>
+                        <Stack direction='row' gap={2}>
+                            <TextInput
+                                label="table.field.locItem.model"
+                                source="model"
+                                parse={v => v}
+                            />
+                        </Stack>
+                        <Stack direction='row' gap={2}>
+                            <TextInput
+                                label="table.field.locItem.fieldsIndex"
+                                source="fieldsIndex"
                                 parse={v => v}
                             />
                         </Stack>
@@ -218,4 +205,4 @@
     )
 }
 
-export default OrderItemEdit;
+export default LocItemEdit;

--
Gitblit v1.9.1