Ver código fonte

do record add handler

stable1
CANCERYS\kw093 2 semanas atrás
pai
commit
d988ab92b5
3 arquivos alterados com 51 adições e 3 exclusões
  1. +42
    -1
      src/app/api/pickOrder/actions.ts
  2. +4
    -0
      src/components/FinishedGoodSearch/GoodPickExecutionRecord.tsx
  3. +5
    -2
      src/i18n/zh/pickOrder.json

+ 42
- 1
src/app/api/pickOrder/actions.ts Ver arquivo

@@ -370,6 +370,8 @@ export interface CompletedDoPickOrderResponse {
completedDate: string;
fgPickOrders: FGPickOrderResponse[];
deliveryNoteCode: number;
/** Legacy: do_pick_order_record.handler_name; workbench: delivery_order_pick_order.handlerName */
handlerName?: string | null;
}

// 新增:搜索参数接口
@@ -689,6 +691,38 @@ export const fetchCompletedDoPickOrders = async (
return response;
};


/** DO workbench: completed tickets from `delivery_order_pick_order.ticketStatus = completed`. **/
/*
export const fetchCompletedDoPickOrdersWorkbench = async (
userId: number,
searchParams?: CompletedDoPickOrderSearchParams,
): Promise<CompletedDoPickOrderResponse[]> => {
const params = new URLSearchParams();

if (searchParams?.deliveryNoteCode) {
params.append("deliveryNoteCode", searchParams.deliveryNoteCode);
}
if (searchParams?.shopName) {
params.append("shopName", searchParams.shopName);
}
if (searchParams?.targetDate) {
params.append("targetDate", searchParams.targetDate);
}
if (searchParams?.truckLanceCode) {
params.append("truckLanceCode", searchParams.truckLanceCode);
}

const queryString = params.toString();
const url = `${BASE_API_URL}/pickOrder/completed-do-pick-orders-workbench/${userId}${
queryString ? `?${queryString}` : ""
}`;

return serverFetchJson<CompletedDoPickOrderResponse[]>(url, {
method: "GET",
});
};
*/
/** 全部已完成 DO 提貨記錄(不限經手人),需後端 `/completed-do-pick-orders-all` */
export const fetchCompletedDoPickOrdersAll = async (
searchParams?: CompletedDoPickOrderSearchParams
@@ -770,12 +804,19 @@ export const fetchFGPickOrdersByUserId = async (userId: number) => {
};

/** DO workbench: FG headers from `delivery_order_pick_order`, not `do_pick_order_line`. */
/*
export const fetchFGPickOrdersByUserIdWorkbench = async (userId: number) => {
return serverFetchJson<FGPickOrderResponse[]>(
`${BASE_API_URL}/pickOrder/fg-pick-orders-workbench/${userId}`,
{ method: "GET" },
{
method: "GET",
// Must be fresh: determines whether shell shows Floor/Lane panel or Detail.
cache: "no-store",
next: { revalidate: 0 },
},
);
};
*/
export const updateSuggestedLotLineId = async (suggestedPickLotId: number, newLotLineId: number) => {
const response = await serverFetchJson<PostPickOrderResponse<UpdateSuggestedLotLineIdRequest>>(
`${BASE_API_URL}/suggestedPickLot/update-suggested-lot/${suggestedPickLotId}`,


+ 4
- 0
src/components/FinishedGoodSearch/GoodPickExecutionRecord.tsx Ver arquivo

@@ -643,6 +643,10 @@ if (showDetailView && selectedDoPickOrder) {
<Typography variant="subtitle1">
<strong>{t("Ticket No.")}:</strong> {selectedDoPickOrder.ticketNo}
</Typography>
<Typography variant="subtitle1">
<strong>{t("Handler")}:</strong>{" "}
{selectedDoPickOrder.handlerName?.trim() ? selectedDoPickOrder.handlerName : "—"}
</Typography>
<Typography variant="subtitle1">
<strong>{t("Truck Lance Code")}:</strong> {selectedDoPickOrder.truckLanceCode}
</Typography>


+ 5
- 2
src/i18n/zh/pickOrder.json Ver arquivo

@@ -283,13 +283,13 @@
"Actual Pick Qty":"實際提料數量",
"Required Qty":"所需數量",
"Issue Remark":"問題描述",
"Handler":"處理者",
"Handler":"提料員",
"Qty is required":"必需輸入數量",
"Qty is not allowed to be greater than remaining available qty":"輸入數量不能大於剩餘可用數量",
"Qty is not allowed to be greater than required qty":"輸入數量不能大於所需數量",
"At least one issue must be reported":"至少需要報告一個問題",
"issueRemark":"問題描述是必需的",
"handler":"處理者",
"handler":"提料員",
"Max":"最大值",
"Route":"路線",
"Index":"編號",
@@ -469,6 +469,9 @@
"4F ticket": "4/F 票",
"4F lane panel legend": "貨車班次 — 裝載序(未撳數/總單數)",
"Loading sequence n": "板{{n}}",
"lot QR code": "批號 QR 碼",
"label Printer" : "標籤打印機",
"A4 Printer" : "A4 打印機",
"Loading Sequence": "裝載序",
"The scanned lot inventory line is unavailable. Cannot switch or bind; pick line was not updated.": "掃描的庫存批行為「不可用」,無法換批或綁定;揀貨行未更新。",
"is unavable. Please check around have available QR code or not.": "此批號不可用,請檢查周圍是否有可用的 QR 碼。",


Carregando…
Cancelar
Salvar