Ver código fonte

補貨 search fix

production
CANCERYS\kw093 21 horas atrás
pai
commit
ebd39a09d4
4 arquivos alterados com 13 adições e 4 exclusões
  1. +1
    -0
      src/app/api/do/replenishmentTypes.ts
  2. +10
    -4
      src/components/DoSearch/DoReplenishmentTab.tsx
  3. +1
    -0
      src/i18n/en/do.json
  4. +1
    -0
      src/i18n/zh/do.json

+ 1
- 0
src/app/api/do/replenishmentTypes.ts Ver arquivo

@@ -29,6 +29,7 @@ export interface DoReplenishmentRecord {
targetDoEstimatedArrivalDate?: string; targetDoEstimatedArrivalDate?: string;
pickOrderLineId?: number; pickOrderLineId?: number;
deliveryOrderPickOrderId?: number; deliveryOrderPickOrderId?: number;
relateTicketNo?: string;
status: string; status: string;
reason?: string; reason?: string;
created?: string; created?: string;


+ 10
- 4
src/components/DoSearch/DoReplenishmentTab.tsx Ver arquivo

@@ -113,6 +113,7 @@ export type ReplenishmentRecord = ReplenishmentDraftRow & {
targetDoEstimatedArrivalDate?: string; targetDoEstimatedArrivalDate?: string;
pickOrderLineId?: number; pickOrderLineId?: number;
actualPickQty?: number; actualPickQty?: number;
relateTicketNo?: string;
status: ReplenishmentStatus; status: ReplenishmentStatus;
created: string; created: string;
}; };
@@ -209,6 +210,7 @@ function mapApiRecord(record: DoReplenishmentRecord): ReplenishmentRecord {
record.actualPickQty != null && Number.isFinite(Number(record.actualPickQty)) record.actualPickQty != null && Number.isFinite(Number(record.actualPickQty))
? Number(record.actualPickQty) ? Number(record.actualPickQty)
: undefined, : undefined,
relateTicketNo: record.relateTicketNo,
status: record.status as ReplenishmentStatus, status: record.status as ReplenishmentStatus,
reason: record.reason, reason: record.reason,
created: record.created ?? "", created: record.created ?? "",
@@ -515,7 +517,7 @@ const DoReplenishmentTab: React.FC = () => {
try { try {
const searchRes = await fetchDoSearch( const searchRes = await fetchDoSearch(
suffix, suffix,
"",
shop,
"completed", "completed",
"", "",
"", "",
@@ -1569,9 +1571,6 @@ const DoReplenishmentTab: React.FC = () => {
<TrackingInlineLine label={t("Replenish Qty")}> <TrackingInlineLine label={t("Replenish Qty")}>
{formatQtyWithUom(row.replenishQty, row.shortUom)} {formatQtyWithUom(row.replenishQty, row.shortUom)}
</TrackingInlineLine> </TrackingInlineLine>
<TrackingInlineLine label={t("replenishmentActualPickQty")}>
{formatQtyWithUom(row.actualPickQty, row.shortUom)}
</TrackingInlineLine>
<TrackingInlineLine label={t("Remark")}> <TrackingInlineLine label={t("Remark")}>
{formatReplenishmentReason(row.reason, t)} {formatReplenishmentReason(row.reason, t)}
</TrackingInlineLine> </TrackingInlineLine>
@@ -1590,6 +1589,13 @@ const DoReplenishmentTab: React.FC = () => {
: "—" : "—"
} }
/> />
<TrackingFieldBlock
label={t("replenishmentRelateTicketNo")}
value={row.relateTicketNo ?? "—"}
/>
<TrackingInlineLine label={t("replenishmentActualPickQty")}>
{formatQtyWithUom(row.actualPickQty, row.shortUom)}
</TrackingInlineLine>
<TrackingFieldBlock <TrackingFieldBlock
label={t("replenishmentStatusLabel")} label={t("replenishmentStatusLabel")}
value={t(row.status)} value={t(row.status)}


+ 1
- 0
src/i18n/en/do.json Ver arquivo

@@ -103,6 +103,7 @@
"Replenish Qty": "Replenish Qty", "Replenish Qty": "Replenish Qty",
"Replenish Qty short": "Replenish", "Replenish Qty short": "Replenish",
"replenishmentActualPickQty": "Actual Picked Qty", "replenishmentActualPickQty": "Actual Picked Qty",
"replenishmentRelateTicketNo": "Related Ticket No.",
"Replenish qty must be greater than zero": "Replenish qty must be greater than zero", "Replenish qty must be greater than zero": "Replenish qty must be greater than zero",
"Replenishment": "Replenishment", "Replenishment": "Replenishment",
"Delivery date is required": "Delivery date is required", "Delivery date is required": "Delivery date is required",


+ 1
- 0
src/i18n/zh/do.json Ver arquivo

@@ -48,6 +48,7 @@
"Replenish Qty": "補貨數量", "Replenish Qty": "補貨數量",
"Replenish Qty short": "補貨", "Replenish Qty short": "補貨",
"replenishmentActualPickQty": "實際提料數量", "replenishmentActualPickQty": "實際提料數量",
"replenishmentRelateTicketNo": "關聯提票號碼",
"Replenish qty must be greater than zero": "補貨數量必須大於零", "Replenish qty must be greater than zero": "補貨數量必須大於零",
"Replenishment": "補貨", "Replenishment": "補貨",
"Delivery date is required": "請選擇送貨日期", "Delivery date is required": "請選擇送貨日期",


Carregando…
Cancelar
Salvar