diff --git a/src/app/api/jo/actions.ts b/src/app/api/jo/actions.ts index de1167e..7c575de 100644 --- a/src/app/api/jo/actions.ts +++ b/src/app/api/jo/actions.ts @@ -344,6 +344,7 @@ export interface AllJoborderProductProcessInfoResponse { pickOrderStatus: string; itemCode: string; itemName: string; + lotNo: string; requiredQty: number; jobOrderId: number; timeNeedToComplete: number; @@ -523,6 +524,7 @@ export interface AllJoPickOrderResponse { jobOrderType: string | null; itemId: number; itemName: string; + lotNo: string | null; reqQty: number; uomId: number; uomName: string; diff --git a/src/app/api/jo/index.ts b/src/app/api/jo/index.ts index 6ce2e51..b6d889c 100644 --- a/src/app/api/jo/index.ts +++ b/src/app/api/jo/index.ts @@ -37,6 +37,7 @@ export interface JobOrder { stockInLineId?: number; stockInLineStatus?: string; silHandlerId?: number; + lotNo?: string; } export interface Machine { diff --git a/src/components/JoSearch/JoSearch.tsx b/src/components/JoSearch/JoSearch.tsx index ad0888c..d2dd42e 100644 --- a/src/components/JoSearch/JoSearch.tsx +++ b/src/components/JoSearch/JoSearch.tsx @@ -264,8 +264,15 @@ const JoSearch: React.FC = ({ defaultInputs, bomCombo, printerCombo, jobT }, { name: "code", - label: t("Code"), - flex: 2 + label: t("Code / Lot No"), + flex: 2, + renderCell: (row) => ( + + {row.code} +
+ {row.lotNo ?? "-"} +
+ ), }, { name: "item", diff --git a/src/components/Jodetail/JoPickOrderList.tsx b/src/components/Jodetail/JoPickOrderList.tsx index edfe37e..3facc36 100644 --- a/src/components/Jodetail/JoPickOrderList.tsx +++ b/src/components/Jodetail/JoPickOrderList.tsx @@ -158,7 +158,9 @@ const JoPickOrderList: React.FC = ({ onSwitchToRecordTab }) =>{ - + + {t("Lot No")}: {pickOrder.lotNo || "-"} + {t("Pick Order")}: {pickOrder.pickOrderCode || "-"} diff --git a/src/components/ProductionProcess/ProductionProcessList.tsx b/src/components/ProductionProcess/ProductionProcessList.tsx index 4fd20a7..e58ae5d 100644 --- a/src/components/ProductionProcess/ProductionProcessList.tsx +++ b/src/components/ProductionProcess/ProductionProcessList.tsx @@ -215,8 +215,8 @@ const ProductProcessList: React.FC = ({ onSelectProcess = ({ onSelectProcess - + + {t("Lot No")}: {process.lotNo ?? "-"} + {/* {t("Item Name")}: */} {process.itemCode} {process.itemName} diff --git a/src/i18n/zh/jo.json b/src/i18n/zh/jo.json index 91b5d88..05ced1c 100644 --- a/src/i18n/zh/jo.json +++ b/src/i18n/zh/jo.json @@ -15,6 +15,7 @@ "Job Process Status Dashboard": "儀表板 - 工單狀態", "This lot is rejected, please scan another lot.": "此批次已拒收,請掃描另一個批次。", "Edit": "改數", + "Code / Lot No": "工單編號/批號", "Just Complete": "已完成", "Stock Req. Qty": "需求數", "Bad Package Qty": "不良包裝數量",