From a6991a33e18f69264f93a63459a4b64ea799295a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 05 八月 2025 13:02:24 +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 | 70 ++++++++++------------------------
1 files changed, 21 insertions(+), 49 deletions(-)
diff --git a/rsf-admin/src/page/orders/outStock/SelectMatnrModal.jsx b/rsf-admin/src/page/orders/outStock/SelectMatnrModal.jsx
index 9c9b9be..9e5071d 100644
--- a/rsf-admin/src/page/orders/outStock/SelectMatnrModal.jsx
+++ b/rsf-admin/src/page/orders/outStock/SelectMatnrModal.jsx
@@ -43,18 +43,18 @@
Select,
MenuItem
} from '@mui/material';
+import { useForm, Controller, useWatch, FormProvider, useFormContext } from "react-hook-form";
import DialogCloseButton from "../../components/DialogCloseButton";
import StatusSelectInput from "../../components/StatusSelectInput";
-import ConfirmButton from "../../components/ConfirmButton";
-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';
-import { Add, Edit, Delete } from '@mui/icons-material';
-import _, { set } from 'lodash';
-import { DataGrid, useGridApiRef } from '@mui/x-data-grid';
import DictionarySelect from "../../components/DictionarySelect";
+import { DataGrid, useGridApiRef } from '@mui/x-data-grid';
+import ConfirmButton from "../../components/ConfirmButton";
+import { Add, Edit, Delete } from '@mui/icons-material';
import DictSelect from "../../components/DictSelect";
+import SaveIcon from '@mui/icons-material/Save';
+import MatnrInfoModal from "./MatnrInfoModal";
+import request from '@/utils/request';
+import _, { set } from 'lodash';
import "./asnOrder.css";
const SelectMatnrModal = (props) => {
@@ -64,7 +64,6 @@
const notify = useNotify();
const refresh = useRefresh();
const [disabled, setDisabled] = useState(false)
-
const [createDialog, setCreateDialog] = useState(false);
const tableRef = useRef();
@@ -101,7 +100,6 @@
...prevData,
[name]: value
}));
- console.log(formData);
};
const resetData = () => {
@@ -133,12 +131,10 @@
"orders": formData,
"items": tabelData,
}
-
const res = await request.post(`/outStock/items/save`, parmas);
if (res?.data?.code === 200) {
setOpen(false);
refresh();
- billReload?.current()
resetData()
} else {
notify(res.data.msg);
@@ -152,7 +148,6 @@
if (res?.data?.code === 200) {
setOpen(false);
refresh();
- billReload?.current()
resetData()
} else {
notify(res.data.msg);
@@ -183,7 +178,7 @@
}
const requestGetBody = async () => {
- const res = await request.post(`/outStockItem/page`, { asnId });
+ const res = await request.post(`/outStockItem/page`, { orderId: asnId });
if (res?.data?.code === 200) {
setTableData(res.data.data.records)
} else {
@@ -238,6 +233,7 @@
label={translate("table.field.outStock.wkType")}
value={formData.wkType}
variant="filled"
+ group='2'
onChange={(e) => handleChange(e.target.value, 'wkType')}
dictTypeCode="sys_business_type"
required
@@ -320,7 +316,6 @@
} = await request.post("companys/page", parmas);
if (code === 200) {
setFormData(data.records)
- console.log(data.records)
} else {
notify(msg);
}
@@ -374,7 +369,6 @@
} = await request.post("companys/page", parmas);
if (code === 200) {
setFormData(data.records)
- console.log(data.records)
} else {
notify(msg);
}
@@ -466,48 +460,26 @@
),
headerClassName: "custom",
},
- // {
- // field: 'packName',
- // headerName: translate('table.field.asnOrderItem.packName'),
- // minWidth: 100,
- // flex: 1,
- // editable: true,
- // },
- // {
- // field: 'poDetlId',
- // headerName: translate('table.field.asnOrderItem.poDetlId'),
- // minWidth: 100,
- // flex: 1,
- // },
{
- field: 'poCode',
- headerName: translate('table.field.outStockItem.poDetlCode') + "*",
+ field: 'splrBatch',
+ headerName: translate('table.field.outStockItem.splrBatch'),
minWidth: 100,
flex: 1,
editable: true,
- headerClassName: "custom",
},
-
+ {
+ field: 'poCode',
+ headerName: translate('table.field.outStockItem.poDetlCode'),
+ minWidth: 100,
+ flex: 1,
+ editable: true,
+ },
{
field: 'stockUnit',
headerName: translate('table.field.outStockItem.stockUnit'),
minWidth: 100,
flex: 1,
- editable: false,
- },
- // {
- // field: 'purQty',
- // headerName: translate('table.field.asnOrderItem.purQty'),
- // minWidth: 100,
- // flex: 1,
- // editable: true,
- // },
- {
- field: 'purUnit',
- headerName: translate('table.field.outStockItem.purUnit'),
- minWidth: 100,
- flex: 1,
- editable: false,
+ editable: true,
},
])
@@ -596,7 +568,7 @@
},
},
}}
- pageSizeOptions={[10, 25, 50, 100]}
+ pageSizeOptions={[15, 25, 50, 100]}
editMode="row"
checkboxSelection
onRowSelectionModelChange={handleSelectionChange}
--
Gitblit v1.9.1