diff --git a/src/app/api/do/actions.tsx b/src/app/api/do/actions.tsx
index 03c64fb..4be8783 100644
--- a/src/app/api/do/actions.tsx
+++ b/src/app/api/do/actions.tsx
@@ -19,6 +19,7 @@ export interface DoDetail {
   code: string;
   supplierCode: string;
   shopCode: string;
+  shopName: string;
   currencyCode: string;
   orderDate: string;
   estimatedArrivalDate: string;
diff --git a/src/components/DoDetail/DoInfoCard.tsx b/src/components/DoDetail/DoInfoCard.tsx
index 1e2b23e..9da2846 100644
--- a/src/components/DoDetail/DoInfoCard.tsx
+++ b/src/components/DoDetail/DoInfoCard.tsx
@@ -41,8 +41,8 @@ const DoInfoCard: React.FC<Props> = ({
                         </Grid>
                         <Grid item xs={6}>
                             <TextField
-                                {...register("shopCode")}
-                                label={t("Shop Code")}
+                                {...register("shopName")}
+                                label={t("Shop Name")}
                                 fullWidth
                                 disabled={true}
                             />
diff --git a/src/components/DoSearch/DoSearch.tsx b/src/components/DoSearch/DoSearch.tsx
index 9b2ab7e..0a61b52 100644
--- a/src/components/DoSearch/DoSearch.tsx
+++ b/src/components/DoSearch/DoSearch.tsx
@@ -452,14 +452,14 @@ if(orderStartDate != ""){
               alignItems="end"
             >
             <Stack spacing={2} direction="row">
-              <Button
+              {/*<Button
                 name="submit"
                 variant="contained"
                 //   startIcon={<Check />}
                 type="submit"
               >
                 {t("Create")}
-              </Button>
+              </Button>*/}
               {hasSearched && hasResults && (
                 <Button
                   name="batch_release"
diff --git a/src/components/FinishedGoodSearch/FGPickOrderCard.tsx b/src/components/FinishedGoodSearch/FGPickOrderCard.tsx
index 885942a..04c8481 100644
--- a/src/components/FinishedGoodSearch/FGPickOrderCard.tsx
+++ b/src/components/FinishedGoodSearch/FGPickOrderCard.tsx
@@ -51,14 +51,14 @@ const FGPickOrderCard: React.FC<Props> = ({ fgOrder, onQrCodeClick }) => {
                 value={fgOrder.storeId}
               />
             </Grid>
-            <Grid item xs={6}>
+            {/*<Grid item xs={6}>
               <TextField
                 label={t("Shop ID")}
                 fullWidth
                 disabled={true}
                 value={fgOrder.shopCode}
               />
-            </Grid>
+            </Grid>*/}
             <Grid item xs={6}>
               <TextField
                 label={t("Shop Name")}
diff --git a/src/components/JoSearch/JoSearch.tsx b/src/components/JoSearch/JoSearch.tsx
index 55fe5f4..6815a0a 100644
--- a/src/components/JoSearch/JoSearch.tsx
+++ b/src/components/JoSearch/JoSearch.tsx
@@ -28,7 +28,10 @@ interface Props {
     bomCombo: BomCombo[]
 }
 
-type SearchQuery = Partial<Omit<JobOrder, "id">>;
+type SearchQuery = Partial<Omit<JobOrder, "id">> & {
+  planStartFrom?: string;
+  planStartTo?: string;  
+};
 
 type SearchParamNames = keyof SearchQuery;
 
@@ -46,6 +49,8 @@ const JoSearch: React.FC<Props> = ({ defaultInputs, bomCombo }) => {
     const searchCriteria: Criterion<SearchParamNames>[] = useMemo(() => [
         { label: t("Code"), paramName: "code", type: "text" },
         { label: t("Item Name"), paramName: "itemName", type: "text" },
+        { label: t("Estimated Production Date From"), paramName: "planStartFrom", type: "date" },
+        { label: t("Estimated Production Date To"), paramName: "planStartTo", type: "date" },        
     ], [t])
 
     const columns = useMemo<Column<JobOrder>[]>(
@@ -94,6 +99,12 @@ const JoSearch: React.FC<Props> = ({ defaultInputs, bomCombo }) => {
                         {t(upperFirst(row.status))}
                     </span>
                 }
+            },{
+                name: "planStart",
+                label: t("Estimated Production Date"),
+                renderCell: (row) => {
+                    return row.planStart ? arrayToDateString(row.planStart, "output") : '-'
+                }
             },
             {
                 // TODO put it inside Action Buttons
diff --git a/src/components/PoDetail/QcComponent.tsx b/src/components/PoDetail/QcComponent.tsx
index adc4089..915ecc3 100644
--- a/src/components/PoDetail/QcComponent.tsx
+++ b/src/components/PoDetail/QcComponent.tsx
@@ -705,7 +705,7 @@ const QcComponent: React.FC<Props> = ({ itemDetail, disabled = false }) => {
                       <FormControlLabel disabled={disabled}
                         value="2" control={<Radio />}
                         sx={{"& .Mui-checked": {color: "red"}}}
-                        label= {detailMode ? "全部拒絕並退貨" : "不接受並退貨"} />
+                        label= {detailMode ? "全部拒絕並退貨" : "不接受並需要退貨"} />
                         
                       {(itemDetail.status == "pending" || disabled) && (<>
                       <FormControlLabel disabled={disabled}
diff --git a/src/i18n/zh/do.json b/src/i18n/zh/do.json
index ddcd582..e21ebc7 100644
--- a/src/i18n/zh/do.json
+++ b/src/i18n/zh/do.json
@@ -43,7 +43,7 @@
     "Back": "返回",
     "Batch Release": "批量放單",
     "Batch release completed successfully.": "已完成批量放單",
-    "Edit Delivery Order Detail": "編輯送貨訂單單詳情",
+    "Edit Delivery Order Detail": "編輯送貨訂單詳情",
     "DO released successfully! Pick orders created.": "送貨訂單放單成功！提料單已建立。",
     "Stock Available": "庫存可用",
     "row selected": "行已選擇",