diff --git a/src/app/api/pickOrder/actions.ts b/src/app/api/pickOrder/actions.ts
index 3de7cdc..22c519a 100644
--- a/src/app/api/pickOrder/actions.ts
+++ b/src/app/api/pickOrder/actions.ts
@@ -207,6 +207,7 @@ export interface PickExecutionIssueData {
   actualPickQty: number;
   missQty: number;
   badItemQty: number;
+  badPackageQty?: number;
   issueRemark: string;
   pickerName: string;
   handledBy?: number;
@@ -996,6 +997,7 @@ export interface LotSubstitutionConfirmRequest {
   stockOutLineId: number;
   originalSuggestedPickLotId: number;
   newInventoryLotNo: string;
+  newStockInLineId: number;
 }
 export const confirmLotSubstitution = async (data: LotSubstitutionConfirmRequest) => {
   const response = await serverFetchJson<PostPickOrderResponse>(
diff --git a/src/components/FinishedGoodSearch/GoodPickExecutionForm.tsx b/src/components/FinishedGoodSearch/GoodPickExecutionForm.tsx
index 03af4de..c5441af 100644
--- a/src/components/FinishedGoodSearch/GoodPickExecutionForm.tsx
+++ b/src/components/FinishedGoodSearch/GoodPickExecutionForm.tsx
@@ -278,7 +278,9 @@ const PickExecutionForm: React.FC<PickExecutionFormProps> = ({
   return (
     <Dialog open={open} onClose={handleClose} maxWidth="sm" fullWidth>
       <DialogTitle>
-        {t("Pick Execution Issue Form") + " - "+selectedPickOrderLine.itemCode+ "  "+ selectedPickOrderLine.itemName}
+        {t("Pick Execution Issue Form") }
+        <br />
+        {selectedPickOrderLine.itemCode+ "  "+ selectedPickOrderLine.itemName}
         <br />
         {selectedLot.lotNo}
       </DialogTitle>
@@ -333,20 +335,6 @@ const PickExecutionForm: React.FC<PickExecutionFormProps> = ({
               />
             </Grid>
 
-            <Grid item xs={12}>
-              <FormControl fullWidth>
-                <InputLabel>{t("Reason")}</InputLabel>
-                <Select
-                  value={formData.reason || ""}
-                  onChange={(e) => handleInputChange("reason", e.target.value)}
-                  label={t("Reason")}
-                >
-                  <MenuItem value="">{t("Select Reason")}</MenuItem>
-                  <MenuItem value="miss">{t("Edit")}</MenuItem>
-                  <MenuItem value="bad">{t("Just Complete")}</MenuItem>
-                </Select>
-              </FormControl>
-            </Grid>
 
             <Grid item xs={12}>
               <TextField
@@ -422,6 +410,21 @@ const PickExecutionForm: React.FC<PickExecutionFormProps> = ({
               />
             </Grid>
           </Grid>
+          
+          <Grid item xs={12}>
+              <FormControl fullWidth>
+                <InputLabel>{t("Remark")}</InputLabel>
+                <Select
+                  value={formData.reason || ""}
+                  onChange={(e) => handleInputChange("reason", e.target.value)}
+                  label={t("Remark")}
+                >
+                  <MenuItem value="">{t("Select Reason")}</MenuItem>
+                  <MenuItem value="miss">{t("Edit")}</MenuItem>
+                  <MenuItem value="bad">{t("Just Complete")}</MenuItem>
+                </Select>
+              </FormControl>
+            </Grid>
         </Box>
       </DialogContent>
       <DialogActions>
diff --git a/src/components/FinishedGoodSearch/GoodPickExecutiondetail.tsx b/src/components/FinishedGoodSearch/GoodPickExecutiondetail.tsx
index 10acde5..0ffac31 100644
--- a/src/components/FinishedGoodSearch/GoodPickExecutiondetail.tsx
+++ b/src/components/FinishedGoodSearch/GoodPickExecutiondetail.tsx
@@ -2695,7 +2695,7 @@ paginatedData.map((lot, index) => {
             }}
             title="Report missing or bad items"
           >
-            {t("Issue")}
+            {t("Edit")}
           </Button>
           <Button
             variant="outlined"
@@ -2704,7 +2704,7 @@ paginatedData.map((lot, index) => {
             disabled={lot.stockOutLineStatus === 'completed'}
             sx={{ fontSize: '0.7rem', py: 0.5, minHeight: '28px', minWidth: '60px' }}
           >
-            {t("Skip")}
+            {t("Just Completed")}
           </Button>
         </Stack>
       );
diff --git a/src/components/ProductionProcess/ProductionProcessJobOrderDetail.tsx b/src/components/ProductionProcess/ProductionProcessJobOrderDetail.tsx
index 99d485a..2b29837 100644
--- a/src/components/ProductionProcess/ProductionProcessJobOrderDetail.tsx
+++ b/src/components/ProductionProcess/ProductionProcessJobOrderDetail.tsx
@@ -640,7 +640,7 @@ const handleRelease = useCallback(async ( jobOrderId: number) => {
               variant="contained"
               color="primary"
               onClick={() => handleRelease(jobOrderId)}
-              disabled={stockCounts.insufficient > 0 || processData?.jobOrderStatus !== "planning"}
+              //disabled={stockCounts.insufficient > 0 || processData?.jobOrderStatus !== "planning"}
             >
               {t("Release")}
             </Button>
diff --git a/src/i18n/zh/do.json b/src/i18n/zh/do.json
index 4c6584d..4898ac0 100644
--- a/src/i18n/zh/do.json
+++ b/src/i18n/zh/do.json
@@ -19,6 +19,8 @@
     "Loading...": "正在加載...",
     "Available Trucks": "可用車輛",
     "No trucks available": "沒有車輛可用",
+    "Remark": "備註",
+    "Just Completed": "已完成",
     "Code": "門店訂單編號",
     "code": "門店訂單編號",
     "Create": "新增",
diff --git a/src/i18n/zh/pickOrder.json b/src/i18n/zh/pickOrder.json
index 05efb57..cb185ac 100644
--- a/src/i18n/zh/pickOrder.json
+++ b/src/i18n/zh/pickOrder.json
@@ -9,12 +9,14 @@
         "Status": "來貨狀態",
         "N/A": "不適用",
         "Release Pick Orders": "放單",
+        "Remark": "備註",
         "Escalated": "上報狀態",
         "NotEscalated": "無上報",
         "Assigned To": "已分配",
         "Skip": "跳過",
         "Fetching all matching records...": "正在獲取所有匹配的記錄...",
-        
+        "Edit": "改數",
+        "Just Completed": "已完成",
         "Do you want to start?": "確定開始嗎？",
         "Start": "開始",
         "Pick Order Code(s)": "提料單編號",