From e3a6537a8390ecb3c629058ac83e4c2960647a96 Mon Sep 17 00:00:00 2001
From: mhsnet <mhsnet@163.com>
Date: Wed, 8 May 2024 13:09:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E5=95=86=E5=93=81=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=9D=A1=E7=A0=81=E5=92=8C=E7=AE=80=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/scm/ProductWarehouseMapper.xml   |  4 ++++
 .../src/views/scm/publicPopup/ProductListBox.vue      | 11 ++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/ProductWarehouseMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/ProductWarehouseMapper.xml
index 33626bf5..b529193c 100644
--- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/ProductWarehouseMapper.xml
+++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/ProductWarehouseMapper.xml
@@ -56,6 +56,8 @@
         <result column="business_line_id_arr" property="businessLineIdArr"/>
         <result column="input_tax_rate" property="inputTaxRate"/>
         <result column="output_tax_rate" property="outputTaxRate"/>
+        <result column="short_name" property="shortName"/>
+        <result column="bar_code" property="barCode"/>
         <result column="productId" property="productId"/>
     </resultMap>
 
@@ -73,6 +75,8 @@
             a.sales_main_unit_id, JgFnUnitArrName(a.sales_main_unit_id) as sales_main_unit_name,
             a.input_tax_rate,
             a.output_tax_rate,
+            a.short_name,
+            a.bar_code,
             b.business_line_id as business_line_id_arr
         FROM jg_product a LEFT JOIN jg_product_business b ON a.id = b.product_id ${ew.customSqlSegment}
         <if test="productWarehousePagination.businessLineIdArr != null and productWarehousePagination.businessLineIdArr != ''">
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/ProductListBox.vue b/jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/ProductListBox.vue
index e5d1d0e4..4caa9f9f 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/ProductListBox.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/ProductListBox.vue
@@ -57,13 +57,14 @@
       </el-table-column>
       <el-table-column prop="code" label="商品编码" align="left">
       </el-table-column>
-      <el-table-column prop="spec" label="商品规格" align="left">
+      <el-table-column prop="spec" label="商品规格"> </el-table-column>
+      <el-table-column prop="shortName" label="商品简称"> </el-table-column>
+      <el-table-column prop="barCode" label="商品条码"> </el-table-column>
+      <el-table-column prop="inventoryUnitName" label="库存单位">
       </el-table-column>
-      <el-table-column prop="inventoryUnitName" label="库存单位" align="left">
+      <el-table-column prop="orderMainUnitName" label="采购单位">
       </el-table-column>
-      <el-table-column prop="orderMainUnitName" label="采购单位" align="left">
-      </el-table-column>
-      <el-table-column prop="salesMainUnitName" label="销售单位" align="left">
+      <el-table-column prop="salesMainUnitName" label="销售单位">
       </el-table-column>
     </JNPF-table>
     <pagination