Преглед изворни кода

excel version for stocktakevaiance report, lotlabelprint modal show locatioln update

MergeProblem1
Tommy\2Fi-Staff пре 1 дан
родитељ
комит
b005b1c2fb
3 измењених фајлова са 11 додато и 3 уклоњено
  1. +1
    -1
      src/app/(main)/report/page.tsx
  2. +1
    -1
      src/components/FinishedGoodSearch/GoodPickExecutiondetail.tsx
  3. +9
    -1
      src/components/InventorySearch/LotLabelPrintModal.tsx

+ 1
- 1
src/app/(main)/report/page.tsx Прегледај датотеку

@@ -504,7 +504,7 @@ export default function ReportPage() {
setLoading={setLoading} setLoading={setLoading}
reportTitle={currentReport.title} reportTitle={currentReport.title}
/> />
) : currentReport.id === 'rep-013' || currentReport.id === 'rep-009' ? (
) : currentReport.id === 'rep-013' || currentReport.id === 'rep-009' || currentReport.id === 'rep-012' ? (
<> <>
<Button <Button
variant="contained" variant="contained"


+ 1
- 1
src/components/FinishedGoodSearch/GoodPickExecutiondetail.tsx Прегледај датотеку

@@ -5054,7 +5054,7 @@ const PickExecution: React.FC<Props> = ({
setLotLabelPrintReminderText(null); setLotLabelPrintReminderText(null);
}} }}
initialPayload={lotLabelPrintInitialPayload} initialPayload={lotLabelPrintInitialPayload}
defaultPrinterName="Label機 2F 大堂"
defaultPrinterName="Label機 2F A+B"
hideScanSection hideScanSection
reminderText={lotLabelPrintReminderText ?? undefined} reminderText={lotLabelPrintReminderText ?? undefined}
/> />


+ 9
- 1
src/components/InventorySearch/LotLabelPrintModal.tsx Прегледај датотеку

@@ -51,12 +51,16 @@ type QrCodeAnalysisResponse = {
stockInLineId: number; stockInLineId: number;
lotNo: string; lotNo: string;
inventoryLotLineId: number; inventoryLotLineId: number;
warehouseCode?: string | null;
warehouseName?: string | null;
}; };
sameItemLots: Array<{ sameItemLots: Array<{
lotNo: string; lotNo: string;
inventoryLotLineId: number; inventoryLotLineId: number;
availableQty: number; availableQty: number;
uom: string; uom: string;
warehouseCode?: string | null;
warehouseName?: string | null;
}>; }>;
}; };


@@ -513,6 +517,7 @@ const LotLabelPrintModal: React.FC<LotLabelPrintModalProps> = ({
{availableLots.map((lot) => { {availableLots.map((lot) => {
const isPrinting = const isPrinting =
printingLotLineId === lot.inventoryLotLineId; printingLotLineId === lot.inventoryLotLineId;
const loc = String(lot.warehouseCode ?? "").trim();
return ( return (
<Box <Box
key={lot.inventoryLotLineId} key={lot.inventoryLotLineId}
@@ -537,9 +542,12 @@ const LotLabelPrintModal: React.FC<LotLabelPrintModalProps> = ({
Lot:{lot.lotNo} Lot:{lot.lotNo}
{lot._scanned ? "(已掃)" : ""} {lot._scanned ? "(已掃)" : ""}
</Typography> </Typography>
<Typography variant="body2" color="text.secondary">
位置:{loc || "—"}
</Typography>
<Typography variant="body2" color="text.secondary"> <Typography variant="body2" color="text.secondary">
可用量:{Number(lot.availableQty).toLocaleString()}{" "} 可用量:{Number(lot.availableQty).toLocaleString()}{" "}
{lot.uom || ""}
單位:{lot.uom || ""}
</Typography> </Typography>
</Box> </Box>
<Box sx={{ ml: "auto" }}> <Box sx={{ ml: "auto" }}>


Loading…
Откажи
Сачувај