update

src/app/api/jo/actions.ts

@@ -316,6 +316,7 @@ export interface AllJoborderProductProcessInfoResponse {
   startTime?: string;
   endTime?: string;
   date: string;
+  matchStatus: string;
   bomId?: number;
   assignedTo: number;
   pickOrderId: number;
@@ -1020,7 +1021,7 @@ export async function PrintPickRecord(request: PrintPickRecordRequest){
   }
 
   //const response = await serverFetchWithNoContent(`${BASE_API_URL}/jo/print-PickRecord?${params.toString()}`,{
-    const response = await serverFetchWithNoContent(`${BASE_API_URL}/jo/newPrint-PickRecord?${params.toString()}`,{
+    const response = await serverFetchWithNoContent(`${BASE_API_URL}/jo/print-PickRecord?${params.toString()}`,{
     method: "GET"
   });
 

src/components/ProductionProcess/ProductionProcessList.tsx

@@ -268,7 +268,7 @@ const ProductProcessList: React.FC<ProductProcessListProps> = ({ onSelectProcess
                       <Button 
                       variant="contained" 
                       size="small" 
-                      disabled={process.assignedTo != null} 
+                      disabled={process.assignedTo != null || process.matchStatus == "completed"} 
                       onClick={() => handleAssignPickOrder(process.pickOrderId, process.jobOrderId, process.id)}
                     >
                       {t("Matching Stock")}

src/i18n/zh/common.json

@@ -17,7 +17,7 @@
     "Unknown error: ": "未知錯誤: ",
     "Please try again later.": "請稍後重試。",
     "Type": "類型",
-    "Update Job Order": "更新工單",
+    "Update Job Order": "完成工單",
     "No": "沒有",
     "Assignment failed: ": "分配失敗: ",
     "Unknown error": "未知錯誤",
@@ -219,7 +219,8 @@
     "Required Qty": "需求數量",
     "Total processes": "總流程數",
     "View Details": "查看詳情",
-    "view stockin": "查看入庫",
+    "view stockin": "品檢",
+    "No completed Job Order pick orders with matching found": "沒有相關記錄",
     "Completed Step": "完成步驟",
     "Continue": "繼續",
     "Executing": "執行中",

src/i18n/zh/jo.json

@@ -25,7 +25,7 @@
   "Completed": "已完成",
   "Cancel": "取消",
   "Create": "創建",
-  "view stockin": "查看入倉詳情",
+
   "view putaway": "查看上架詳情",
   "process epqc": "進行成品檢驗",
   "scan picked material": "掃碼確認提料",
@@ -88,7 +88,7 @@
   "View Details": "查看詳情",
   "Required Qty": "需求數量",
   "completed Job Order pick orders with Matching": "工單已完成提料和對料",
-  "No completed Job Order pick orders with matching found": "沒有匹配的工單",
+  "No completed Job Order pick orders with matching found": "沒有相關記錄",
   "completed Job Order pick orders with matching": "工單已完成提料和對料",
   "Total": "總數",
   "Back to List": "返回列表",
@@ -345,6 +345,7 @@
   "Total Steps": "總步驟數",
   "Unknown": "",
   "Job Type": "工單類型",
+  "Update Job Order": "完成工單",
   "Production Date":"生產日期",
   "Jo Pick Order Detail":"工單提料詳情",
   "WIP": "半成品",
@@ -394,7 +395,7 @@
   "Required Qty": "需求數量",
   "Total processes": "總流程數",
   "View Details": "查看詳情",
-  "view stockin": "查看入庫",
+  "view stockin": "品檢",
   "Completed Step": "完成步驟",
   "Continue": "繼續",
   "Executing": "執行中",