From c8fde8647b48e7c7d9b3beb6e8c39459f07c9eb2 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期四, 08 五月 2025 14:55:46 +0800 Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop --- rsf-admin/src/page/locItem/LocItemCreate.jsx | 177 +++++++++++++++++++++++++++------------------------------- 1 files changed, 82 insertions(+), 95 deletions(-) diff --git a/rsf-admin/src/page/orderItem/OrderItemCreate.jsx b/rsf-admin/src/page/locItem/LocItemCreate.jsx similarity index 73% rename from rsf-admin/src/page/orderItem/OrderItemCreate.jsx rename to rsf-admin/src/page/locItem/LocItemCreate.jsx index 71904b9..75454ff 100644 --- a/rsf-admin/src/page/orderItem/OrderItemCreate.jsx +++ b/rsf-admin/src/page/locItem/LocItemCreate.jsx @@ -31,7 +31,7 @@ import StatusSelectInput from "../components/StatusSelectInput"; import MemoInput from "../components/MemoInput"; -const OrderItemCreate = (props) => { +const LocItemCreate = (props) => { const { open, setOpen } = props; const translate = useTranslate(); @@ -86,140 +86,127 @@ <Grid container rowSpacing={2} columnSpacing={2}> <Grid item xs={6} display="flex" gap={1}> <NumberInput - label="table.field.orderItem.orderId" - source="orderId" + label="table.field.locItem.locId" + source="locId" autoFocus /> </Grid> <Grid item xs={6} display="flex" gap={1}> <TextInput - label="table.field.orderItem.orderCode" - source="orderCode" + label="table.field.locItem.locCode" + source="locCode" parse={v => v} /> </Grid> <Grid item xs={6} display="flex" gap={1}> - <TextInput - label="table.field.orderItem.sourceItemId" - source="sourceItemId" - parse={v => v} + <NumberInput + label="table.field.locItem.orderId" + source="orderId" /> </Grid> <Grid item xs={6} display="flex" gap={1}> <TextInput - label="table.field.orderItem.matnrId" + label="table.field.locItem.type" + source="type" + parse={v => v} + /> + </Grid> + <Grid item xs={6} display="flex" gap={1}> + <NumberInput + label="table.field.locItem.orderItemId" + source="orderItemId" + /> + </Grid> + <Grid item xs={6} display="flex" gap={1}> + <NumberInput + label="table.field.locItem.wkType" + source="wkType" + /> + </Grid> + <Grid item xs={6} display="flex" gap={1}> + <NumberInput + label="table.field.locItem.matnrId" source="matnrId" + /> + </Grid> + <Grid item xs={6} display="flex" gap={1}> + <TextInput + label="table.field.locItem.maktx" + source="maktx" parse={v => v} /> </Grid> <Grid item xs={6} display="flex" gap={1}> <TextInput - label="table.field.orderItem.matnrCode" + label="table.field.locItem.matnrCode" source="matnrCode" parse={v => v} /> </Grid> <Grid item xs={6} display="flex" gap={1}> <TextInput - label="table.field.orderItem.maktx" - source="maktx" - parse={v => v} - /> - </Grid> - <Grid item xs={6} display="flex" gap={1}> - <NumberInput - label="table.field.orderItem.anfme" - source="anfme" - validate={required()} - /> - </Grid> - <Grid item xs={6} display="flex" gap={1}> - <TextInput - label="table.field.orderItem.stockUnit" - source="stockUnit" - parse={v => v} - /> - </Grid> - <Grid item xs={6} display="flex" gap={1}> - <NumberInput - label="table.field.orderItem.workQty" - source="workQty" - validate={required()} - /> - </Grid> - <Grid item xs={6} display="flex" gap={1}> - <NumberInput - label="table.field.orderItem.purQty" - source="purQty" - validate={required()} - /> - </Grid> - <Grid item xs={6} display="flex" gap={1}> - <TextInput - label="table.field.orderItem.purUnit" - source="purUnit" - parse={v => v} - /> - </Grid> - <Grid item xs={6} display="flex" gap={1}> - <NumberInput - label="table.field.orderItem.qty" - source="qty" - /> - </Grid> - <Grid item xs={6} display="flex" gap={1}> - <TextInput - label="table.field.orderItem.splrCode" - source="splrCode" - parse={v => v} - /> - </Grid> - <Grid item xs={6} display="flex" gap={1}> - <TextInput - label="table.field.orderItem.batch" - source="batch" - parse={v => v} - /> - </Grid> - <Grid item xs={6} display="flex" gap={1}> - <TextInput - label="table.field.orderItem.splrBatch" - source="splrBatch" - parse={v => v} - /> - </Grid> - <Grid item xs={6} display="flex" gap={1}> - <TextInput - label="table.field.orderItem.splrName" - source="splrName" - parse={v => v} - /> - </Grid> - <Grid item xs={6} display="flex" gap={1}> - <TextInput - label="table.field.orderItem.trackCode" + label="table.field.locItem.trackCode" source="trackCode" parse={v => v} /> </Grid> <Grid item xs={6} display="flex" gap={1}> <TextInput - label="table.field.orderItem.barcode" - source="barcode" + label="table.field.locItem.unit" + source="unit" + parse={v => v} + /> + </Grid> + <Grid item xs={6} display="flex" gap={1}> + <NumberInput + label="table.field.locItem.anfme" + source="anfme" + /> + </Grid> + <Grid item xs={6} display="flex" gap={1}> + <NumberInput + label="table.field.locItem.qty" + source="qty" + /> + </Grid> + <Grid item xs={6} display="flex" gap={1}> + <NumberInput + label="table.field.locItem.workQty" + source="workQty" + /> + </Grid> + <Grid item xs={6} display="flex" gap={1}> + <TextInput + label="table.field.locItem.batch" + source="batch" parse={v => v} /> </Grid> <Grid item xs={6} display="flex" gap={1}> <TextInput - label="table.field.orderItem.prodTime" - source="prodTime" + label="table.field.locItem.splrBatch" + source="splrBatch" parse={v => v} /> </Grid> <Grid item xs={6} display="flex" gap={1}> <TextInput - label="table.field.orderItem.packName" - source="packName" + label="table.field.locItem.spec" + source="spec" + parse={v => v} + /> + </Grid> + <Grid item xs={6} display="flex" gap={1}> + <TextInput + label="table.field.locItem.model" + source="model" + parse={v => v} + /> + </Grid> + <Grid item xs={6} display="flex" gap={1}> + <TextInput + label="table.field.locItem.fieldsIndex" + source="fieldsIndex" parse={v => v} /> </Grid> @@ -246,4 +233,4 @@ ) } -export default OrderItemCreate; +export default LocItemCreate; -- Gitblit v1.9.1