From 43e58742b3b1e7498d3edb025288a50db7146aaa Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Sat, 23 Dec 2023 19:44:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=95=86=E5=93=81=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E6=8A=A5=E8=A1=A8=E6=97=A0=E6=B3=95=E6=8C=89=E5=8D=95?=
 =?UTF-8?q?=E4=BB=B7=E6=8E=92=E8=A1=8C=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper_xml/MaterialMapperEx.xml   | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml
index b74f346e..c12eae9b 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml
@@ -17,9 +17,8 @@
     <resultMap extends="com.jsh.erp.datasource.mappers.MaterialMapper.BaseResultMap" id="ResultMapListWithStock" type="com.jsh.erp.datasource.entities.MaterialVo4Unit">
         <result column="unitName" jdbcType="VARCHAR" property="unitName" />
         <result column="categoryName" jdbcType="VARCHAR" property="categoryName" />
-        <result column="bar_code" jdbcType="VARCHAR" property="mBarCode" />
-        <result column="commodity_unit" jdbcType="VARCHAR" property="commodityUnit" />
-        <result column="purchase_decimal" jdbcType="VARCHAR" property="purchaseDecimal" />
+        <result column="mBarCode" jdbcType="VARCHAR" property="mBarCode" />
+        <result column="purchaseDecimal" jdbcType="VARCHAR" property="purchaseDecimal" />
         <result column="initialStock" jdbcType="DECIMAL" property="initialStock" />
         <result column="currentStock" jdbcType="DECIMAL" property="currentStock" />
         <result column="currentStockPrice" jdbcType="DECIMAL" property="currentStockPrice" />
@@ -603,8 +602,8 @@
     </select>
 
     <select id="getListWithStock" resultMap="ResultMapListWithStock">
-        select m.*, me.commodity_unit unitName, mc.name categoryName, me.bar_code,
-        ifnull(me.purchase_decimal,0) purchase_decimal,
+        select m.*, me.commodity_unit unitName, mc.name categoryName, me.bar_code mBarCode,
+        ifnull(me.purchase_decimal,0) purchaseDecimal,
         ifnull(sum(mcs.current_number),0) currentStock,
         sum(ifnull(me.purchase_decimal, 0) * ifnull(mcs.current_number, 0)) currentStockPrice,
         sum(ifnull(m.weight, 0) * ifnull(mcs.current_number, 0)) currentWeight