Просмотр исходного кода

scan pick block

stockTakeUpdate
CANCERYS\kw093 2 недель назад
Родитель
Сommit
9897375537
3 измененных файлов: 34 добавлений и 6 удалений
  1. +2
    -0
      src/components/DoWorkbench/WorkbenchGoodPickExecutionDetail.tsx
  2. +31
    -5
      src/components/JoWorkbench/newJobPickExecution.tsx
  3. +1
    -1
      src/i18n/zh/stockTake.json

+ 2
- 0
src/components/DoWorkbench/WorkbenchGoodPickExecutionDetail.tsx Просмотреть файл

@@ -3466,8 +3466,10 @@ const handleSubmitPickQtyWithQty = useCallback(async (lot: any, submitQty: numbe
} catch (error) { } catch (error) {
console.error("Error submitting pick quantity:", error); console.error("Error submitting pick quantity:", error);
const message = error instanceof Error ? error.message.trim() : "";
setQrScanError(true); setQrScanError(true);
setQrScanSuccess(false); setQrScanSuccess(false);
if (message) setQrScanErrorMsg(message);
} finally { } finally {
if (solId > 0) setActionBusyBySolId(prev => ({ ...prev, [solId]: false })); if (solId > 0) setActionBusyBySolId(prev => ({ ...prev, [solId]: false }));
} }


+ 31
- 5
src/components/JoWorkbench/newJobPickExecution.tsx Просмотреть файл

@@ -3313,8 +3313,10 @@ const JobPickExecution: React.FC<Props> = ({ filterArgs, onBackToList, printerCo
}, 1000); }, 1000);
} catch (error) { } catch (error) {
console.error("Error submitting pick quantity:", error); console.error("Error submitting pick quantity:", error);
const message = error instanceof Error ? error.message.trim() : "";
setQrScanError(true); setQrScanError(true);
setQrScanSuccess(false); setQrScanSuccess(false);
if (message) setQrScanErrorMsg(message);
} finally { } finally {
if (solId > 0) if (solId > 0)
setActionBusyBySolId((prev) => ({ ...prev, [solId]: false })); setActionBusyBySolId((prev) => ({ ...prev, [solId]: false }));
@@ -4074,6 +4076,11 @@ const JobPickExecution: React.FC<Props> = ({ filterArgs, onBackToList, printerCo
: lockedSubmitQtyDisplay; : lockedSubmitQtyDisplay;
const totalAvail = Number(lot.itemTotalAvailableQty ?? 0); const totalAvail = Number(lot.itemTotalAvailableQty ?? 0);
const isLastLotUnavailable = Number.isFinite(totalAvail) && totalAvail === 0; const isLastLotUnavailable = Number.isFinite(totalAvail) && totalAvail === 0;
const rejectDisplay = buildLotRejectDisplayMessage(
lot,
scanRejectMessageBySolId,
tPick,
);
return ( return (
<TableRow <TableRow
key={`${lot.pickOrderLineId}-${lot.lotId}`} key={`${lot.pickOrderLineId}-${lot.lotId}`}
@@ -4188,16 +4195,35 @@ const JobPickExecution: React.FC<Props> = ({ filterArgs, onBackToList, printerCo
</> </>
) : ( ) : (
lot.lotNo
<>
{lot.lotNo}
{rejectDisplay ? (
<Box
component="span"
sx={{
display: "block",
mt: 0.5,
color: "error.main",
fontSize: "0.85rem",
lineHeight: 1.4,
whiteSpace: "normal",
wordBreak: "break-word",
}}
>
{rejectDisplay}
</Box>
) : null}
</>
) )
) : ( ) : (
<Box <Box
component="span" component="span"
sx={{ fontSize: "0.85rem", lineHeight: 1.4 }}
sx={{ fontSize: "0.85rem", lineHeight: 1.4, color: rejectDisplay ? "error.main" : undefined }}
> >
{t(
"Please check around have QR code or not, may be have just now stock in or transfer in or transfer out.",
)}
{rejectDisplay ||
t(
"Please check around have QR code or not, may be have just now stock in or transfer in or transfer out.",
)}
</Box> </Box>
)} )}
</Typography> </Typography>


+ 1
- 1
src/i18n/zh/stockTake.json Просмотреть файл

@@ -75,7 +75,7 @@
"UOM": "單位", "UOM": "單位",
"Stock Take Qty(include Bad Qty)= Available Qty": "盤點數", "Stock Take Qty(include Bad Qty)= Available Qty": "盤點數",
"Record Status": "盤點狀態", "Record Status": "盤點狀態",
"No data": "本月尚未有t任何盤點記錄",
"No data": "本月尚未有任何盤點記錄",
"Difference": "差異", "Difference": "差異",
"First": "第一次", "First": "第一次",
"Second": "第二次", "Second": "第二次",


Загрузка…
Отмена
Сохранить