From b3d74108333ce8ccfaff500d7c349725e90309ef Mon Sep 17 00:00:00 2001
From: zhangzhiqiang <zhangzhiqiang@yoycol.com>
Date: Wed, 22 Feb 2023 21:48:05 +0800
Subject: [PATCH] =?UTF-8?q?add:=E5=87=BA=E5=BA=93=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=B9=E6=AC=A1=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../st/core/service/impl/CheckOutBillServiceImpl.java    | 3 +++
 .../java/org/nl/wms/st/core/wql/QST_IVT_CHECKOUTBILL.wql | 3 +++
 mes/qd/src/views/wms/pf/initformula/DivDialog.vue        | 4 ++++
 .../views/wms/st/core/outbill/checkoutbill/AddDtl.vue    | 9 +++++++++
 4 files changed, 19 insertions(+)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/CheckOutBillServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/CheckOutBillServiceImpl.java
index d0f5b2d5..b84861be 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/CheckOutBillServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/CheckOutBillServiceImpl.java
@@ -125,6 +125,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
         if (StrUtil.isNotEmpty(map.get("remark"))) {
             map.put("remark", "%" + map.get("remark") + "%");
         }
+        if (StrUtil.isNotEmpty(map.get("pcsn"))) {
+            map.put("pcsn", map.get("pcsn"));
+        }
         String begin_time = map.get("begin_time");
         String end_time =  map.get("end_time");
         if (StrUtil.isNotEmpty(begin_time)) {
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_CHECKOUTBILL.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_CHECKOUTBILL.wql
index c6ed75dc..d70c4503 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_CHECKOUTBILL.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_CHECKOUTBILL.wql
@@ -545,6 +545,9 @@
                OPTION 输入.bill_code <> ""
                        qlmst.inspection_code like 输入.bill_code
                ENDOPTION
+                 OPTION 输入.pcsn <> ""
+                      qldtl.pcsn = 输入.pcsn
+              ENDOPTION
                OPTION 输入.begin_time <> ""
                    qlmst.biz_date >= 输入.begin_time
                ENDOPTION
diff --git a/mes/qd/src/views/wms/pf/initformula/DivDialog.vue b/mes/qd/src/views/wms/pf/initformula/DivDialog.vue
index 3bd2e09a..e439fb20 100644
--- a/mes/qd/src/views/wms/pf/initformula/DivDialog.vue
+++ b/mes/qd/src/views/wms/pf/initformula/DivDialog.vue
@@ -1136,6 +1136,10 @@ export default {
             this.tableDtl = res.tableDtl
             this.form2.total_qty1 = 0
             this.form2.add_qty1 = 0
+            this.ball_time = res.ball_time
+            if ((parseFloat(this.ball_time) > 0)) {
+              this.form.ball_time = parseFloat(this.ball_time)
+            }
             for (let i = 0; i < this.tableDtl.length; i++) {
               const row = this.tableDtl[i]
               row.edit = true
diff --git a/mes/qd/src/views/wms/st/core/outbill/checkoutbill/AddDtl.vue b/mes/qd/src/views/wms/st/core/outbill/checkoutbill/AddDtl.vue
index dffd69be..f113b65d 100644
--- a/mes/qd/src/views/wms/st/core/outbill/checkoutbill/AddDtl.vue
+++ b/mes/qd/src/views/wms/st/core/outbill/checkoutbill/AddDtl.vue
@@ -39,6 +39,15 @@
           class="filter-item"
           @keyup.enter.native="crud.toQuery"
         />
+        <el-input
+          v-model="query.pcsn"
+          clearable
+          size="mini"
+          placeholder="批次"
+          style="width: 200px;"
+          class="filter-item"
+          @keyup.enter.native="crud.toQuery"
+        />
         <rrOperation />
       </div>
     </div>