From ead0e19c57e6f0f90338586b3a541730ad207b6b Mon Sep 17 00:00:00 2001 From: "CANCERYS\\kw093" Date: Tue, 21 Apr 2026 16:16:24 +0800 Subject: [PATCH] productprcoess page tab 0 search by today --- src/app/api/do/actions.tsx | 64 +++++++++++++++++++ .../ProductionProcessPage.tsx | 2 +- src/i18n/zh/pickOrder.json | 2 +- 3 files changed, 66 insertions(+), 2 deletions(-) diff --git a/src/app/api/do/actions.tsx b/src/app/api/do/actions.tsx index 76304b7..6831a1b 100644 --- a/src/app/api/do/actions.tsx +++ b/src/app/api/do/actions.tsx @@ -104,6 +104,7 @@ export interface PrintDNLabelsRespone{ success: boolean; message?: string } + export interface BatchReleaseRequest { ids: number[]; } @@ -423,6 +424,69 @@ export async function printDNLabels(request: PrintDNLabelsRequest){ return { success: true, message: "Print job sent successfully (labels)"} as PrintDeliveryNoteResponse } +/* +export interface PrintWorkbenchDeliveryNoteRequest{ + deliveryOrderPickOrderId: number; + printerId: number; + printQty: number; + numOfCarton: number; + isDraft: boolean; +} + +export interface PrintWorkbenchDNLabelsRequest{ + deliveryOrderPickOrderId: number; + printerId: number; + printQty: number; + numOfCarton: number; +} +export async function printDNWorkbench(request: PrintWorkbenchDeliveryNoteRequest){ + const params = new URLSearchParams(); + params.append("doPickOrderId", request.deliveryOrderPickOrderId.toString()); + params.append("printerId", request.printerId.toString()); + if (request.printQty !== null && request.printQty !== undefined) { + params.append("printQty", request.printQty.toString()); + } + params.append("numOfCarton", request.numOfCarton.toString()); + params.append("isDraft", request.isDraft.toString()); + + try { + const response = await serverFetch(`${BASE_API_URL}/do/workbench/print-DN?${params.toString()}`, { + method: "GET", + }); + if (response.ok) { + return { success: true, message: "Print job sent successfully (workbench DN)" } as PrintDeliveryNoteResponse; + } + const errorText = await response.text(); + console.error("Workbench print DN error:", errorText); + return { + success: false, + message: "No workbench data found for this ticket.", + } as PrintDeliveryNoteResponse; + } catch (error) { + console.error("Error in printDNWorkbench:", error); + return { + success: false, + message: "No workbench data found for this ticket.", + } as PrintDeliveryNoteResponse; + } +} + +export async function printDNLabelsWorkbench(request: PrintWorkbenchDNLabelsRequest){ + const params = new URLSearchParams(); + params.append("doPickOrderId", request.deliveryOrderPickOrderId.toString()); + params.append("printerId", request.printerId.toString()); + if (request.printQty !== null && request.printQty !== undefined) { + params.append("printQty", request.printQty.toString()); + } + params.append("numOfCarton", request.numOfCarton.toString()); + + await serverFetchWithNoContent(`${BASE_API_URL}/do/workbench/print-DNLabels?${params.toString()}`,{ + method: "GET" + }); + + return { success: true, message: "Print job sent successfully (workbench labels)"} as PrintDeliveryNoteResponse +} +*/ export interface Check4FTruckBatchResponse { hasProblem: boolean; problems: ProblemDoDto[]; diff --git a/src/components/ProductionProcess/ProductionProcessPage.tsx b/src/components/ProductionProcess/ProductionProcessPage.tsx index e790a24..082f0bb 100644 --- a/src/components/ProductionProcess/ProductionProcessPage.tsx +++ b/src/components/ProductionProcess/ProductionProcessPage.tsx @@ -35,7 +35,7 @@ const ProductionProcessPage: React.FC = ({ printerCo /** 列表搜尋/分頁:保留在切換工單詳情時,返回後仍為同一條件 */ const [productionListState, setProductionListState] = useState(() => ({ ...createDefaultProductionProcessListPersistedState(), - date: "", + // date: "", })); const [waitingPutawayListState, setWaitingPutawayListState] = useState( createDefaultProductionProcessListPersistedState, diff --git a/src/i18n/zh/pickOrder.json b/src/i18n/zh/pickOrder.json index 634e90a..581f83c 100644 --- a/src/i18n/zh/pickOrder.json +++ b/src/i18n/zh/pickOrder.json @@ -279,7 +279,7 @@ "Missing Item Qty":"貨品遺失數量", "Bad Item Qty":"不良貨品數量", "Bad Package Qty":"不良包裝數量", - + "Lot line is not available (status=UNAVAILABLE)":"掃描批次不可用", "Actual Pick Qty":"實際提料數量", "Required Qty":"所需數量", "Issue Remark":"問題描述",