diff --git a/src/components/PutAwayScan/PutAwayModal.tsx b/src/components/PutAwayScan/PutAwayModal.tsx
index ed234c5..c242ca2 100644
--- a/src/components/PutAwayScan/PutAwayModal.tsx
+++ b/src/components/PutAwayScan/PutAwayModal.tsx
@@ -307,7 +307,9 @@ const PutAwayModal: React.FC<Props> = ({ open, onClose, warehouse, stockInLineId
             itemName: itemDetail?.itemName,
             itemCode: itemDetail?.itemNo,
             poCode: itemDetail?.poCode,
+            joCode: itemDetail?.joCode,
             lotNo: itemDetail?.lotNo,
+            warehouseCode: warehouse.find((w) => w.id == warehouseId)?.code, 
             warehouse: warehouse.find((w) => w.id == warehouseId)?.name,
             putQty: putQty,
             uom: itemDetail?.uom?.udfudesc,
diff --git a/src/components/PutAwayScan/PutAwayReviewGrid.tsx b/src/components/PutAwayScan/PutAwayReviewGrid.tsx
index 950d07a..36998b2 100644
--- a/src/components/PutAwayScan/PutAwayReviewGrid.tsx
+++ b/src/components/PutAwayScan/PutAwayReviewGrid.tsx
@@ -28,9 +28,12 @@ const PutAwayReviewGrid: React.FC<Props> = ({ putAwayHistory }) => {
         },
         {
             field: "poCode",
-            headerName: t("poCode"),
+            headerName: t("PoCode/JoCode"),
             flex: 2,
             disableColumnMenu: true,
+            renderCell: (params) => {
+                return (<>{params.row.joCode ? params.row.joCode : params.row.poCode}</>);
+            },
         },
         {
             field: "itemCode",
@@ -59,7 +62,7 @@ const PutAwayReviewGrid: React.FC<Props> = ({ putAwayHistory }) => {
             disableColumnMenu: true,
         },
         {
-            field: "warehouse",
+            field: "warehouseCode",
             headerName: t("warehouse"),
             flex: 2,
             disableColumnMenu: true,
diff --git a/src/components/PutAwayScan/index.ts b/src/components/PutAwayScan/index.ts
index 5112fe8..a4c5276 100644
--- a/src/components/PutAwayScan/index.ts
+++ b/src/components/PutAwayScan/index.ts
@@ -5,6 +5,8 @@ export interface PutAwayRecord {
     itemName: string;
     itemCode?: string;
     warehouse: string;
+    warehouseCode?: string;
+    joCode?: string;
     putQty: number;
     lotNo?: string;
     poCode?: string;