From 6bafce98202fbe9a2ab184918ce3c6438505efa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Wed, 11 Nov 2020 23:20:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=85=A5=E5=BA=93=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E4=B8=8D=E6=98=BE=E7=A4=BA=E4=BB=B7=E6=A0=BC=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/pages/reports/in_detail.html                | 2 +-
 erp_web/pages/reports/out_detail.html               | 2 +-
 src/main/resources/mapper_xml/DepotHeadMapperEx.xml | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/erp_web/pages/reports/in_detail.html b/erp_web/pages/reports/in_detail.html
index 1cb2c543..7cd84626 100644
--- a/erp_web/pages/reports/in_detail.html
+++ b/erp_web/pages/reports/in_detail.html
@@ -194,7 +194,7 @@
                 {title: '商品名称', field: 'mname', width: 120},
                 {title: '商品型号', field: 'model', width: 100},
                 {title: '单价', field: 'unitPrice', width: 60},
-                {title: '入库数量', field: 'operNumber', width: 60},
+                {title: '入库数量', field: 'operNumber', width: 80},
                 {title: '金额', field: 'allPrice', width: 60},
                 {title: '供应商', field: 'sname', width: 200},
                 {title: '仓库', field: 'dname', width: 120},
diff --git a/erp_web/pages/reports/out_detail.html b/erp_web/pages/reports/out_detail.html
index f2b6dca1..6cf585bb 100644
--- a/erp_web/pages/reports/out_detail.html
+++ b/erp_web/pages/reports/out_detail.html
@@ -194,7 +194,7 @@
                 {title: '商品名称', field: 'mname', width: 120},
                 {title: '商品型号', field: 'model', width: 100},
                 {title: '单价', field: 'unitPrice', width: 60},
-                {title: '出库数量', field: 'operNumber', width: 60},
+                {title: '出库数量', field: 'operNumber', width: 80},
                 {title: '金额', field: 'allPrice', width: 60},
                 {title: '客户', field: 'sname', width: 200},
                 {title: '仓库', field: 'dname', width: 120},
diff --git a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
index 775b289b..23ec1c19 100644
--- a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
+++ b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
@@ -12,9 +12,9 @@
         <result column="Number" jdbcType="VARCHAR" property="Number" />
         <result column="MName" jdbcType="VARCHAR" property="MName" />
         <result column="Model" jdbcType="VARCHAR" property="Model" />
-        <result column="UnitPrice" jdbcType="DECIMAL" property="UnitPrice" />
-        <result column="OperNumber" jdbcType="DECIMAL" property="OperNumber" />
-        <result column="AllPrice" jdbcType="DECIMAL" property="AllPrice" />
+        <result column="unit_price" jdbcType="DECIMAL" property="UnitPrice" />
+        <result column="oper_number" jdbcType="DECIMAL" property="OperNumber" />
+        <result column="all_price" jdbcType="DECIMAL" property="AllPrice" />
         <result column="SName" jdbcType="VARCHAR" property="SName" />
         <result column="DName" jdbcType="VARCHAR" property="DName" />
         <result column="OperTime" jdbcType="VARCHAR" property="OperTime" />