Merge branch 'MergeProblem1' of https://git.2fi-solutions.com/derek/FPSMS-frontend into MergeProblem1

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;

src/app/api/jo/index.ts

@@ -37,6 +37,7 @@ export interface JobOrder {
   stockInLineId?: number;
   stockInLineStatus?: string;
   silHandlerId?: number;
+  lotNo?: string;
 }
 
 export interface Machine {

src/components/JoSearch/JoSearch.tsx

@@ -264,8 +264,15 @@ const JoSearch: React.FC<Props> = ({ defaultInputs, bomCombo, printerCombo, jobT
             },
             {
                 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",

src/components/Jodetail/JoPickOrderList.tsx

@@ -158,7 +158,9 @@ const JoPickOrderList: React.FC<Props> = ({ onSwitchToRecordTab }) =>{
                         </Box>
                         <Chip size="small" label={t(status)} color={statusColor as any} />
                       </Stack>
-
+                      <Typography variant="body2" color="text.secondary">
+                        {t("Lot No")}: {pickOrder.lotNo || "-"}
+                      </Typography>
                       <Typography variant="body2" color="text.secondary">
                         {t("Pick Order")}: {pickOrder.pickOrderCode || "-"}
                       </Typography>

src/components/ProductionProcess/ProductionProcessList.tsx

@@ -215,8 +215,8 @@ const ProductProcessList: React.FC<ProductProcessListProps> = ({ onSelectProcess
                 <Grid key={process.id} item xs={12} sm={6} md={4}>
                   <Card
                     sx={{
-                      minHeight: 160,
-                      maxHeight: 300,            
+                      minHeight: 180,
+                      maxHeight: 320,            
                       display: "flex",
                       flexDirection: "column",
                       border: "1px solid",
@@ -239,7 +239,9 @@ const ProductProcessList: React.FC<ProductProcessListProps> = ({ onSelectProcess
                         </Box>
                         <Chip size="small" label={t(status)} color={statusColor as any} />
                       </Stack>
-
+                      <Typography variant="body2" color="text.secondary">
+                        {t("Lot No")}: {process.lotNo ?? "-"}
+                      </Typography>
                       <Typography variant="subtitle1" color="blue">
                        {/* <strong>{t("Item Name")}:</strong> */}
                          {process.itemCode} {process.itemName}

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": "不良包裝數量",