| @@ -344,6 +344,7 @@ export interface AllJoborderProductProcessInfoResponse { | |||||
| pickOrderStatus: string; | pickOrderStatus: string; | ||||
| itemCode: string; | itemCode: string; | ||||
| itemName: string; | itemName: string; | ||||
| lotNo: string; | |||||
| requiredQty: number; | requiredQty: number; | ||||
| jobOrderId: number; | jobOrderId: number; | ||||
| timeNeedToComplete: number; | timeNeedToComplete: number; | ||||
| @@ -523,6 +524,7 @@ export interface AllJoPickOrderResponse { | |||||
| jobOrderType: string | null; | jobOrderType: string | null; | ||||
| itemId: number; | itemId: number; | ||||
| itemName: string; | itemName: string; | ||||
| lotNo: string | null; | |||||
| reqQty: number; | reqQty: number; | ||||
| uomId: number; | uomId: number; | ||||
| uomName: string; | uomName: string; | ||||
| @@ -37,6 +37,7 @@ export interface JobOrder { | |||||
| stockInLineId?: number; | stockInLineId?: number; | ||||
| stockInLineStatus?: string; | stockInLineStatus?: string; | ||||
| silHandlerId?: number; | silHandlerId?: number; | ||||
| lotNo?: string; | |||||
| } | } | ||||
| export interface Machine { | export interface Machine { | ||||
| @@ -264,8 +264,15 @@ const JoSearch: React.FC<Props> = ({ defaultInputs, bomCombo, printerCombo, jobT | |||||
| }, | }, | ||||
| { | { | ||||
| name: "code", | name: "code", | ||||
| label: t("Code"), | |||||
| flex: 2 | |||||
| label: t("Code / Lot No"), | |||||
| flex: 2, | |||||
| renderCell: (row) => ( | |||||
| <span> | |||||
| {row.code} | |||||
| <br /> | |||||
| {row.lotNo ?? "-"} | |||||
| </span> | |||||
| ), | |||||
| }, | }, | ||||
| { | { | ||||
| name: "item", | name: "item", | ||||
| @@ -158,7 +158,9 @@ const JoPickOrderList: React.FC<Props> = ({ onSwitchToRecordTab }) =>{ | |||||
| </Box> | </Box> | ||||
| <Chip size="small" label={t(status)} color={statusColor as any} /> | <Chip size="small" label={t(status)} color={statusColor as any} /> | ||||
| </Stack> | </Stack> | ||||
| <Typography variant="body2" color="text.secondary"> | |||||
| {t("Lot No")}: {pickOrder.lotNo || "-"} | |||||
| </Typography> | |||||
| <Typography variant="body2" color="text.secondary"> | <Typography variant="body2" color="text.secondary"> | ||||
| {t("Pick Order")}: {pickOrder.pickOrderCode || "-"} | {t("Pick Order")}: {pickOrder.pickOrderCode || "-"} | ||||
| </Typography> | </Typography> | ||||
| @@ -215,8 +215,8 @@ const ProductProcessList: React.FC<ProductProcessListProps> = ({ onSelectProcess | |||||
| <Grid key={process.id} item xs={12} sm={6} md={4}> | <Grid key={process.id} item xs={12} sm={6} md={4}> | ||||
| <Card | <Card | ||||
| sx={{ | sx={{ | ||||
| minHeight: 160, | |||||
| maxHeight: 300, | |||||
| minHeight: 180, | |||||
| maxHeight: 320, | |||||
| display: "flex", | display: "flex", | ||||
| flexDirection: "column", | flexDirection: "column", | ||||
| border: "1px solid", | border: "1px solid", | ||||
| @@ -239,7 +239,9 @@ const ProductProcessList: React.FC<ProductProcessListProps> = ({ onSelectProcess | |||||
| </Box> | </Box> | ||||
| <Chip size="small" label={t(status)} color={statusColor as any} /> | <Chip size="small" label={t(status)} color={statusColor as any} /> | ||||
| </Stack> | </Stack> | ||||
| <Typography variant="body2" color="text.secondary"> | |||||
| {t("Lot No")}: {process.lotNo ?? "-"} | |||||
| </Typography> | |||||
| <Typography variant="subtitle1" color="blue"> | <Typography variant="subtitle1" color="blue"> | ||||
| {/* <strong>{t("Item Name")}:</strong> */} | {/* <strong>{t("Item Name")}:</strong> */} | ||||
| {process.itemCode} {process.itemName} | {process.itemCode} {process.itemName} | ||||
| @@ -15,6 +15,7 @@ | |||||
| "Job Process Status Dashboard": "儀表板 - 工單狀態", | "Job Process Status Dashboard": "儀表板 - 工單狀態", | ||||
| "This lot is rejected, please scan another lot.": "此批次已拒收,請掃描另一個批次。", | "This lot is rejected, please scan another lot.": "此批次已拒收,請掃描另一個批次。", | ||||
| "Edit": "改數", | "Edit": "改數", | ||||
| "Code / Lot No": "工單編號/批號", | |||||
| "Just Complete": "已完成", | "Just Complete": "已完成", | ||||
| "Stock Req. Qty": "需求數", | "Stock Req. Qty": "需求數", | ||||
| "Bad Package Qty": "不良包裝數量", | "Bad Package Qty": "不良包裝數量", | ||||