From 28dcc1f48064ee85a8fe610f9ce5df373b3749a9 Mon Sep 17 00:00:00 2001
From: "CANCERYS\\kw093" <kw093a011@gmail.com>
Date: Fri, 19 Sep 2025 10:18:51 +0800
Subject: [PATCH] update

---
 .../FinishedGoodSearch/FinishedGoodSearch.tsx |  4 +--
 .../GoodPickExecutiondetail.tsx               | 29 +++++++++++++++++--
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/components/FinishedGoodSearch/FinishedGoodSearch.tsx b/src/components/FinishedGoodSearch/FinishedGoodSearch.tsx
index 3c065f5..1376646 100644
--- a/src/components/FinishedGoodSearch/FinishedGoodSearch.tsx
+++ b/src/components/FinishedGoodSearch/FinishedGoodSearch.tsx
@@ -297,14 +297,14 @@ const PickOrderSearch: React.FC<Props> = ({ pickOrders }) => {
                 onClick={() => handleAssignByStore("2/F")}
                 disabled={isAssigning}
               >
-                    {isAssigning ? t("Assigning pick order...") : t("Assign & Release 2/F")}
+                    {isAssigning ? t("Assigning pick order...") : t("Pick Execution 2/F")}
               </Button>
               <Button 
                 variant="contained" 
                 onClick={() => handleAssignByStore("4/F")}
                 disabled={isAssigning}
               >
-                {isAssigning ? t("Assigning pick order...") : t("Assign & Release 4/F")}
+                {isAssigning ? t("Assigning pick order...") : t("Pick Execution 4/F")}
               </Button>
             </Grid>
           </Grid>
diff --git a/src/components/FinishedGoodSearch/GoodPickExecutiondetail.tsx b/src/components/FinishedGoodSearch/GoodPickExecutiondetail.tsx
index 4f41f70..36b24c5 100644
--- a/src/components/FinishedGoodSearch/GoodPickExecutiondetail.tsx
+++ b/src/components/FinishedGoodSearch/GoodPickExecutiondetail.tsx
@@ -934,7 +934,7 @@ const PickExecution: React.FC<Props> = ({ filterArgs }) => {
 
   return (
     <FormProvider {...formProps}>
-      <Stack spacing={2}>
+    
         {/* Search Box */}
         {/*
         <Box>
@@ -966,7 +966,30 @@ const PickExecution: React.FC<Props> = ({ filterArgs }) => {
 */}
 
 
-        
+      <Stack spacing={2}>
+        {/* DO Header */}
+        {fgPickOrdersLoading ? (
+          <Box sx={{ display: 'flex', justifyContent: 'center', p: 2 }}>
+            <CircularProgress size={20} />
+          </Box>
+        ) : (
+          fgPickOrders.length > 0 && (
+            <Paper sx={{ p: 2 }}>
+              <Stack direction="row" spacing={4} useFlexGap flexWrap="wrap">
+              <Typography variant="subtitle1">
+                  <strong>{t("Shop Name")}:</strong> {fgPickOrders[0].shopName || '-'}
+                </Typography>
+                <Typography variant="subtitle1">
+                  <strong>{t("Delivery Date")}:</strong> {(fgPickOrders[0].deliveryDate || '-').split('T')[0]}
+                </Typography>
+                <Typography variant="subtitle1">
+                  <strong>{t("Departure Time")}:</strong> {fgPickOrders[0].DepartureTime || '-'}
+                </Typography>
+              </Stack>
+            </Paper>
+          )
+        )}
+
 
         {/* Combined Lot Table */}
         <Box>
@@ -1052,7 +1075,7 @@ const PickExecution: React.FC<Props> = ({ filterArgs }) => {
                       </TableCell>
                       <TableCell align="center">
                         {/* ✅ QR Scan Button if not scanned, otherwise show TextField + Issue button */}
-                        {!lot.stockOutLineId ? (
+                        {lot.stockOutLineStatus?.toLowerCase() === 'pending' ? (
                           <Button
                             variant="outlined"
                             size="small"