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/orders/outStock/SelectMatnrModal.jsx | 41 ++++++++++++++++++++---------------------
1 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/rsf-admin/src/page/orders/outStock/SelectMatnrModal.jsx b/rsf-admin/src/page/orders/outStock/SelectMatnrModal.jsx
index 7e0652b..08a9667 100644
--- a/rsf-admin/src/page/orders/outStock/SelectMatnrModal.jsx
+++ b/rsf-admin/src/page/orders/outStock/SelectMatnrModal.jsx
@@ -46,7 +46,7 @@
import DialogCloseButton from "../../components/DialogCloseButton";
import StatusSelectInput from "../../components/StatusSelectInput";
import ConfirmButton from "../../components/ConfirmButton";
-import AsnWareModal from "./AsnWareModal";
+import MatnrInfoModal from "./MatnrInfoModal";
import { useForm, Controller, useWatch, FormProvider, useFormContext } from "react-hook-form";
import SaveIcon from '@mui/icons-material/Save';
import request from '@/utils/request';
@@ -133,8 +133,7 @@
"orders": formData,
"items": tabelData,
}
-
- const res = await request.post(`/asnOrder/items/save`, parmas);
+ const res = await request.post(`/outStock/items/save`, parmas);
if (res?.data?.code === 200) {
setOpen(false);
refresh();
@@ -148,7 +147,7 @@
"orders": formData,
"items": tabelData,
}
- const res = await request.post(`/asnOrder/items/update`, parmas);
+ const res = await request.post(`/outStock/items/update`, parmas);
if (res?.data?.code === 200) {
setOpen(false);
refresh();
@@ -164,7 +163,7 @@
const handleDelete = async () => {
- const res = await request.post(`/asnOrder/remove/${asnId}`);
+ const res = await request.post(`/outStock/remove/${asnId}`);
if (res?.data?.code === 200) {
setOpen(false);
refresh();
@@ -174,7 +173,7 @@
};
const requestGetHead = async () => {
- const res = await request.get(`/asnOrder/${asnId}`);
+ const res = await request.get(`/outStock/${asnId}`);
if (res?.data?.code === 200) {
setFormData(res.data.data)
} else {
@@ -183,7 +182,7 @@
}
const requestGetBody = async () => {
- const res = await request.post(`/asnOrderItem/page`, { asnId });
+ const res = await request.post(`/outStockItem/page`, { asnId });
if (res?.data?.code === 200) {
setTableData(res.data.data.records)
} else {
@@ -235,7 +234,7 @@
</Grid> */}
<Grid item md={2}>
<DictSelect
- label={translate("table.field.asnOrder.wkType")}
+ label={translate("table.field.outStock.wkType")}
value={formData.wkType}
variant="filled"
onChange={(e) => handleChange(e.target.value, 'wkType')}
@@ -245,7 +244,7 @@
</Grid>
<Grid item md={2}>
<TextField
- label={translate("table.field.asnOrder.poCode")}
+ label={translate("table.field.outStock.poCode")}
value={formData.poCode}
variant="filled"
size='small'
@@ -254,7 +253,7 @@
</Grid>
<Grid item md={2}>
<TextField
- label={translate("table.field.asnOrder.logisNo")}
+ label={translate("table.field.outStock.logisNo")}
value={formData.logisNo}
variant="filled"
size='small'
@@ -264,7 +263,7 @@
<Grid item md={2}>
<DateInput
source="arrTime"
- label="table.field.asnOrder.arrTime"
+ label="table.field.outStock.arrTime"
size='small'
variant="filled"
value={formData.arrTime}
@@ -294,7 +293,7 @@
</Toolbar>
</DialogActions>
</Dialog>
- <AsnWareModal
+ <MatnrInfoModal
open={createDialog}
setOpen={setCreateDialog}
data={tabelData}
@@ -424,19 +423,19 @@
const [columns, setColumns] = useState([
{
field: 'maktx',
- headerName: translate('table.field.asnOrderItem.maktx'),
+ headerName: translate('table.field.outStockItem.maktx'),
width: 250,
editable: false,
},
{
field: 'matnrCode',
- headerName: translate('table.field.asnOrderItem.matnrCode'),
+ headerName: translate('table.field.outStockItem.matnrCode'),
width: 130,
editable: false,
},
{
field: 'anfme',
- headerName: translate('table.field.asnOrderItem.anfme') + "*",
+ headerName: translate('table.field.outStockItem.anfme') + "*",
type: 'number',
minWidth: 100,
flex: 1,
@@ -446,7 +445,7 @@
},
{
field: 'splrCode',
- headerName: translate('table.field.asnOrderItem.splrCode') + "*",
+ headerName: translate('table.field.outStockItem.splrCode') + "*",
minWidth: 100,
flex: 1,
editable: true,
@@ -457,7 +456,7 @@
},
{
field: 'splrName',
- headerName: translate('table.field.asnOrderItem.splrName') + "*",
+ headerName: translate('table.field.outStockItem.splrName') + "*",
minWidth: 100,
flex: 1,
editable: true,
@@ -481,7 +480,7 @@
// },
{
field: 'poCode',
- headerName: translate('table.field.asnOrderItem.poDetlCode') + "*",
+ headerName: translate('table.field.outStockItem.poDetlCode') + "*",
minWidth: 100,
flex: 1,
editable: true,
@@ -490,7 +489,7 @@
{
field: 'stockUnit',
- headerName: translate('table.field.asnOrderItem.stockUnit'),
+ headerName: translate('table.field.outStockItem.stockUnit'),
minWidth: 100,
flex: 1,
editable: false,
@@ -504,7 +503,7 @@
// },
{
field: 'purUnit',
- headerName: translate('table.field.asnOrderItem.purUnit'),
+ headerName: translate('table.field.outStockItem.purUnit'),
minWidth: 100,
flex: 1,
editable: false,
@@ -583,7 +582,7 @@
rows={tabelData}
columns={columns}
disableRowSelectionOnClick
- getRowId={(row) => row.matnrId}
+ getRowId={(row) => row.matnrId ? row.matnrId : row.id}
disableColumnFilter
disableColumnSelector
disableColumnSorting
--
Gitblit v1.9.1