| @@ -307,7 +307,9 @@ const PutAwayModal: React.FC<Props> = ({ open, onClose, warehouse, stockInLineId | |||||
| itemName: itemDetail?.itemName, | itemName: itemDetail?.itemName, | ||||
| itemCode: itemDetail?.itemNo, | itemCode: itemDetail?.itemNo, | ||||
| poCode: itemDetail?.poCode, | poCode: itemDetail?.poCode, | ||||
| joCode: itemDetail?.joCode, | |||||
| lotNo: itemDetail?.lotNo, | lotNo: itemDetail?.lotNo, | ||||
| warehouseCode: warehouse.find((w) => w.id == warehouseId)?.code, | |||||
| warehouse: warehouse.find((w) => w.id == warehouseId)?.name, | warehouse: warehouse.find((w) => w.id == warehouseId)?.name, | ||||
| putQty: putQty, | putQty: putQty, | ||||
| uom: itemDetail?.uom?.udfudesc, | uom: itemDetail?.uom?.udfudesc, | ||||
| @@ -28,9 +28,12 @@ const PutAwayReviewGrid: React.FC<Props> = ({ putAwayHistory }) => { | |||||
| }, | }, | ||||
| { | { | ||||
| field: "poCode", | field: "poCode", | ||||
| headerName: t("poCode"), | |||||
| headerName: t("PoCode/JoCode"), | |||||
| flex: 2, | flex: 2, | ||||
| disableColumnMenu: true, | disableColumnMenu: true, | ||||
| renderCell: (params) => { | |||||
| return (<>{params.row.joCode ? params.row.joCode : params.row.poCode}</>); | |||||
| }, | |||||
| }, | }, | ||||
| { | { | ||||
| field: "itemCode", | field: "itemCode", | ||||
| @@ -59,7 +62,7 @@ const PutAwayReviewGrid: React.FC<Props> = ({ putAwayHistory }) => { | |||||
| disableColumnMenu: true, | disableColumnMenu: true, | ||||
| }, | }, | ||||
| { | { | ||||
| field: "warehouse", | |||||
| field: "warehouseCode", | |||||
| headerName: t("warehouse"), | headerName: t("warehouse"), | ||||
| flex: 2, | flex: 2, | ||||
| disableColumnMenu: true, | disableColumnMenu: true, | ||||
| @@ -5,6 +5,8 @@ export interface PutAwayRecord { | |||||
| itemName: string; | itemName: string; | ||||
| itemCode?: string; | itemCode?: string; | ||||
| warehouse: string; | warehouse: string; | ||||
| warehouseCode?: string; | |||||
| joCode?: string; | |||||
| putQty: number; | putQty: number; | ||||
| lotNo?: string; | lotNo?: string; | ||||
| poCode?: string; | poCode?: string; | ||||