From 7d3e122635a778e032af046fe2ca98afa66e24e1 Mon Sep 17 00:00:00 2001
From: "CANCERYS\\kw093" <kw093a011@gmail.com>
Date: Sun, 26 Apr 2026 11:34:33 +0800
Subject: [PATCH] update expirylot handle like no lot,

---
 .../WorkbenchGoodPickExecutionDetail.tsx      | 15 ++++-----
 .../JoWorkbench/newJobPickExecution.tsx       | 33 ++++++++++---------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/components/DoWorkbench/WorkbenchGoodPickExecutionDetail.tsx b/src/components/DoWorkbench/WorkbenchGoodPickExecutionDetail.tsx
index daa9ab4..21b6cc7 100644
--- a/src/components/DoWorkbench/WorkbenchGoodPickExecutionDetail.tsx
+++ b/src/components/DoWorkbench/WorkbenchGoodPickExecutionDetail.tsx
@@ -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) ||
diff --git a/src/components/JoWorkbench/newJobPickExecution.tsx b/src/components/JoWorkbench/newJobPickExecution.tsx
index 2865335..a37cccb 100644
--- a/src/components/JoWorkbench/newJobPickExecution.tsx
+++ b/src/components/JoWorkbench/newJobPickExecution.tsx
@@ -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[