diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/ext/erp/wql/QERP.wql b/mes/hd/nladmin-system/src/main/java/org/nl/ext/erp/wql/QERP.wql
index 7777684b..080f4f47 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/ext/erp/wql/QERP.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/ext/erp/wql/QERP.wql
@@ -158,7 +158,7 @@
                         PRESS_ORDER pp
                     WHERE 1=1
                         OPTION 输入.bill_code <> ""
-                               pp.PRESS_CODE = 输入.bill_code
+                               substr(pp.PRESS_CODE,3) = 输入.bill_code
                         ENDOPTION
                     ENDSELECT
                 ENDQUERY
diff --git a/mes/qd/src/views/wms/basedata/master/bagrecord/insertAndPrintDialog.vue b/mes/qd/src/views/wms/basedata/master/bagrecord/insertAndPrintDialog.vue
index 31389354..9c5deae7 100644
--- a/mes/qd/src/views/wms/basedata/master/bagrecord/insertAndPrintDialog.vue
+++ b/mes/qd/src/views/wms/basedata/master/bagrecord/insertAndPrintDialog.vue
@@ -8,6 +8,7 @@
     destroy-on-close
     :close-on-click-modal="false"
     @close="close"
+    @open="open"
   >
     <el-form ref="form" :model="form1" :rules="rules" size="mini" label-width="110px">
       <el-form-item label="压制单号:" prop="bill_code">
@@ -42,7 +43,7 @@
       </el-form-item>
 
       <el-form-item label="还回人员编码:" prop="return_code">
-        <el-input v-model="form1.return_code" placeholder="请输入人员编码" style="width: 250px;" @keyup.enter.native="blurPerson(form1.return_code)" />
+        <el-input v-model="form1.return_code" placeholder="请输入人员编码" style="width: 250px;" @blur="blurPerson(form1.return_code)" />
       </el-form-item>
 
       <el-form-item label="还回人员名称:" prop="return_person">
@@ -109,7 +110,13 @@ export default {
       dialogVisible: false,
       form1: {
         return_person: null,
-        bag_num: '1'
+        return_code: null,
+        storage_qty: 0,
+        pcsn: null,
+        bill_code: null,
+        material_code: null,
+        bag_num: '1',
+        waste_type: 'YZ'
       }
     }
   },
@@ -131,7 +138,16 @@ export default {
     },
     close() {
       this.$emit('update:dialogShow', false)
-      this.form1 = {}
+      this.form1.bill_code = null
+      this.form1.material_code = null
+      this.form1.pcsn = null
+      this.form1.storage_qty = null
+      this.form1.return_code = null
+      this.form1.return_person = null
+    },
+    open() {
+      this.form1.bag_num = '1'
+      this.form1.waste_type = 'YZ'
     },
     blurQueryMater(val) {
       // 根据单据号查询调用接口获取压制订单内信息