diff --git a/src/components/PickOrderSearch/AssignAndRelease.tsx b/src/components/PickOrderSearch/AssignAndRelease.tsx
index 64fe60d..33752b1 100644
--- a/src/components/PickOrderSearch/AssignAndRelease.tsx
+++ b/src/components/PickOrderSearch/AssignAndRelease.tsx
@@ -626,6 +626,7 @@ const AssignAndRelease: React.FC<Props> = ({ filterArgs }) => {
                           <Button variant="outlined" onClick={() => setModalOpen(false)}>
                             {t("Cancel")}
                           </Button>
+                          {/*
                           <Button 
                             variant="contained" 
                             color="primary"
@@ -633,6 +634,7 @@ const AssignAndRelease: React.FC<Props> = ({ filterArgs }) => {
                           >
                             {t("Assign")}
                           </Button>
+                          */}
                           <Button 
                             variant="contained" 
                             color="secondary"
diff --git a/src/components/PickOrderSearch/PickOrderSearch.tsx b/src/components/PickOrderSearch/PickOrderSearch.tsx
index acefbb9..7e10458 100644
--- a/src/components/PickOrderSearch/PickOrderSearch.tsx
+++ b/src/components/PickOrderSearch/PickOrderSearch.tsx
@@ -120,9 +120,9 @@ const PickOrderSearch: React.FC<Props> = () => {
           <Tab label={t("Select Items")} iconPosition="end" />
           {/* <Tab label={t("Select Job Order Items")} iconPosition="end" /> */}
           <Tab label={t("Assign")} iconPosition="end" />
-          <Tab label={t("Release")} iconPosition="end" />
+         {/* <Tab label={t("Release")} iconPosition="end" /> */}
+          {/* <Tab label={t("Pick Execution")} iconPosition="end" /> */}
           <Tab label={t("Pick Execution")} iconPosition="end" />
-          <Tab label={t("Pick Execution V2")} iconPosition="end" />
         </Tabs>
       </Box>
 
@@ -130,8 +130,8 @@ const PickOrderSearch: React.FC<Props> = () => {
       <Box sx={{ 
         p: 2
       }}>
-       {tabIndex === 4 && <WorkbenchPickExecution filterArgs={filterArgs} />}
-        {tabIndex === 3 && <PickExecution filterArgs={filterArgs} />} 
+       {tabIndex === 2 && <WorkbenchPickExecution filterArgs={filterArgs} />}
+       {/* {tabIndex === 3 && <PickExecution filterArgs={filterArgs} />} */} 
         {tabIndex === 0 && (
           <NewCreateItem 
             filterArgs={filterArgs} 
diff --git a/src/components/PickOrderSearch/WorkbenchPickExecution.tsx b/src/components/PickOrderSearch/WorkbenchPickExecution.tsx
index 87fed55..26ac505 100644
--- a/src/components/PickOrderSearch/WorkbenchPickExecution.tsx
+++ b/src/components/PickOrderSearch/WorkbenchPickExecution.tsx
@@ -34,7 +34,6 @@ import {
   confirmLotSubstitution,
   suggestPickOrderWorkbenchV2,
   type PickOrderLotDetailResponse,
-  updateStockOutLineStatusByQRCodeAndLotNo,
 } from "@/app/api/pickOrder/actions";
 import { workbenchScanPick } from "@/app/api/doworkbench/actions";
 import { workbenchScanPickResponseNeedsFullRefresh } from "@/app/api/doworkbench/workbenchScanPickUtils";
@@ -917,27 +916,6 @@ const WorkbenchPickExecution: React.FC<Props> = ({ filterArgs }) => {
             const warnMsg = (res.message as string) || t("Lot switch rejected. Continue with scan-pick.");
             setMessage(warnMsg);
           }
-        } else {
-          const res = await updateStockOutLineStatusByQRCodeAndLotNo({
-            pickOrderLineId: expected.row.pickOrderLineId,
-            inventoryLotNo: scanned.lotNo,
-            stockInLineId: scanned.stockInLineId ?? null,
-            stockOutLineId: expected.row.stockOutLineId,
-            itemId: Number(expected.row.itemId ?? 0),
-            status: "checked",
-          });
-          switchedToUnavailable = res.code === "BOUND_UNAVAILABLE";
-          if (res.code !== "SUCCESS" && res.code !== "checked" && !switchedToUnavailable) {
-            const msg = (res.message as string) || t("Lot switch failed");
-            setLotConfirmationError(msg);
-            setError(msg);
-            startTransition(() => {
-              setQrScanError(true);
-              setQrScanSuccess(false);
-              setQrScanErrorMsg(msg);
-            });
-            return;
-          }
         }
 
         if (!switchedToUnavailable) {
@@ -1518,6 +1496,17 @@ const WorkbenchPickExecution: React.FC<Props> = ({ filterArgs }) => {
                         size="small"
                         type="number"
                         value={qtyBySolId[r.stockOutLineId] ?? Number(r.requiredQty)}
+                        onKeyDown={(e) => {
+                          const editable = qtyEditableBySolId[r.stockOutLineId] === true;
+                          if (!editable) return;
+                          if (e.key !== "{") return;
+                          e.preventDefault();
+                          setQtyEditableBySolId((prev) => ({
+                            ...prev,
+                            [r.stockOutLineId]: false,
+                          }));
+                          (e.currentTarget as HTMLInputElement).blur();
+                        }}
                         onChange={(e) => {
                           const v = e.target.value;
                           setQtyBySolId((prev) => {
diff --git a/src/i18n/zh/pickOrder.json b/src/i18n/zh/pickOrder.json
index 10b3235..3053b4a 100644
--- a/src/i18n/zh/pickOrder.json
+++ b/src/i18n/zh/pickOrder.json
@@ -9,7 +9,12 @@
         "Status": "來貨狀態",
         "N/A": "不適用",
         "Release Pick Orders": "放單",
+        "released": "已放單",
+        "Loading...": "載入中...",
+        "Suggestion success": "建議成功",
         "Remark": "備註",
+        "Available Qty": "可用數量",
+        "Picked Qty": "已提料數量",
         "Escalated": "上報狀態",
         "NotEscalated": "無上報",
         "Assigned To": "已分配",