Pārlūkot izejas kodu

update expirylot handle like no lot,

MergeProblem1
CANCERYS\kw093 pirms 1 nedēļas
vecāks
revīzija
7d3e122635
2 mainītis faili ar 24 papildinājumiem un 24 dzēšanām
  1. +7
    -8
      src/components/DoWorkbench/WorkbenchGoodPickExecutionDetail.tsx
  2. +17
    -16
      src/components/JoWorkbench/newJobPickExecution.tsx

+ 7
- 8
src/components/DoWorkbench/WorkbenchGoodPickExecutionDetail.tsx Parādīt failu

@@ -3709,16 +3709,18 @@ paginatedData.map((row, index) => {
{rejectDisplay}
</Box>
</>
) :
lot.lotAvailability === 'expired' ? (
<>
{lot.lotNo}{' '}
{t('is expired. Please check around have available QR code or not.')}
</>
) : isInventoryLotLineUnavailable(lot) ? (
<>
{lot.lotNo}{' '}
{t('is unavable. Please check around have available QR code or not.')}
</>
) : lot.lotAvailability === 'expired' ? (
<>
{lot.lotNo}{' '}
{t('is expired. Please check around have available QR code or not.')}
</>
) : (
lot.lotNo
)
@@ -3978,7 +3980,6 @@ paginatedData.map((row, index) => {
}));
}}
disabled={
lot.lotAvailability === 'expired' ||
lot.stockOutLineStatus === 'completed' ||
(Number(lot.stockOutLineId) > 0 && actionBusyBySolId[Number(lot.stockOutLineId)] === true)
}
@@ -4002,8 +4003,6 @@ paginatedData.map((row, index) => {
lot.stockOutLineStatus === 'completed' ||
lot.stockOutLineStatus === 'checked' ||
lot.stockOutLineStatus === 'partially_completed' ||
lot.lotAvailability === 'expired' ||
isLotAvailabilityExpired(lot) ||

// 使用 issue form 後,禁用「Just Completed」(避免再次点击造成重复提交)
(Number(lot.stockOutLineId) > 0 && issuePickedQtyBySolId[Number(lot.stockOutLineId)] !== undefined) ||


+ 17
- 16
src/components/JoWorkbench/newJobPickExecution.tsx Parādīt failu

@@ -4318,7 +4318,22 @@ const JobPickExecution: React.FC<Props> = ({ filterArgs, onBackToList }) => {
}}
>
{lot.lotNo ? (
isInventoryLotLineUnavailable(lot) &&
/*
*/
lot.lotAvailability === "expired" ? (
<>
{lot.lotNo}{" "}
<Box
component="span"
sx={{ fontSize: "0.85rem", lineHeight: 1.4 }}
>
{t(
"is expired. Please check around have available QR code or not.",
)}
</Box>
</>
) : isInventoryLotLineUnavailable(lot) &&
!(
String(
lot.stockOutLineStatus || "",
@@ -4341,18 +4356,7 @@ const JobPickExecution: React.FC<Props> = ({ filterArgs, onBackToList }) => {
)}
</Box>
</>
) : lot.lotAvailability === "expired" ? (
<>
{lot.lotNo}{" "}
<Box
component="span"
sx={{ fontSize: "0.85rem", lineHeight: 1.4 }}
>
{t(
"is expired. Please check around have available QR code or not.",
)}
</Box>
</>
) : (
lot.lotNo
)
@@ -4662,7 +4666,6 @@ const JobPickExecution: React.FC<Props> = ({ filterArgs, onBackToList }) => {
);
}}
disabled={
lot.lotAvailability === "expired" ||
lot.stockOutLineStatus ===
"completed" ||
(Number(lot.stockOutLineId) > 0 &&
@@ -4742,8 +4745,6 @@ const JobPickExecution: React.FC<Props> = ({ filterArgs, onBackToList }) => {
"partially_completed" ||
lot.stockOutLineStatus ===
"partially_complete" ||
lot.lotAvailability === "expired" ||
isLotAvailabilityExpired(lot) ||
isUnavailableLot ||
(Number(lot.stockOutLineId) > 0 &&
issuePickedQtyBySolId[


Notiek ielāde…
Atcelt
Saglabāt