From 269558eb03e0f3734bfa8ac32f45b62b0d8fde33 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Tue, 27 Dec 2022 11:12:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../st/outbill/service/impl/CheckOutBillServiceImpl.java | 3 +++
 .../org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql   | 6 ++++++
 lms/nladmin-ui/src/views/wms/st/outbill/StructIvt.vue    | 8 ++++----
 lms/nladmin-ui/src/views/wms/st/outbill/index.vue        | 9 +++++++++
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
index 248cbae3a..05255ca70 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
@@ -89,6 +89,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
         if (StrUtil.isNotEmpty(map.get("sap_pcsn"))) {
             map.put("sap_pcsn", "%" + map.get("sap_pcsn") + "%");
         }
+        if (StrUtil.isNotEmpty(map.get("cust_code"))) {
+            map.put("cust_code", "%" + map.get("cust_code") + "%");
+        }
 
         //获取人员对应的仓库
         UserStorServiceImpl userStorService = new UserStorServiceImpl();
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
index 56a4315d0..d233913b1 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
@@ -47,6 +47,7 @@
     输入.box_no                           TYPEAS s_string
     输入.canuse_qty                           TYPEAS s_string
     输入.sap_pcsn                           TYPEAS s_string
+    输入.cust_code                           TYPEAS s_string
     输入.in_stor_id                           TYPEAS f_string
 [临时表]
 	--这边列出来的临时表就会在运行期动态创建
@@ -97,6 +98,11 @@
                        sub.sap_pcsn like 输入.sap_pcsn
                ENDOPTION
 
+               OPTION 输入.cust_code <> ""
+                       (cu.cust_code like 输入.cust_code or
+                        cu.cust_simple_name like 输入.cust_code)
+               ENDOPTION
+
                OPTION 输入.pcsn <> ""
                        dis.pcsn like 输入.pcsn
                ENDOPTION
diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/StructIvt.vue b/lms/nladmin-ui/src/views/wms/st/outbill/StructIvt.vue
index 33b18401f..76c15a9de 100644
--- a/lms/nladmin-ui/src/views/wms/st/outbill/StructIvt.vue
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/StructIvt.vue
@@ -100,10 +100,10 @@
       <el-table-column type="index" label="序号" width="50" align="center" />
       <el-table-column show-overflow-tooltip prop="sect_name" label="库区" align="center" />
       <el-table-column show-overflow-tooltip prop="struct_code" label="仓位" align="center" />
-      <el-table-column show-overflow-tooltip prop="storagevehicle_code" label="箱号" align="center" />
+      <el-table-column show-overflow-tooltip prop="storagevehicle_code" label="箱号" align="center" width="250px" />
       <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
-      <el-table-column show-overflow-tooltip sortable prop="pcsn" label="子卷批次号" align="center" />
-      <el-table-column show-overflow-tooltip sortable prop="sap_pcsn" label="sap批次" align="center" />
+      <el-table-column show-overflow-tooltip sortable prop="pcsn" label="子卷批次号" align="center" width="150px" />
+      <el-table-column show-overflow-tooltip sortable prop="sap_pcsn" label="sap批次" align="center" width="140px" />
       <el-table-column show-overflow-tooltip prop="canuse_qty" label="可出重量" :formatter="crud.formatNum3" align="center" />
 <!--      <el-table-column show-overflow-tooltip prop="plan_qty" label="重量" :formatter="crud.formatNum3" width="160" align="center">-->
 <!--        <template scope="scope">-->
@@ -111,7 +111,7 @@
 <!--          <span v-show="scope.row.edit">{{ scope.row.plan_qty }}</span>-->
 <!--        </template>-->
 <!--      </el-table-column>-->
-      <el-table-column show-overflow-tooltip prop="qty_unit_name" label="单位" align="center" />
+<!--      <el-table-column show-overflow-tooltip prop="qty_unit_name" label="单位" align="center" />-->
       <el-table-column align="center" label="操作" width="160" fixed="right">
         <template scope="scope">
           <el-button v-show="!scope.row.edit" type="primary" class="filter-item" size="mini" icon="el-icon-edit" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/index.vue b/lms/nladmin-ui/src/views/wms/st/outbill/index.vue
index 2a75efb29..8d10b6df1 100644
--- a/lms/nladmin-ui/src/views/wms/st/outbill/index.vue
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/index.vue
@@ -119,6 +119,15 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
+          <el-form-item label="客户搜索">
+            <el-input
+              v-model="query.cust_code"
+              size="mini"
+              clearable
+              placeholder="编码、名称"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
           <el-form-item label="创建时间">
             <el-date-picker
               v-model="query.createTime"