From e00d4e8da27457884d1f2a89ca7021a68c3e9cb1 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Tue, 25 Jul 2023 18:03:07 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E6=9F=A5=E8=AF=A2=E5=8E=8B?=
 =?UTF-8?q?=E5=88=B6=E5=8D=95=E5=8F=B7=E5=8C=B9=E9=85=8D=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=8C=E8=BD=AF=E5=BA=9F=E9=BB=98=E8=AE=A4=E5=8E=8B=E5=88=B6?=
 =?UTF-8?q?=E8=BD=AF=E5=BA=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/nl/ext/erp/wql/QERP.wql |  2 +-
 .../master/bagrecord/insertAndPrintDialog.vue | 22 ++++++++++++++++---
 2 files changed, 20 insertions(+), 4 deletions(-)

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) {
       // 根据单据号查询调用接口获取压制订单内信息