diff --git a/src/pages/product/inbound/finishProductOffline/index.vue b/src/pages/product/inbound/finishProductOffline/index.vue
index 0689aec..14441b4 100644
--- a/src/pages/product/inbound/finishProductOffline/index.vue
+++ b/src/pages/product/inbound/finishProductOffline/index.vue
@@ -145,6 +145,8 @@ export default class finishProductOfflineDom extends BasePage {
   // 必须要在onReady生命周期，因为onLoad生命周期组件可能尚未创建完毕
   async onReady() {
     this.$form.setRules(this.rules);
+    await this.model.queryReturningTypeList();
+    this.form.aimWl = model.firstLocation;
   }
   /**
    * 处理选择行 选中一条执行一次
@@ -240,9 +242,14 @@ export default class finishProductOfflineDom extends BasePage {
       this.customToast(this.$t('message.barcode') as string);
       return;
     }
+    if (this.model.searchCode == '') {
+      this.customToast(this.$t('message.barcode_PleaseScan') as string);
+      return;
+    }
     if (this.materielList.length == 0) {
       this.materielList.push(this.model.materielList[0]);
       this.materielList[this.materielList.length - 1].locCode = this.form.aimWl.label;
+      this.model.setSearchCode();
     } else {
       let flag = 0;
       for (let i = 0; i < this.materielList.length; i++) {
@@ -254,7 +261,9 @@ export default class finishProductOfflineDom extends BasePage {
       if (flag == 0) {
         this.materielList.push(this.model.materielList[0]);
         this.materielList[this.materielList.length - 1].locCode = this.form.aimWl.label;
+        this.model.setSearchCode();
       } else {
+        this.model.setSearchCode();
         this.customToast(this.$t('message.product_Tip7') as string);
       }
     }
@@ -270,7 +279,7 @@ export default class finishProductOfflineDom extends BasePage {
     }
     await this.model.queryOrderInInfo(this.form);
     if (this.model.searchCode == '1') {
-      await this.model.queryTypeList(this.form.barCode);
+      await this.model.queryTypeList(this.model.materielList[0].productCode);
       this.form.aimWl = model.firstLocation;
     }
   }
diff --git a/src/pages/product/inbound/finishProductOffline/model.ts b/src/pages/product/inbound/finishProductOffline/model.ts
index efd0d47..daa37d8 100644
--- a/src/pages/product/inbound/finishProductOffline/model.ts
+++ b/src/pages/product/inbound/finishProductOffline/model.ts
@@ -105,6 +105,11 @@ export class PickingModule extends VuexModule {
     const materielList = materielList2;
     return { searchCode, materielList };
   }
+  @MutationAction
+  async setSearchCode() {
+    const searchCode = '';
+    return { searchCode };
+  }
   /**
    * 确认按钮
    * @param orderNo