!16 修复一系列问题

Merge pull request !16 from 乾坤平台/master

!16 修复一系列问题
Merge pull request !16 from 乾坤平台/master
9550c031 · 乾坤平台 · 季圣华 · fc03d050 · c4623555 · 9550c031
Commit 9550c031 authored Jan 18, 2019 by 乾坤平台 Committed by 季圣华 Jan 18, 2019
--- a/src/main/resources/application-prod.properties
+++ b/src/main/resources/application-prod.properties
--- a/src/main/resources/application-test.properties
+++ b/src/main/resources/application-test.properties
+spring.datasource.url=jdbc:mysql://127.0.0.1:3306/jsh_erp?useUnicode=true&characterEncoding=utf8&useCursorFetch=true&defaultFetchSize=500&allowMultiQueries=true&rewriteBatchedStatements=true&useSSL=false
+spring.datasource.driverClassName=com.mysql.jdbc.Driver
+spring.datasource.username=root
+spring.datasource.password=123456
\ No newline at end of file
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
+server.port=8080
+spring.profiles.active=@activatedProperties@
+#generatorConfig专用属性
+project=src/main/java
+resource=src/main/resources
+web.front.baseDir=erp_web
+mybatis.type-aliases-package=com.chinamobile.model.*
+mybatis.mapper-locations=classpath:./mapper_xml/*.xml
+
+
+
+
+
+
+
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
-server:
-  port: 80
-erpDatasource:
-  driver-class-name: com.mysql.jdbc.Driver
-  url: jdbc:mysql://127.0.0.1:3306/jsh_erp?useUnicode=true&characterEncoding=utf8&useCursorFetch=true&defaultFetchSize=500&allowMultiQueries=true&rewriteBatchedStatements=true&useSSL=false
-  username: root
-  password: 1234
-web:
-  front:
-    base-dir: erp_web
-mybatis:
-  mapperLocations: classpath:mapper_xml/*.xml  #一定要对应mapper映射xml文件的所在路径
-  executorType: SIMPLE
\ No newline at end of file
--- a/src/main/resources/mapper_xml/AccountHeadMapper.xml
+++ b/src/main/resources/mapper_xml/AccountHeadMapper.xml
@@ -10,8 +10,8 @@
    <result column="Type" jdbcType="VARCHAR" property="type" />
    <result column="OrganId" jdbcType="BIGINT" property="organid" />
    <result column="HandsPersonId" jdbcType="BIGINT" property="handspersonid" />
-    <result column="ChangeAmount" jdbcType="DOUBLE" property="changeamount" />
-    <result column="TotalPrice" jdbcType="DOUBLE" property="totalprice" />
+    <result column="ChangeAmount" jdbcType="DECIMAL" property="changeamount" />
+    <result column="TotalPrice" jdbcType="DECIMAL" property="totalprice" />
    <result column="AccountId" jdbcType="BIGINT" property="accountid" />
    <result column="BillNo" jdbcType="VARCHAR" property="billno" />
    <result column="BillTime" jdbcType="TIMESTAMP" property="billtime" />
@@ -147,7 +147,7 @@
      AccountId, BillNo, BillTime, 
      Remark)
    values (#{id,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{organid,jdbcType=BIGINT}, 
-      #{handspersonid,jdbcType=BIGINT}, #{changeamount,jdbcType=DOUBLE}, #{totalprice,jdbcType=DOUBLE}, 
+      #{handspersonid,jdbcType=BIGINT}, #{changeamount,jdbcType=DECIMAL}, #{totalprice,jdbcType=DECIMAL},
      #{accountid,jdbcType=BIGINT}, #{billno,jdbcType=VARCHAR}, #{billtime,jdbcType=TIMESTAMP}, 
      #{remark,jdbcType=VARCHAR})
  </insert>
@@ -203,10 +203,10 @@
        #{handspersonid,jdbcType=BIGINT},
      </if>
      <if test="changeamount != null">
-        #{changeamount,jdbcType=DOUBLE},
+        #{changeamount,jdbcType=DECIMAL},
      </if>
      <if test="totalprice != null">
-        #{totalprice,jdbcType=DOUBLE},
+        #{totalprice,jdbcType=DECIMAL},
      </if>
      <if test="accountid != null">
        #{accountid,jdbcType=BIGINT},
@@ -252,10 +252,10 @@
        HandsPersonId = #{record.handspersonid,jdbcType=BIGINT},
      </if>
      <if test="record.changeamount != null">
-        ChangeAmount = #{record.changeamount,jdbcType=DOUBLE},
+        ChangeAmount = #{record.changeamount,jdbcType=DECIMAL},
      </if>
      <if test="record.totalprice != null">
-        TotalPrice = #{record.totalprice,jdbcType=DOUBLE},
+        TotalPrice = #{record.totalprice,jdbcType=DECIMAL},
      </if>
      <if test="record.accountid != null">
        AccountId = #{record.accountid,jdbcType=BIGINT},
@@ -284,8 +284,8 @@
      Type = #{record.type,jdbcType=VARCHAR},
      OrganId = #{record.organid,jdbcType=BIGINT},
      HandsPersonId = #{record.handspersonid,jdbcType=BIGINT},
-      ChangeAmount = #{record.changeamount,jdbcType=DOUBLE},
-      TotalPrice = #{record.totalprice,jdbcType=DOUBLE},
+      ChangeAmount = #{record.changeamount,jdbcType=DECIMAL},
+      TotalPrice = #{record.totalprice,jdbcType=DECIMAL},
      AccountId = #{record.accountid,jdbcType=BIGINT},
      BillNo = #{record.billno,jdbcType=VARCHAR},
      BillTime = #{record.billtime,jdbcType=TIMESTAMP},
@@ -311,10 +311,10 @@
        HandsPersonId = #{handspersonid,jdbcType=BIGINT},
      </if>
      <if test="changeamount != null">
-        ChangeAmount = #{changeamount,jdbcType=DOUBLE},
+        ChangeAmount = #{changeamount,jdbcType=DECIMAL},
      </if>
      <if test="totalprice != null">
-        TotalPrice = #{totalprice,jdbcType=DOUBLE},
+        TotalPrice = #{totalprice,jdbcType=DECIMAL},
      </if>
      <if test="accountid != null">
        AccountId = #{accountid,jdbcType=BIGINT},
@@ -340,8 +340,8 @@
    set Type = #{type,jdbcType=VARCHAR},
      OrganId = #{organid,jdbcType=BIGINT},
      HandsPersonId = #{handspersonid,jdbcType=BIGINT},
-      ChangeAmount = #{changeamount,jdbcType=DOUBLE},
-      TotalPrice = #{totalprice,jdbcType=DOUBLE},
+      ChangeAmount = #{changeamount,jdbcType=DECIMAL},
+      TotalPrice = #{totalprice,jdbcType=DECIMAL},
      AccountId = #{accountid,jdbcType=BIGINT},
      BillNo = #{billno,jdbcType=VARCHAR},
      BillTime = #{billtime,jdbcType=TIMESTAMP},

--- a/src/main/resources/mapper_xml/AccountHeadMapperEx.xml
+++ b/src/main/resources/mapper_xml/AccountHeadMapperEx.xml
@@ -22,10 +22,10 @@
            and ah.Type='${type}'
        </if>
        <if test="beginTime != null">
-            and ah.BillTime gt;= '%${beginTime}%'
+            and ah.BillTime &gt;= '%${beginTime}%'
        </if>
        <if test="endTime != null">
-            and ah.BillTime lt;= '%${endTime}%'
+            and ah.BillTime &lt;= '%${endTime}%'
        </if>
        order by ah.Id desc
        <if test="offset != null and rows != null">
@@ -46,10 +46,10 @@
            and Type='${type}'
        </if>
        <if test="beginTime != null">
-            and BillTime gt;= '%${beginTime}%'
+            and BillTime &gt;= '%${beginTime}%'
        </if>
        <if test="endTime != null">
-            and BillTime lt;= '%${endTime}%'
+            and BillTime &lt;= '%${endTime}%'
        </if>
    </select>

@@ -57,9 +57,9 @@
        select max(Id) as Id from jsh_accounthead
    </select>

-    <select id="findAllMoney" resultType="java.lang.Double">
+    <select id="findAllMoney" resultType="java.math.BigDecimal">
        select sum(${modeName}) as allMoney from jsh_accounthead where Type='${type}'
-        and OrganId =${supplierId} and BillTime &lt;='${endTime}'
+        and OrganId =${supplierId} and BillTime <![CDATA[ <='${endTime}']]>
    </select>

    <select id="getDetailByNumber" parameterType="com.jsh.erp.datasource.entities.AccountHeadExample" resultMap="ResultMapEx">

--- a/src/main/resources/mapper_xml/AccountItemMapper.xml
+++ b/src/main/resources/mapper_xml/AccountItemMapper.xml
@@ -10,7 +10,7 @@
    <result column="HeaderId" jdbcType="BIGINT" property="headerid" />
    <result column="AccountId" jdbcType="BIGINT" property="accountid" />
    <result column="InOutItemId" jdbcType="BIGINT" property="inoutitemid" />
-    <result column="EachAmount" jdbcType="DOUBLE" property="eachamount" />
+    <result column="EachAmount" jdbcType="DECIMAL" property="eachamount" />
    <result column="Remark" jdbcType="VARCHAR" property="remark" />
  </resultMap>
  <sql id="Example_Where_Clause">
@@ -141,7 +141,7 @@
      InOutItemId, EachAmount, Remark
      )
    values (#{id,jdbcType=BIGINT}, #{headerid,jdbcType=BIGINT}, #{accountid,jdbcType=BIGINT}, 
-      #{inoutitemid,jdbcType=BIGINT}, #{eachamount,jdbcType=DOUBLE}, #{remark,jdbcType=VARCHAR}
+      #{inoutitemid,jdbcType=BIGINT}, #{eachamount,jdbcType=DECIMAL}, #{remark,jdbcType=VARCHAR}
      )
  </insert>
  <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.AccountItem">
@@ -184,7 +184,7 @@
        #{inoutitemid,jdbcType=BIGINT},
      </if>
      <if test="eachamount != null">
-        #{eachamount,jdbcType=DOUBLE},
+        #{eachamount,jdbcType=DECIMAL},
      </if>
      <if test="remark != null">
        #{remark,jdbcType=VARCHAR},
@@ -221,7 +221,7 @@
        InOutItemId = #{record.inoutitemid,jdbcType=BIGINT},
      </if>
      <if test="record.eachamount != null">
-        EachAmount = #{record.eachamount,jdbcType=DOUBLE},
+        EachAmount = #{record.eachamount,jdbcType=DECIMAL},
      </if>
      <if test="record.remark != null">
        Remark = #{record.remark,jdbcType=VARCHAR},
@@ -241,7 +241,7 @@
      HeaderId = #{record.headerid,jdbcType=BIGINT},
      AccountId = #{record.accountid,jdbcType=BIGINT},
      InOutItemId = #{record.inoutitemid,jdbcType=BIGINT},
-      EachAmount = #{record.eachamount,jdbcType=DOUBLE},
+      EachAmount = #{record.eachamount,jdbcType=DECIMAL},
      Remark = #{record.remark,jdbcType=VARCHAR}
    <if test="_parameter != null">
      <include refid="Update_By_Example_Where_Clause" />
@@ -264,7 +264,7 @@
        InOutItemId = #{inoutitemid,jdbcType=BIGINT},
      </if>
      <if test="eachamount != null">
-        EachAmount = #{eachamount,jdbcType=DOUBLE},
+        EachAmount = #{eachamount,jdbcType=DECIMAL},
      </if>
      <if test="remark != null">
        Remark = #{remark,jdbcType=VARCHAR},
@@ -281,7 +281,7 @@
    set HeaderId = #{headerid,jdbcType=BIGINT},
      AccountId = #{accountid,jdbcType=BIGINT},
      InOutItemId = #{inoutitemid,jdbcType=BIGINT},
-      EachAmount = #{eachamount,jdbcType=DOUBLE},
+      EachAmount = #{eachamount,jdbcType=DECIMAL},
      Remark = #{remark,jdbcType=VARCHAR}
    where Id = #{id,jdbcType=BIGINT}
  </update>

--- a/src/main/resources/mapper_xml/AccountMapper.xml
+++ b/src/main/resources/mapper_xml/AccountMapper.xml
@@ -9,8 +9,8 @@
    <id column="Id" jdbcType="BIGINT" property="id" />
    <result column="Name" jdbcType="VARCHAR" property="name" />
    <result column="SerialNo" jdbcType="VARCHAR" property="serialno" />
-    <result column="InitialAmount" jdbcType="DOUBLE" property="initialamount" />
-    <result column="CurrentAmount" jdbcType="DOUBLE" property="currentamount" />
+    <result column="InitialAmount" jdbcType="DECIMAL" property="initialamount" />
+    <result column="CurrentAmount" jdbcType="DECIMAL" property="currentamount" />
    <result column="Remark" jdbcType="VARCHAR" property="remark" />
    <result column="IsDefault" jdbcType="BIT" property="isdefault" />
  </resultMap>
@@ -142,7 +142,7 @@
      InitialAmount, CurrentAmount, Remark, 
      IsDefault)
    values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{serialno,jdbcType=VARCHAR}, 
-      #{initialamount,jdbcType=DOUBLE}, #{currentamount,jdbcType=DOUBLE}, #{remark,jdbcType=VARCHAR}, 
+      #{initialamount,jdbcType=DECIMAL}, #{currentamount,jdbcType=DECIMAL}, #{remark,jdbcType=VARCHAR}, 
      #{isdefault,jdbcType=BIT})
  </insert>
  <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Account">
@@ -185,10 +185,10 @@
        #{serialno,jdbcType=VARCHAR},
      </if>
      <if test="initialamount != null">
-        #{initialamount,jdbcType=DOUBLE},
+        #{initialamount,jdbcType=DECIMAL},
      </if>
      <if test="currentamount != null">
-        #{currentamount,jdbcType=DOUBLE},
+        #{currentamount,jdbcType=DECIMAL},
      </if>
      <if test="remark != null">
        #{remark,jdbcType=VARCHAR},
@@ -225,10 +225,10 @@
        SerialNo = #{record.serialno,jdbcType=VARCHAR},
      </if>
      <if test="record.initialamount != null">
-        InitialAmount = #{record.initialamount,jdbcType=DOUBLE},
+        InitialAmount = #{record.initialamount,jdbcType=DECIMAL},
      </if>
      <if test="record.currentamount != null">
-        CurrentAmount = #{record.currentamount,jdbcType=DOUBLE},
+        CurrentAmount = #{record.currentamount,jdbcType=DECIMAL},
      </if>
      <if test="record.remark != null">
        Remark = #{record.remark,jdbcType=VARCHAR},
@@ -250,8 +250,8 @@
    set Id = #{record.id,jdbcType=BIGINT},
      Name = #{record.name,jdbcType=VARCHAR},
      SerialNo = #{record.serialno,jdbcType=VARCHAR},
-      InitialAmount = #{record.initialamount,jdbcType=DOUBLE},
-      CurrentAmount = #{record.currentamount,jdbcType=DOUBLE},
+      InitialAmount = #{record.initialamount,jdbcType=DECIMAL},
+      CurrentAmount = #{record.currentamount,jdbcType=DECIMAL},
      Remark = #{record.remark,jdbcType=VARCHAR},
      IsDefault = #{record.isdefault,jdbcType=BIT}
    <if test="_parameter != null">
@@ -272,10 +272,10 @@
        SerialNo = #{serialno,jdbcType=VARCHAR},
      </if>
      <if test="initialamount != null">
-        InitialAmount = #{initialamount,jdbcType=DOUBLE},
+        InitialAmount = #{initialamount,jdbcType=DECIMAL},
      </if>
      <if test="currentamount != null">
-        CurrentAmount = #{currentamount,jdbcType=DOUBLE},
+        CurrentAmount = #{currentamount,jdbcType=DECIMAL},
      </if>
      <if test="remark != null">
        Remark = #{remark,jdbcType=VARCHAR},
@@ -294,8 +294,8 @@
    update jsh_account
    set Name = #{name,jdbcType=VARCHAR},
      SerialNo = #{serialno,jdbcType=VARCHAR},
-      InitialAmount = #{initialamount,jdbcType=DOUBLE},
-      CurrentAmount = #{currentamount,jdbcType=DOUBLE},
+      InitialAmount = #{initialamount,jdbcType=DECIMAL},
+      CurrentAmount = #{currentamount,jdbcType=DECIMAL},
      Remark = #{remark,jdbcType=VARCHAR},
      IsDefault = #{isdefault,jdbcType=BIT}
    where Id = #{id,jdbcType=BIGINT}

--- a/src/main/resources/mapper_xml/AccountMapperEx.xml
+++ b/src/main/resources/mapper_xml/AccountMapperEx.xml
@@ -9,7 +9,7 @@
        <result column="Number" jdbcType="VARCHAR" property="number" />
        <result column="newType" jdbcType="VARCHAR" property="type" />
        <result column="supplier" jdbcType="VARCHAR" property="supplierName" />
-        <result column="ChangeAmount" jdbcType="DOUBLE" property="changeAmount" />
+        <result column="ChangeAmount" jdbcType="DECIMAL" property="changeAmount" />
        <result column="oTime" jdbcType="VARCHAR" property="operTime" />
        <result column="AList" jdbcType="VARCHAR" property="aList" />
        <result column="AMList" jdbcType="VARCHAR" property="amList" />

--- a/src/main/resources/mapper_xml/AssetMapper.xml
+++ b/src/main/resources/mapper_xml/AssetMapper.xml
@@ -12,7 +12,7 @@
    <result column="labels" jdbcType="VARCHAR" property="labels" />
    <result column="status" jdbcType="SMALLINT" property="status" />
    <result column="userID" jdbcType="BIGINT" property="userid" />
-    <result column="price" jdbcType="DOUBLE" property="price" />
+    <result column="price" jdbcType="DECIMAL" property="price" />
    <result column="purchasedate" jdbcType="TIMESTAMP" property="purchasedate" />
    <result column="periodofvalidity" jdbcType="TIMESTAMP" property="periodofvalidity" />
    <result column="warrantydate" jdbcType="TIMESTAMP" property="warrantydate" />
@@ -195,7 +195,7 @@
      addMonth)
    values (#{id,jdbcType=BIGINT}, #{assetnameid,jdbcType=BIGINT}, #{location,jdbcType=VARCHAR}, 
      #{labels,jdbcType=VARCHAR}, #{status,jdbcType=SMALLINT}, #{userid,jdbcType=BIGINT}, 
-      #{price,jdbcType=DOUBLE}, #{purchasedate,jdbcType=TIMESTAMP}, #{periodofvalidity,jdbcType=TIMESTAMP}, 
+      #{price,jdbcType=DECIMAL}, #{purchasedate,jdbcType=TIMESTAMP}, #{periodofvalidity,jdbcType=TIMESTAMP}, 
      #{warrantydate,jdbcType=TIMESTAMP}, #{assetnum,jdbcType=VARCHAR}, #{serialnum,jdbcType=VARCHAR}, 
      #{supplier,jdbcType=BIGINT}, #{createtime,jdbcType=TIMESTAMP}, #{creator,jdbcType=BIGINT}, 
      #{updatetime,jdbcType=TIMESTAMP}, #{updator,jdbcType=BIGINT}, #{description,jdbcType=LONGVARCHAR}, 
@@ -286,7 +286,7 @@
        #{userid,jdbcType=BIGINT},
      </if>
      <if test="price != null">
-        #{price,jdbcType=DOUBLE},
+        #{price,jdbcType=DECIMAL},
      </if>
      <if test="purchasedate != null">
        #{purchasedate,jdbcType=TIMESTAMP},
@@ -362,7 +362,7 @@
        userID = #{record.userid,jdbcType=BIGINT},
      </if>
      <if test="record.price != null">
-        price = #{record.price,jdbcType=DOUBLE},
+        price = #{record.price,jdbcType=DECIMAL},
      </if>
      <if test="record.purchasedate != null">
        purchasedate = #{record.purchasedate,jdbcType=TIMESTAMP},
@@ -417,7 +417,7 @@
      labels = #{record.labels,jdbcType=VARCHAR},
      status = #{record.status,jdbcType=SMALLINT},
      userID = #{record.userid,jdbcType=BIGINT},
-      price = #{record.price,jdbcType=DOUBLE},
+      price = #{record.price,jdbcType=DECIMAL},
      purchasedate = #{record.purchasedate,jdbcType=TIMESTAMP},
      periodofvalidity = #{record.periodofvalidity,jdbcType=TIMESTAMP},
      warrantydate = #{record.warrantydate,jdbcType=TIMESTAMP},
@@ -446,7 +446,7 @@
      labels = #{record.labels,jdbcType=VARCHAR},
      status = #{record.status,jdbcType=SMALLINT},
      userID = #{record.userid,jdbcType=BIGINT},
-      price = #{record.price,jdbcType=DOUBLE},
+      price = #{record.price,jdbcType=DECIMAL},
      purchasedate = #{record.purchasedate,jdbcType=TIMESTAMP},
      periodofvalidity = #{record.periodofvalidity,jdbcType=TIMESTAMP},
      warrantydate = #{record.warrantydate,jdbcType=TIMESTAMP},
@@ -484,7 +484,7 @@
        userID = #{userid,jdbcType=BIGINT},
      </if>
      <if test="price != null">
-        price = #{price,jdbcType=DOUBLE},
+        price = #{price,jdbcType=DECIMAL},
      </if>
      <if test="purchasedate != null">
        purchasedate = #{purchasedate,jdbcType=TIMESTAMP},
@@ -536,7 +536,7 @@
      labels = #{labels,jdbcType=VARCHAR},
      status = #{status,jdbcType=SMALLINT},
      userID = #{userid,jdbcType=BIGINT},
-      price = #{price,jdbcType=DOUBLE},
+      price = #{price,jdbcType=DECIMAL},
      purchasedate = #{purchasedate,jdbcType=TIMESTAMP},
      periodofvalidity = #{periodofvalidity,jdbcType=TIMESTAMP},
      warrantydate = #{warrantydate,jdbcType=TIMESTAMP},
@@ -562,7 +562,7 @@
      labels = #{labels,jdbcType=VARCHAR},
      status = #{status,jdbcType=SMALLINT},
      userID = #{userid,jdbcType=BIGINT},
-      price = #{price,jdbcType=DOUBLE},
+      price = #{price,jdbcType=DECIMAL},
      purchasedate = #{purchasedate,jdbcType=TIMESTAMP},
      periodofvalidity = #{periodofvalidity,jdbcType=TIMESTAMP},
      warrantydate = #{warrantydate,jdbcType=TIMESTAMP},

--- a/src/main/resources/mapper_xml/DepotHeadMapper.xml
+++ b/src/main/resources/mapper_xml/DepotHeadMapper.xml
@@ -18,18 +18,18 @@
    <result column="OrganId" jdbcType="BIGINT" property="organid" />
    <result column="HandsPersonId" jdbcType="BIGINT" property="handspersonid" />
    <result column="AccountId" jdbcType="BIGINT" property="accountid" />
-    <result column="ChangeAmount" jdbcType="DOUBLE" property="changeamount" />
+    <result column="ChangeAmount" jdbcType="DECIMAL" property="changeamount" />
    <result column="AllocationProjectId" jdbcType="BIGINT" property="allocationprojectid" />
-    <result column="TotalPrice" jdbcType="DOUBLE" property="totalprice" />
+    <result column="TotalPrice" jdbcType="DECIMAL" property="totalprice" />
    <result column="PayType" jdbcType="VARCHAR" property="paytype" />
    <result column="Remark" jdbcType="VARCHAR" property="remark" />
    <result column="Salesman" jdbcType="VARCHAR" property="salesman" />
    <result column="AccountIdList" jdbcType="VARCHAR" property="accountidlist" />
    <result column="AccountMoneyList" jdbcType="VARCHAR" property="accountmoneylist" />
-    <result column="Discount" jdbcType="DOUBLE" property="discount" />
-    <result column="DiscountMoney" jdbcType="DOUBLE" property="discountmoney" />
-    <result column="DiscountLastMoney" jdbcType="DOUBLE" property="discountlastmoney" />
-    <result column="OtherMoney" jdbcType="DOUBLE" property="othermoney" />
+    <result column="Discount" jdbcType="DECIMAL" property="discount" />
+    <result column="DiscountMoney" jdbcType="DECIMAL" property="discountmoney" />
+    <result column="DiscountLastMoney" jdbcType="DECIMAL" property="discountlastmoney" />
+    <result column="OtherMoney" jdbcType="DECIMAL" property="othermoney" />
    <result column="OtherMoneyList" jdbcType="VARCHAR" property="othermoneylist" />
    <result column="OtherMoneyItem" jdbcType="VARCHAR" property="othermoneyitem" />
    <result column="AccountDay" jdbcType="INTEGER" property="accountday" />
@@ -176,10 +176,10 @@
      #{projectid,jdbcType=BIGINT}, #{defaultnumber,jdbcType=VARCHAR}, #{number,jdbcType=VARCHAR}, 
      #{operpersonname,jdbcType=VARCHAR}, #{createtime,jdbcType=TIMESTAMP}, #{opertime,jdbcType=TIMESTAMP}, 
      #{organid,jdbcType=BIGINT}, #{handspersonid,jdbcType=BIGINT}, #{accountid,jdbcType=BIGINT}, 
-      #{changeamount,jdbcType=DOUBLE}, #{allocationprojectid,jdbcType=BIGINT}, #{totalprice,jdbcType=DOUBLE}, 
+      #{changeamount,jdbcType=DECIMAL}, #{allocationprojectid,jdbcType=BIGINT}, #{totalprice,jdbcType=DECIMAL}, 
      #{paytype,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{salesman,jdbcType=VARCHAR}, 
-      #{accountidlist,jdbcType=VARCHAR}, #{accountmoneylist,jdbcType=VARCHAR}, #{discount,jdbcType=DOUBLE}, 
-      #{discountmoney,jdbcType=DOUBLE}, #{discountlastmoney,jdbcType=DOUBLE}, #{othermoney,jdbcType=DOUBLE}, 
+      #{accountidlist,jdbcType=VARCHAR}, #{accountmoneylist,jdbcType=VARCHAR}, #{discount,jdbcType=DECIMAL}, 
+      #{discountmoney,jdbcType=DECIMAL}, #{discountlastmoney,jdbcType=DECIMAL}, #{othermoney,jdbcType=DECIMAL}, 
      #{othermoneylist,jdbcType=VARCHAR}, #{othermoneyitem,jdbcType=VARCHAR}, #{accountday,jdbcType=INTEGER}, 
      #{status,jdbcType=BIT})
  </insert>
@@ -313,13 +313,13 @@
        #{accountid,jdbcType=BIGINT},
      </if>
      <if test="changeamount != null">
-        #{changeamount,jdbcType=DOUBLE},
+        #{changeamount,jdbcType=DECIMAL},
      </if>
      <if test="allocationprojectid != null">
        #{allocationprojectid,jdbcType=BIGINT},
      </if>
      <if test="totalprice != null">
-        #{totalprice,jdbcType=DOUBLE},
+        #{totalprice,jdbcType=DECIMAL},
      </if>
      <if test="paytype != null">
        #{paytype,jdbcType=VARCHAR},
@@ -337,16 +337,16 @@
        #{accountmoneylist,jdbcType=VARCHAR},
      </if>
      <if test="discount != null">
-        #{discount,jdbcType=DOUBLE},
+        #{discount,jdbcType=DECIMAL},
      </if>
      <if test="discountmoney != null">
-        #{discountmoney,jdbcType=DOUBLE},
+        #{discountmoney,jdbcType=DECIMAL},
      </if>
      <if test="discountlastmoney != null">
-        #{discountlastmoney,jdbcType=DOUBLE},
+        #{discountlastmoney,jdbcType=DECIMAL},
      </if>
      <if test="othermoney != null">
-        #{othermoney,jdbcType=DOUBLE},
+        #{othermoney,jdbcType=DECIMAL},
      </if>
      <if test="othermoneylist != null">
        #{othermoneylist,jdbcType=VARCHAR},
@@ -416,13 +416,13 @@
        AccountId = #{record.accountid,jdbcType=BIGINT},
      </if>
      <if test="record.changeamount != null">
-        ChangeAmount = #{record.changeamount,jdbcType=DOUBLE},
+        ChangeAmount = #{record.changeamount,jdbcType=DECIMAL},
      </if>
      <if test="record.allocationprojectid != null">
        AllocationProjectId = #{record.allocationprojectid,jdbcType=BIGINT},
      </if>
      <if test="record.totalprice != null">
-        TotalPrice = #{record.totalprice,jdbcType=DOUBLE},
+        TotalPrice = #{record.totalprice,jdbcType=DECIMAL},
      </if>
      <if test="record.paytype != null">
        PayType = #{record.paytype,jdbcType=VARCHAR},
@@ -440,16 +440,16 @@
        AccountMoneyList = #{record.accountmoneylist,jdbcType=VARCHAR},
      </if>
      <if test="record.discount != null">
-        Discount = #{record.discount,jdbcType=DOUBLE},
+        Discount = #{record.discount,jdbcType=DECIMAL},
      </if>
      <if test="record.discountmoney != null">
-        DiscountMoney = #{record.discountmoney,jdbcType=DOUBLE},
+        DiscountMoney = #{record.discountmoney,jdbcType=DECIMAL},
      </if>
      <if test="record.discountlastmoney != null">
-        DiscountLastMoney = #{record.discountlastmoney,jdbcType=DOUBLE},
+        DiscountLastMoney = #{record.discountlastmoney,jdbcType=DECIMAL},
      </if>
      <if test="record.othermoney != null">
-        OtherMoney = #{record.othermoney,jdbcType=DOUBLE},
+        OtherMoney = #{record.othermoney,jdbcType=DECIMAL},
      </if>
      <if test="record.othermoneylist != null">
        OtherMoneyList = #{record.othermoneylist,jdbcType=VARCHAR},
@@ -486,18 +486,18 @@
      OrganId = #{record.organid,jdbcType=BIGINT},
      HandsPersonId = #{record.handspersonid,jdbcType=BIGINT},
      AccountId = #{record.accountid,jdbcType=BIGINT},
-      ChangeAmount = #{record.changeamount,jdbcType=DOUBLE},
+      ChangeAmount = #{record.changeamount,jdbcType=DECIMAL},
      AllocationProjectId = #{record.allocationprojectid,jdbcType=BIGINT},
-      TotalPrice = #{record.totalprice,jdbcType=DOUBLE},
+      TotalPrice = #{record.totalprice,jdbcType=DECIMAL},
      PayType = #{record.paytype,jdbcType=VARCHAR},
      Remark = #{record.remark,jdbcType=VARCHAR},
      Salesman = #{record.salesman,jdbcType=VARCHAR},
      AccountIdList = #{record.accountidlist,jdbcType=VARCHAR},
      AccountMoneyList = #{record.accountmoneylist,jdbcType=VARCHAR},
-      Discount = #{record.discount,jdbcType=DOUBLE},
-      DiscountMoney = #{record.discountmoney,jdbcType=DOUBLE},
-      DiscountLastMoney = #{record.discountlastmoney,jdbcType=DOUBLE},
-      OtherMoney = #{record.othermoney,jdbcType=DOUBLE},
+      Discount = #{record.discount,jdbcType=DECIMAL},
+      DiscountMoney = #{record.discountmoney,jdbcType=DECIMAL},
+      DiscountLastMoney = #{record.discountlastmoney,jdbcType=DECIMAL},
+      OtherMoney = #{record.othermoney,jdbcType=DECIMAL},
      OtherMoneyList = #{record.othermoneylist,jdbcType=VARCHAR},
      OtherMoneyItem = #{record.othermoneyitem,jdbcType=VARCHAR},
      AccountDay = #{record.accountday,jdbcType=INTEGER},
@@ -547,13 +547,13 @@
        AccountId = #{accountid,jdbcType=BIGINT},
      </if>
      <if test="changeamount != null">
-        ChangeAmount = #{changeamount,jdbcType=DOUBLE},
+        ChangeAmount = #{changeamount,jdbcType=DECIMAL},
      </if>
      <if test="allocationprojectid != null">
        AllocationProjectId = #{allocationprojectid,jdbcType=BIGINT},
      </if>
      <if test="totalprice != null">
-        TotalPrice = #{totalprice,jdbcType=DOUBLE},
+        TotalPrice = #{totalprice,jdbcType=DECIMAL},
      </if>
      <if test="paytype != null">
        PayType = #{paytype,jdbcType=VARCHAR},
@@ -571,16 +571,16 @@
        AccountMoneyList = #{accountmoneylist,jdbcType=VARCHAR},
      </if>
      <if test="discount != null">
-        Discount = #{discount,jdbcType=DOUBLE},
+        Discount = #{discount,jdbcType=DECIMAL},
      </if>
      <if test="discountmoney != null">
-        DiscountMoney = #{discountmoney,jdbcType=DOUBLE},
+        DiscountMoney = #{discountmoney,jdbcType=DECIMAL},
      </if>
      <if test="discountlastmoney != null">
-        DiscountLastMoney = #{discountlastmoney,jdbcType=DOUBLE},
+        DiscountLastMoney = #{discountlastmoney,jdbcType=DECIMAL},
      </if>
      <if test="othermoney != null">
-        OtherMoney = #{othermoney,jdbcType=DOUBLE},
+        OtherMoney = #{othermoney,jdbcType=DECIMAL},
      </if>
      <if test="othermoneylist != null">
        OtherMoneyList = #{othermoneylist,jdbcType=VARCHAR},
@@ -614,18 +614,18 @@
      OrganId = #{organid,jdbcType=BIGINT},
      HandsPersonId = #{handspersonid,jdbcType=BIGINT},
      AccountId = #{accountid,jdbcType=BIGINT},
-      ChangeAmount = #{changeamount,jdbcType=DOUBLE},
+      ChangeAmount = #{changeamount,jdbcType=DECIMAL},
      AllocationProjectId = #{allocationprojectid,jdbcType=BIGINT},
-      TotalPrice = #{totalprice,jdbcType=DOUBLE},
+      TotalPrice = #{totalprice,jdbcType=DECIMAL},
      PayType = #{paytype,jdbcType=VARCHAR},
      Remark = #{remark,jdbcType=VARCHAR},
      Salesman = #{salesman,jdbcType=VARCHAR},
      AccountIdList = #{accountidlist,jdbcType=VARCHAR},
      AccountMoneyList = #{accountmoneylist,jdbcType=VARCHAR},
-      Discount = #{discount,jdbcType=DOUBLE},
-      DiscountMoney = #{discountmoney,jdbcType=DOUBLE},
-      DiscountLastMoney = #{discountlastmoney,jdbcType=DOUBLE},
-      OtherMoney = #{othermoney,jdbcType=DOUBLE},
+      Discount = #{discount,jdbcType=DECIMAL},
+      DiscountMoney = #{discountmoney,jdbcType=DECIMAL},
+      DiscountLastMoney = #{discountlastmoney,jdbcType=DECIMAL},
+      OtherMoney = #{othermoney,jdbcType=DECIMAL},
      OtherMoneyList = #{othermoneylist,jdbcType=VARCHAR},
      OtherMoneyItem = #{othermoneyitem,jdbcType=VARCHAR},
      AccountDay = #{accountday,jdbcType=INTEGER},

--- a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
+++ b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
@@ -14,9 +14,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="DOUBLE" property="UnitPrice" />
-        <result column="OperNumber" jdbcType="DOUBLE" property="OperNumber" />
-        <result column="AllPrice" jdbcType="DOUBLE" property="AllPrice" />
+        <result column="UnitPrice" jdbcType="DECIMAL" property="UnitPrice" />
+        <result column="OperNumber" jdbcType="DECIMAL" property="OperNumber" />
+        <result column="AllPrice" 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" />
@@ -28,15 +28,15 @@
        <result column="mName" jdbcType="VARCHAR" property="mName" />
        <result column="Model" jdbcType="VARCHAR" property="Model" />
        <result column="categoryName" jdbcType="VARCHAR" property="categoryName" />
-        <result column="numSum" jdbcType="DOUBLE" property="numSum" />
-        <result column="priceSum" jdbcType="DOUBLE" property="priceSum" />
+        <result column="numSum" jdbcType="DECIMAL" property="numSum" />
+        <result column="priceSum" jdbcType="DECIMAL" property="priceSum" />
    </resultMap>

    <resultMap id="ResultStatementAccount" type="com.jsh.erp.datasource.vo.DepotHeadVo4StatementAccount">
        <result column="Number" jdbcType="VARCHAR" property="number" />
        <result column="type" jdbcType="VARCHAR" property="type" />
-        <result column="DiscountLastMoney" jdbcType="DOUBLE" property="discountLastMoney" />
-        <result column="ChangeAmount" jdbcType="DOUBLE" property="changeAmount" />
+        <result column="DiscountLastMoney" jdbcType="DECIMAL" property="discountLastMoney" />
+        <result column="ChangeAmount" jdbcType="DECIMAL" property="changeAmount" />
        <result column="supplierName" jdbcType="VARCHAR" property="supplierName" />
        <result column="oTime" jdbcType="VARCHAR" property="oTime" />
    </resultMap>
@@ -262,7 +262,7 @@
        ) cc
    </select>

-    <select id="findAllMoney" resultType="java.lang.Double">
+    <select id="findAllMoney" resultType="java.math.BigDecimal">
        select sum(${modeName}) as allMoney from jsh_depothead where Type='${type}' and SubType = '${subType}'
        and OrganId =${supplierId} and OperTime &lt;='${endTime}'
    </select>

--- a/src/main/resources/mapper_xml/DepotItemMapper.xml
+++ b/src/main/resources/mapper_xml/DepotItemMapper.xml
@@ -10,19 +10,19 @@
    <result column="HeaderId" jdbcType="BIGINT" property="headerid" />
    <result column="MaterialId" jdbcType="BIGINT" property="materialid" />
    <result column="MUnit" jdbcType="VARCHAR" property="munit" />
-    <result column="OperNumber" jdbcType="DOUBLE" property="opernumber" />
-    <result column="BasicNumber" jdbcType="DOUBLE" property="basicnumber" />
-    <result column="UnitPrice" jdbcType="DOUBLE" property="unitprice" />
-    <result column="TaxUnitPrice" jdbcType="DOUBLE" property="taxunitprice" />
-    <result column="AllPrice" jdbcType="DOUBLE" property="allprice" />
+    <result column="OperNumber" jdbcType="DECIMAL" property="opernumber" />
+    <result column="BasicNumber" jdbcType="DECIMAL" property="basicnumber" />
+    <result column="UnitPrice" jdbcType="DECIMAL" property="unitprice" />
+    <result column="TaxUnitPrice" jdbcType="DECIMAL" property="taxunitprice" />
+    <result column="AllPrice" jdbcType="DECIMAL" property="allprice" />
    <result column="Remark" jdbcType="VARCHAR" property="remark" />
    <result column="Img" jdbcType="VARCHAR" property="img" />
-    <result column="Incidentals" jdbcType="DOUBLE" property="incidentals" />
+    <result column="Incidentals" jdbcType="DECIMAL" property="incidentals" />
    <result column="DepotId" jdbcType="BIGINT" property="depotid" />
    <result column="AnotherDepotId" jdbcType="BIGINT" property="anotherdepotid" />
-    <result column="TaxRate" jdbcType="DOUBLE" property="taxrate" />
-    <result column="TaxMoney" jdbcType="DOUBLE" property="taxmoney" />
-    <result column="TaxLastMoney" jdbcType="DOUBLE" property="taxlastmoney" />
+    <result column="TaxRate" jdbcType="DECIMAL" property="taxrate" />
+    <result column="TaxMoney" jdbcType="DECIMAL" property="taxmoney" />
+    <result column="TaxLastMoney" jdbcType="DECIMAL" property="taxlastmoney" />
    <result column="OtherField1" jdbcType="VARCHAR" property="otherfield1" />
    <result column="OtherField2" jdbcType="VARCHAR" property="otherfield2" />
    <result column="OtherField3" jdbcType="VARCHAR" property="otherfield3" />
@@ -165,11 +165,11 @@
      OtherField2, OtherField3, OtherField4, 
      OtherField5, MType)
    values (#{id,jdbcType=BIGINT}, #{headerid,jdbcType=BIGINT}, #{materialid,jdbcType=BIGINT}, 
-      #{munit,jdbcType=VARCHAR}, #{opernumber,jdbcType=DOUBLE}, #{basicnumber,jdbcType=DOUBLE}, 
-      #{unitprice,jdbcType=DOUBLE}, #{taxunitprice,jdbcType=DOUBLE}, #{allprice,jdbcType=DOUBLE}, 
-      #{remark,jdbcType=VARCHAR}, #{img,jdbcType=VARCHAR}, #{incidentals,jdbcType=DOUBLE}, 
-      #{depotid,jdbcType=BIGINT}, #{anotherdepotid,jdbcType=BIGINT}, #{taxrate,jdbcType=DOUBLE}, 
-      #{taxmoney,jdbcType=DOUBLE}, #{taxlastmoney,jdbcType=DOUBLE}, #{otherfield1,jdbcType=VARCHAR}, 
+      #{munit,jdbcType=VARCHAR}, #{opernumber,jdbcType=DECIMAL}, #{basicnumber,jdbcType=DECIMAL}, 
+      #{unitprice,jdbcType=DECIMAL}, #{taxunitprice,jdbcType=DECIMAL}, #{allprice,jdbcType=DECIMAL}, 
+      #{remark,jdbcType=VARCHAR}, #{img,jdbcType=VARCHAR}, #{incidentals,jdbcType=DECIMAL}, 
+      #{depotid,jdbcType=BIGINT}, #{anotherdepotid,jdbcType=BIGINT}, #{taxrate,jdbcType=DECIMAL}, 
+      #{taxmoney,jdbcType=DECIMAL}, #{taxlastmoney,jdbcType=DECIMAL}, #{otherfield1,jdbcType=VARCHAR}, 
      #{otherfield2,jdbcType=VARCHAR}, #{otherfield3,jdbcType=VARCHAR}, #{otherfield4,jdbcType=VARCHAR}, 
      #{otherfield5,jdbcType=VARCHAR}, #{mtype,jdbcType=VARCHAR})
  </insert>
@@ -264,19 +264,19 @@
        #{munit,jdbcType=VARCHAR},
      </if>
      <if test="opernumber != null">
-        #{opernumber,jdbcType=DOUBLE},
+        #{opernumber,jdbcType=DECIMAL},
      </if>
      <if test="basicnumber != null">
-        #{basicnumber,jdbcType=DOUBLE},
+        #{basicnumber,jdbcType=DECIMAL},
      </if>
      <if test="unitprice != null">
-        #{unitprice,jdbcType=DOUBLE},
+        #{unitprice,jdbcType=DECIMAL},
      </if>
      <if test="taxunitprice != null">
-        #{taxunitprice,jdbcType=DOUBLE},
+        #{taxunitprice,jdbcType=DECIMAL},
      </if>
      <if test="allprice != null">
-        #{allprice,jdbcType=DOUBLE},
+        #{allprice,jdbcType=DECIMAL},
      </if>
      <if test="remark != null">
        #{remark,jdbcType=VARCHAR},
@@ -285,7 +285,7 @@
        #{img,jdbcType=VARCHAR},
      </if>
      <if test="incidentals != null">
-        #{incidentals,jdbcType=DOUBLE},
+        #{incidentals,jdbcType=DECIMAL},
      </if>
      <if test="depotid != null">
        #{depotid,jdbcType=BIGINT},
@@ -294,13 +294,13 @@
        #{anotherdepotid,jdbcType=BIGINT},
      </if>
      <if test="taxrate != null">
-        #{taxrate,jdbcType=DOUBLE},
+        #{taxrate,jdbcType=DECIMAL},
      </if>
      <if test="taxmoney != null">
-        #{taxmoney,jdbcType=DOUBLE},
+        #{taxmoney,jdbcType=DECIMAL},
      </if>
      <if test="taxlastmoney != null">
-        #{taxlastmoney,jdbcType=DOUBLE},
+        #{taxlastmoney,jdbcType=DECIMAL},
      </if>
      <if test="otherfield1 != null">
        #{otherfield1,jdbcType=VARCHAR},
@@ -352,19 +352,19 @@
        MUnit = #{record.munit,jdbcType=VARCHAR},
      </if>
      <if test="record.opernumber != null">
-        OperNumber = #{record.opernumber,jdbcType=DOUBLE},
+        OperNumber = #{record.opernumber,jdbcType=DECIMAL},
      </if>
      <if test="record.basicnumber != null">
-        BasicNumber = #{record.basicnumber,jdbcType=DOUBLE},
+        BasicNumber = #{record.basicnumber,jdbcType=DECIMAL},
      </if>
      <if test="record.unitprice != null">
-        UnitPrice = #{record.unitprice,jdbcType=DOUBLE},
+        UnitPrice = #{record.unitprice,jdbcType=DECIMAL},
      </if>
      <if test="record.taxunitprice != null">
-        TaxUnitPrice = #{record.taxunitprice,jdbcType=DOUBLE},
+        TaxUnitPrice = #{record.taxunitprice,jdbcType=DECIMAL},
      </if>
      <if test="record.allprice != null">
-        AllPrice = #{record.allprice,jdbcType=DOUBLE},
+        AllPrice = #{record.allprice,jdbcType=DECIMAL},
      </if>
      <if test="record.remark != null">
        Remark = #{record.remark,jdbcType=VARCHAR},
@@ -373,7 +373,7 @@
        Img = #{record.img,jdbcType=VARCHAR},
      </if>
      <if test="record.incidentals != null">
-        Incidentals = #{record.incidentals,jdbcType=DOUBLE},
+        Incidentals = #{record.incidentals,jdbcType=DECIMAL},
      </if>
      <if test="record.depotid != null">
        DepotId = #{record.depotid,jdbcType=BIGINT},
@@ -382,13 +382,13 @@
        AnotherDepotId = #{record.anotherdepotid,jdbcType=BIGINT},
      </if>
      <if test="record.taxrate != null">
-        TaxRate = #{record.taxrate,jdbcType=DOUBLE},
+        TaxRate = #{record.taxrate,jdbcType=DECIMAL},
      </if>
      <if test="record.taxmoney != null">
-        TaxMoney = #{record.taxmoney,jdbcType=DOUBLE},
+        TaxMoney = #{record.taxmoney,jdbcType=DECIMAL},
      </if>
      <if test="record.taxlastmoney != null">
-        TaxLastMoney = #{record.taxlastmoney,jdbcType=DOUBLE},
+        TaxLastMoney = #{record.taxlastmoney,jdbcType=DECIMAL},
      </if>
      <if test="record.otherfield1 != null">
        OtherField1 = #{record.otherfield1,jdbcType=VARCHAR},
@@ -423,19 +423,19 @@
      HeaderId = #{record.headerid,jdbcType=BIGINT},
      MaterialId = #{record.materialid,jdbcType=BIGINT},
      MUnit = #{record.munit,jdbcType=VARCHAR},
-      OperNumber = #{record.opernumber,jdbcType=DOUBLE},
-      BasicNumber = #{record.basicnumber,jdbcType=DOUBLE},
-      UnitPrice = #{record.unitprice,jdbcType=DOUBLE},
-      TaxUnitPrice = #{record.taxunitprice,jdbcType=DOUBLE},
-      AllPrice = #{record.allprice,jdbcType=DOUBLE},
+      OperNumber = #{record.opernumber,jdbcType=DECIMAL},
+      BasicNumber = #{record.basicnumber,jdbcType=DECIMAL},
+      UnitPrice = #{record.unitprice,jdbcType=DECIMAL},
+      TaxUnitPrice = #{record.taxunitprice,jdbcType=DECIMAL},
+      AllPrice = #{record.allprice,jdbcType=DECIMAL},
      Remark = #{record.remark,jdbcType=VARCHAR},
      Img = #{record.img,jdbcType=VARCHAR},
-      Incidentals = #{record.incidentals,jdbcType=DOUBLE},
+      Incidentals = #{record.incidentals,jdbcType=DECIMAL},
      DepotId = #{record.depotid,jdbcType=BIGINT},
      AnotherDepotId = #{record.anotherdepotid,jdbcType=BIGINT},
-      TaxRate = #{record.taxrate,jdbcType=DOUBLE},
-      TaxMoney = #{record.taxmoney,jdbcType=DOUBLE},
-      TaxLastMoney = #{record.taxlastmoney,jdbcType=DOUBLE},
+      TaxRate = #{record.taxrate,jdbcType=DECIMAL},
+      TaxMoney = #{record.taxmoney,jdbcType=DECIMAL},
+      TaxLastMoney = #{record.taxlastmoney,jdbcType=DECIMAL},
      OtherField1 = #{record.otherfield1,jdbcType=VARCHAR},
      OtherField2 = #{record.otherfield2,jdbcType=VARCHAR},
      OtherField3 = #{record.otherfield3,jdbcType=VARCHAR},
@@ -463,19 +463,19 @@
        MUnit = #{munit,jdbcType=VARCHAR},
      </if>
      <if test="opernumber != null">
-        OperNumber = #{opernumber,jdbcType=DOUBLE},
+        OperNumber = #{opernumber,jdbcType=DECIMAL},
      </if>
      <if test="basicnumber != null">
-        BasicNumber = #{basicnumber,jdbcType=DOUBLE},
+        BasicNumber = #{basicnumber,jdbcType=DECIMAL},
      </if>
      <if test="unitprice != null">
-        UnitPrice = #{unitprice,jdbcType=DOUBLE},
+        UnitPrice = #{unitprice,jdbcType=DECIMAL},
      </if>
      <if test="taxunitprice != null">
-        TaxUnitPrice = #{taxunitprice,jdbcType=DOUBLE},
+        TaxUnitPrice = #{taxunitprice,jdbcType=DECIMAL},
      </if>
      <if test="allprice != null">
-        AllPrice = #{allprice,jdbcType=DOUBLE},
+        AllPrice = #{allprice,jdbcType=DECIMAL},
      </if>
      <if test="remark != null">
        Remark = #{remark,jdbcType=VARCHAR},
@@ -484,7 +484,7 @@
        Img = #{img,jdbcType=VARCHAR},
      </if>
      <if test="incidentals != null">
-        Incidentals = #{incidentals,jdbcType=DOUBLE},
+        Incidentals = #{incidentals,jdbcType=DECIMAL},
      </if>
      <if test="depotid != null">
        DepotId = #{depotid,jdbcType=BIGINT},
@@ -493,13 +493,13 @@
        AnotherDepotId = #{anotherdepotid,jdbcType=BIGINT},
      </if>
      <if test="taxrate != null">
-        TaxRate = #{taxrate,jdbcType=DOUBLE},
+        TaxRate = #{taxrate,jdbcType=DECIMAL},
      </if>
      <if test="taxmoney != null">
-        TaxMoney = #{taxmoney,jdbcType=DOUBLE},
+        TaxMoney = #{taxmoney,jdbcType=DECIMAL},
      </if>
      <if test="taxlastmoney != null">
-        TaxLastMoney = #{taxlastmoney,jdbcType=DOUBLE},
+        TaxLastMoney = #{taxlastmoney,jdbcType=DECIMAL},
      </if>
      <if test="otherfield1 != null">
        OtherField1 = #{otherfield1,jdbcType=VARCHAR},
@@ -531,19 +531,19 @@
    set HeaderId = #{headerid,jdbcType=BIGINT},
      MaterialId = #{materialid,jdbcType=BIGINT},
      MUnit = #{munit,jdbcType=VARCHAR},
-      OperNumber = #{opernumber,jdbcType=DOUBLE},
-      BasicNumber = #{basicnumber,jdbcType=DOUBLE},
-      UnitPrice = #{unitprice,jdbcType=DOUBLE},
-      TaxUnitPrice = #{taxunitprice,jdbcType=DOUBLE},
-      AllPrice = #{allprice,jdbcType=DOUBLE},
+      OperNumber = #{opernumber,jdbcType=DECIMAL},
+      BasicNumber = #{basicnumber,jdbcType=DECIMAL},
+      UnitPrice = #{unitprice,jdbcType=DECIMAL},
+      TaxUnitPrice = #{taxunitprice,jdbcType=DECIMAL},
+      AllPrice = #{allprice,jdbcType=DECIMAL},
      Remark = #{remark,jdbcType=VARCHAR},
      Img = #{img,jdbcType=VARCHAR},
-      Incidentals = #{incidentals,jdbcType=DOUBLE},
+      Incidentals = #{incidentals,jdbcType=DECIMAL},
      DepotId = #{depotid,jdbcType=BIGINT},
      AnotherDepotId = #{anotherdepotid,jdbcType=BIGINT},
-      TaxRate = #{taxrate,jdbcType=DOUBLE},
-      TaxMoney = #{taxmoney,jdbcType=DOUBLE},
-      TaxLastMoney = #{taxlastmoney,jdbcType=DOUBLE},
+      TaxRate = #{taxrate,jdbcType=DECIMAL},
+      TaxMoney = #{taxmoney,jdbcType=DECIMAL},
+      TaxLastMoney = #{taxlastmoney,jdbcType=DECIMAL},
      OtherField1 = #{otherfield1,jdbcType=VARCHAR},
      OtherField2 = #{otherfield2,jdbcType=VARCHAR},
      OtherField3 = #{otherfield3,jdbcType=VARCHAR},

--- a/src/main/resources/mapper_xml/DepotItemMapperEx.xml
+++ b/src/main/resources/mapper_xml/DepotItemMapperEx.xml
@@ -169,7 +169,7 @@
        group by m.id) cc
    </select>

-    <select id="findByTypeInIsPrev" resultType="java.lang.Double">
+    <select id="findByTypeInIsPrev" resultType="java.math.BigDecimal">
        select sum(BasicNumber) as BasicNumber from jsh_depotitem di,jsh_depothead dh
        where di.HeaderId = dh.id and
        ((type='入库' and DepotId=${ProjectId})
@@ -180,7 +180,7 @@
        and MaterialId = ${MId}  and dh.OperTime &lt; '${MonthTime}-01 00:00:00'
    </select>

-    <select id="findByTypeInIsNotPrev" resultType="java.lang.Double">
+    <select id="findByTypeInIsNotPrev" resultType="java.math.BigDecimal">
        select sum(BasicNumber) as BasicNumber from jsh_depotitem di,jsh_depothead dh
        where di.HeaderId = dh.id and
        ((type='入库' and DepotId=${ProjectId})
@@ -192,14 +192,14 @@
        and dh.OperTime &lt;= '${MonthTime}-31 23:59:59'
    </select>

-    <select id="findByTypeOutIsPrev" resultType="java.lang.Double">
+    <select id="findByTypeOutIsPrev" resultType="java.math.BigDecimal">
        select sum(BasicNumber) as BasicNumber from jsh_depotitem,jsh_depothead  where jsh_depotitem.HeaderId = jsh_depothead.id and type='出库'
        and DepotId= ${ProjectId}
        and MaterialId = ${MId}
        and jsh_depothead.OperTime &lt; '${MonthTime}-01 00:00:00'
    </select>

-    <select id="findByTypeOutIsNotPrev" resultType="java.lang.Double">
+    <select id="findByTypeOutIsNotPrev" resultType="java.math.BigDecimal">
        select sum(BasicNumber) as BasicNumber from jsh_depotitem,jsh_depothead  where jsh_depotitem.HeaderId = jsh_depothead.id and type='出库'
        and DepotId= ${ProjectId}
        and MaterialId = ${MId}
@@ -208,7 +208,7 @@
    </select>


-    <select id="findPriceByTypeInIsPrev" resultType="java.lang.Double">
+    <select id="findPriceByTypeInIsPrev" resultType="java.math.BigDecimal">
        select sum(AllPrice) as AllPrice from jsh_depotitem di,jsh_depothead dh
        where di.HeaderId = dh.id and
        ((type='入库' and DepotId=${ProjectId})
@@ -219,7 +219,7 @@
        and MaterialId = ${MId}  and dh.OperTime &lt; '${MonthTime}-01 00:00:00'
    </select>

-    <select id="findPriceByTypeInIsNotPrev" resultType="java.lang.Double">
+    <select id="findPriceByTypeInIsNotPrev" resultType="java.math.BigDecimal">
        select sum(AllPrice) as AllPrice from jsh_depotitem di,jsh_depothead dh
        where di.HeaderId = dh.id and
        ((type='入库' and DepotId=${ProjectId})
@@ -231,14 +231,14 @@
        and dh.OperTime &lt;= '${MonthTime}-31 23:59:59'
    </select>

-    <select id="findPriceByTypeOutIsPrev" resultType="java.lang.Double">
+    <select id="findPriceByTypeOutIsPrev" resultType="java.math.BigDecimal">
        select sum(AllPrice) as AllPrice from jsh_depotitem,jsh_depothead  where jsh_depotitem.HeaderId = jsh_depothead.id and type='出库'
        and DepotId= ${ProjectId}
        and MaterialId = ${MId}
        and jsh_depothead.OperTime &lt; '${MonthTime}-01 00:00:00'
    </select>

-    <select id="findPriceByTypeOutIsNotPrev" resultType="java.lang.Double">
+    <select id="findPriceByTypeOutIsNotPrev" resultType="java.math.BigDecimal">
        select sum(AllPrice) as AllPrice from jsh_depotitem,jsh_depothead  where jsh_depotitem.HeaderId = jsh_depothead.id and type='出库'
        and DepotId= ${ProjectId}
        and MaterialId = ${MId}
@@ -246,28 +246,28 @@
        and jsh_depothead.OperTime &lt;= '${MonthTime}-31 23:59:59'
    </select>

-    <select id="buyOrSaleNumber" resultType="java.lang.Double">
+    <select id="buyOrSaleNumber" resultType="java.math.BigDecimal">
        select sum(BasicNumber) as BasicNumber from jsh_depotitem,jsh_depothead
        where jsh_depotitem.HeaderId = jsh_depothead.id and type='${type}' and subType='${subType}'
        and MaterialId =${MId} and jsh_depothead.OperTime &gt;= '${MonthTime}-01 00:00:00'
        and jsh_depothead.OperTime &lt;= '${MonthTime}-31 23:59:59'
    </select>

-    <select id="buyOrSalePrice" resultType="java.lang.Double">
+    <select id="buyOrSalePrice" resultType="java.math.BigDecimal">
        select sum(AllPrice) as AllPrice from jsh_depotitem,jsh_depothead
        where jsh_depotitem.HeaderId = jsh_depothead.id and type='${type}' and subType='${subType}'
        and MaterialId =${MId} and jsh_depothead.OperTime &gt;= '${MonthTime}-01 00:00:00'
        and jsh_depothead.OperTime &lt;= '${MonthTime}-31 23:59:59'
    </select>

-    <select id="findGiftByTypeIn" resultType="java.lang.Double">
+    <select id="findGiftByTypeIn" resultType="java.math.BigDecimal">
        select sum(BasicNumber) as BasicNumber from jsh_depotitem,jsh_depothead
        where jsh_depotitem.HeaderId = jsh_depothead.id and jsh_depothead.SubType='${subType}'
        and jsh_depotitem.AnotherDepotId=${ProjectId}
        and jsh_depotitem.MaterialId =${MId}
    </select>

-    <select id="findGiftByTypeOut" resultType="java.lang.Double">
+    <select id="findGiftByTypeOut" resultType="java.math.BigDecimal">
        select sum(BasicNumber) as BasicNumber from jsh_depotitem,jsh_depothead
        where jsh_depotitem.HeaderId = jsh_depothead.id and jsh_depothead.SubType='${subType}'
        and jsh_depotitem.DepotId=${ProjectId}

--- a/src/main/resources/mapper_xml/DepotMapper.xml
+++ b/src/main/resources/mapper_xml/DepotMapper.xml
@@ -9,8 +9,8 @@
    <id column="id" jdbcType="BIGINT" property="id" />
    <result column="name" jdbcType="VARCHAR" property="name" />
    <result column="address" jdbcType="VARCHAR" property="address" />
-    <result column="warehousing" jdbcType="DOUBLE" property="warehousing" />
-    <result column="truckage" jdbcType="DOUBLE" property="truckage" />
+    <result column="warehousing" jdbcType="DECIMAL" property="warehousing" />
+    <result column="truckage" jdbcType="DECIMAL" property="truckage" />
    <result column="type" jdbcType="INTEGER" property="type" />
    <result column="sort" jdbcType="VARCHAR" property="sort" />
    <result column="remark" jdbcType="VARCHAR" property="remark" />
@@ -143,7 +143,7 @@
      warehousing, truckage, type, 
      sort, remark)
    values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, 
-      #{warehousing,jdbcType=DOUBLE}, #{truckage,jdbcType=DOUBLE}, #{type,jdbcType=INTEGER}, 
+      #{warehousing,jdbcType=DECIMAL}, #{truckage,jdbcType=DECIMAL}, #{type,jdbcType=INTEGER}, 
      #{sort,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR})
  </insert>
  <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Depot">
@@ -189,10 +189,10 @@
        #{address,jdbcType=VARCHAR},
      </if>
      <if test="warehousing != null">
-        #{warehousing,jdbcType=DOUBLE},
+        #{warehousing,jdbcType=DECIMAL},
      </if>
      <if test="truckage != null">
-        #{truckage,jdbcType=DOUBLE},
+        #{truckage,jdbcType=DECIMAL},
      </if>
      <if test="type != null">
        #{type,jdbcType=INTEGER},
@@ -232,10 +232,10 @@
        address = #{record.address,jdbcType=VARCHAR},
      </if>
      <if test="record.warehousing != null">
-        warehousing = #{record.warehousing,jdbcType=DOUBLE},
+        warehousing = #{record.warehousing,jdbcType=DECIMAL},
      </if>
      <if test="record.truckage != null">
-        truckage = #{record.truckage,jdbcType=DOUBLE},
+        truckage = #{record.truckage,jdbcType=DECIMAL},
      </if>
      <if test="record.type != null">
        type = #{record.type,jdbcType=INTEGER},
@@ -260,8 +260,8 @@
    set id = #{record.id,jdbcType=BIGINT},
      name = #{record.name,jdbcType=VARCHAR},
      address = #{record.address,jdbcType=VARCHAR},
-      warehousing = #{record.warehousing,jdbcType=DOUBLE},
-      truckage = #{record.truckage,jdbcType=DOUBLE},
+      warehousing = #{record.warehousing,jdbcType=DECIMAL},
+      truckage = #{record.truckage,jdbcType=DECIMAL},
      type = #{record.type,jdbcType=INTEGER},
      sort = #{record.sort,jdbcType=VARCHAR},
      remark = #{record.remark,jdbcType=VARCHAR}
@@ -283,10 +283,10 @@
        address = #{address,jdbcType=VARCHAR},
      </if>
      <if test="warehousing != null">
-        warehousing = #{warehousing,jdbcType=DOUBLE},
+        warehousing = #{warehousing,jdbcType=DECIMAL},
      </if>
      <if test="truckage != null">
-        truckage = #{truckage,jdbcType=DOUBLE},
+        truckage = #{truckage,jdbcType=DECIMAL},
      </if>
      <if test="type != null">
        type = #{type,jdbcType=INTEGER},
@@ -308,8 +308,8 @@
    update jsh_depot
    set name = #{name,jdbcType=VARCHAR},
      address = #{address,jdbcType=VARCHAR},
-      warehousing = #{warehousing,jdbcType=DOUBLE},
-      truckage = #{truckage,jdbcType=DOUBLE},
+      warehousing = #{warehousing,jdbcType=DECIMAL},
+      truckage = #{truckage,jdbcType=DECIMAL},
      type = #{type,jdbcType=INTEGER},
      sort = #{sort,jdbcType=VARCHAR},
      remark = #{remark,jdbcType=VARCHAR}

--- a/src/main/resources/mapper_xml/LogMapperEx.xml
+++ b/src/main/resources/mapper_xml/LogMapperEx.xml
@@ -18,10 +18,10 @@
            and status=${status}
        </if>
        <if test="beginTime != null">
-            and createtime gt;= '%${beginTime}%'
+            and createtime &gt;= '%${beginTime}%'
        </if>
        <if test="endTime != null">
-            and createtime lt;= '%${endTime}%'
+            and createtime &lt;= '%${endTime}%'
        </if>
        <if test="contentdetails != null">
            and contentdetails like '%${contentdetails}%'
@@ -48,12 +48,12 @@
        <if test="status != null">
            and status = ${status}
        </if>
-        <if test="beginTime != null">
-            and createtime &gt;= '${beginTime}'
-        </if>
-        <if test="endTime != null">
-            and createtime &lt;= '${endTime}'
-        </if>
+        <if test="beginTime != null"><![CDATA[
+            and createtime >= '${beginTime}'
+        ]]></if>
+        <if test="endTime != null"><![CDATA[
+            and createtime <= '${endTime}'
+        ]]></if>
        <if test="contentdetails != null">
            and contentdetails like '%${contentdetails}%'
        </if>

--- a/src/main/resources/mapper_xml/MaterialMapper.xml
+++ b/src/main/resources/mapper_xml/MaterialMapper.xml
@@ -10,17 +10,17 @@
    <result column="CategoryId" jdbcType="BIGINT" property="categoryid" />
    <result column="Name" jdbcType="VARCHAR" property="name" />
    <result column="Mfrs" jdbcType="VARCHAR" property="mfrs" />
-    <result column="Packing" jdbcType="DOUBLE" property="packing" />
-    <result column="SafetyStock" jdbcType="DOUBLE" property="safetystock" />
+    <result column="Packing" jdbcType="DECIMAL" property="packing" />
+    <result column="SafetyStock" jdbcType="DECIMAL" property="safetystock" />
    <result column="Model" jdbcType="VARCHAR" property="model" />
    <result column="Standard" jdbcType="VARCHAR" property="standard" />
    <result column="Color" jdbcType="VARCHAR" property="color" />
    <result column="Unit" jdbcType="VARCHAR" property="unit" />
    <result column="Remark" jdbcType="VARCHAR" property="remark" />
-    <result column="RetailPrice" jdbcType="DOUBLE" property="retailprice" />
-    <result column="LowPrice" jdbcType="DOUBLE" property="lowprice" />
-    <result column="PresetPriceOne" jdbcType="DOUBLE" property="presetpriceone" />
-    <result column="PresetPriceTwo" jdbcType="DOUBLE" property="presetpricetwo" />
+    <result column="RetailPrice" jdbcType="DECIMAL" property="retailprice" />
+    <result column="LowPrice" jdbcType="DECIMAL" property="lowprice" />
+    <result column="PresetPriceOne" jdbcType="DECIMAL" property="presetpriceone" />
+    <result column="PresetPriceTwo" jdbcType="DECIMAL" property="presetpricetwo" />
    <result column="UnitId" jdbcType="BIGINT" property="unitid" />
    <result column="FirstOutUnit" jdbcType="VARCHAR" property="firstoutunit" />
    <result column="FirstInUnit" jdbcType="VARCHAR" property="firstinunit" />
@@ -165,10 +165,10 @@
      PriceStrategy, Enabled, OtherField1, 
      OtherField2, OtherField3)
    values (#{id,jdbcType=BIGINT}, #{categoryid,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, 
-      #{mfrs,jdbcType=VARCHAR}, #{packing,jdbcType=DOUBLE}, #{safetystock,jdbcType=DOUBLE}, 
+      #{mfrs,jdbcType=VARCHAR}, #{packing,jdbcType=DECIMAL}, #{safetystock,jdbcType=DECIMAL}, 
      #{model,jdbcType=VARCHAR}, #{standard,jdbcType=VARCHAR}, #{color,jdbcType=VARCHAR}, 
-      #{unit,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{retailprice,jdbcType=DOUBLE}, 
-      #{lowprice,jdbcType=DOUBLE}, #{presetpriceone,jdbcType=DOUBLE}, #{presetpricetwo,jdbcType=DOUBLE}, 
+      #{unit,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{retailprice,jdbcType=DECIMAL}, 
+      #{lowprice,jdbcType=DECIMAL}, #{presetpriceone,jdbcType=DECIMAL}, #{presetpricetwo,jdbcType=DECIMAL}, 
      #{unitid,jdbcType=BIGINT}, #{firstoutunit,jdbcType=VARCHAR}, #{firstinunit,jdbcType=VARCHAR}, 
      #{pricestrategy,jdbcType=VARCHAR}, #{enabled,jdbcType=BIT}, #{otherfield1,jdbcType=VARCHAR}, 
      #{otherfield2,jdbcType=VARCHAR}, #{otherfield3,jdbcType=VARCHAR})
@@ -264,10 +264,10 @@
        #{mfrs,jdbcType=VARCHAR},
      </if>
      <if test="packing != null">
-        #{packing,jdbcType=DOUBLE},
+        #{packing,jdbcType=DECIMAL},
      </if>
      <if test="safetystock != null">
-        #{safetystock,jdbcType=DOUBLE},
+        #{safetystock,jdbcType=DECIMAL},
      </if>
      <if test="model != null">
        #{model,jdbcType=VARCHAR},
@@ -285,16 +285,16 @@
        #{remark,jdbcType=VARCHAR},
      </if>
      <if test="retailprice != null">
-        #{retailprice,jdbcType=DOUBLE},
+        #{retailprice,jdbcType=DECIMAL},
      </if>
      <if test="lowprice != null">
-        #{lowprice,jdbcType=DOUBLE},
+        #{lowprice,jdbcType=DECIMAL},
      </if>
      <if test="presetpriceone != null">
-        #{presetpriceone,jdbcType=DOUBLE},
+        #{presetpriceone,jdbcType=DECIMAL},
      </if>
      <if test="presetpricetwo != null">
-        #{presetpricetwo,jdbcType=DOUBLE},
+        #{presetpricetwo,jdbcType=DECIMAL},
      </if>
      <if test="unitid != null">
        #{unitid,jdbcType=BIGINT},
@@ -352,10 +352,10 @@
        Mfrs = #{record.mfrs,jdbcType=VARCHAR},
      </if>
      <if test="record.packing != null">
-        Packing = #{record.packing,jdbcType=DOUBLE},
+        Packing = #{record.packing,jdbcType=DECIMAL},
      </if>
      <if test="record.safetystock != null">
-        SafetyStock = #{record.safetystock,jdbcType=DOUBLE},
+        SafetyStock = #{record.safetystock,jdbcType=DECIMAL},
      </if>
      <if test="record.model != null">
        Model = #{record.model,jdbcType=VARCHAR},
@@ -373,16 +373,16 @@
        Remark = #{record.remark,jdbcType=VARCHAR},
      </if>
      <if test="record.retailprice != null">
-        RetailPrice = #{record.retailprice,jdbcType=DOUBLE},
+        RetailPrice = #{record.retailprice,jdbcType=DECIMAL},
      </if>
      <if test="record.lowprice != null">
-        LowPrice = #{record.lowprice,jdbcType=DOUBLE},
+        LowPrice = #{record.lowprice,jdbcType=DECIMAL},
      </if>
      <if test="record.presetpriceone != null">
-        PresetPriceOne = #{record.presetpriceone,jdbcType=DOUBLE},
+        PresetPriceOne = #{record.presetpriceone,jdbcType=DECIMAL},
      </if>
      <if test="record.presetpricetwo != null">
-        PresetPriceTwo = #{record.presetpricetwo,jdbcType=DOUBLE},
+        PresetPriceTwo = #{record.presetpricetwo,jdbcType=DECIMAL},
      </if>
      <if test="record.unitid != null">
        UnitId = #{record.unitid,jdbcType=BIGINT},
@@ -423,17 +423,17 @@
      CategoryId = #{record.categoryid,jdbcType=BIGINT},
      Name = #{record.name,jdbcType=VARCHAR},
      Mfrs = #{record.mfrs,jdbcType=VARCHAR},
-      Packing = #{record.packing,jdbcType=DOUBLE},
-      SafetyStock = #{record.safetystock,jdbcType=DOUBLE},
+      Packing = #{record.packing,jdbcType=DECIMAL},
+      SafetyStock = #{record.safetystock,jdbcType=DECIMAL},
      Model = #{record.model,jdbcType=VARCHAR},
      Standard = #{record.standard,jdbcType=VARCHAR},
      Color = #{record.color,jdbcType=VARCHAR},
      Unit = #{record.unit,jdbcType=VARCHAR},
      Remark = #{record.remark,jdbcType=VARCHAR},
-      RetailPrice = #{record.retailprice,jdbcType=DOUBLE},
-      LowPrice = #{record.lowprice,jdbcType=DOUBLE},
-      PresetPriceOne = #{record.presetpriceone,jdbcType=DOUBLE},
-      PresetPriceTwo = #{record.presetpricetwo,jdbcType=DOUBLE},
+      RetailPrice = #{record.retailprice,jdbcType=DECIMAL},
+      LowPrice = #{record.lowprice,jdbcType=DECIMAL},
+      PresetPriceOne = #{record.presetpriceone,jdbcType=DECIMAL},
+      PresetPriceTwo = #{record.presetpricetwo,jdbcType=DECIMAL},
      UnitId = #{record.unitid,jdbcType=BIGINT},
      FirstOutUnit = #{record.firstoutunit,jdbcType=VARCHAR},
      FirstInUnit = #{record.firstinunit,jdbcType=VARCHAR},
@@ -463,10 +463,10 @@
        Mfrs = #{mfrs,jdbcType=VARCHAR},
      </if>
      <if test="packing != null">
-        Packing = #{packing,jdbcType=DOUBLE},
+        Packing = #{packing,jdbcType=DECIMAL},
      </if>
      <if test="safetystock != null">
-        SafetyStock = #{safetystock,jdbcType=DOUBLE},
+        SafetyStock = #{safetystock,jdbcType=DECIMAL},
      </if>
      <if test="model != null">
        Model = #{model,jdbcType=VARCHAR},
@@ -484,16 +484,16 @@
        Remark = #{remark,jdbcType=VARCHAR},
      </if>
      <if test="retailprice != null">
-        RetailPrice = #{retailprice,jdbcType=DOUBLE},
+        RetailPrice = #{retailprice,jdbcType=DECIMAL},
      </if>
      <if test="lowprice != null">
-        LowPrice = #{lowprice,jdbcType=DOUBLE},
+        LowPrice = #{lowprice,jdbcType=DECIMAL},
      </if>
      <if test="presetpriceone != null">
-        PresetPriceOne = #{presetpriceone,jdbcType=DOUBLE},
+        PresetPriceOne = #{presetpriceone,jdbcType=DECIMAL},
      </if>
      <if test="presetpricetwo != null">
-        PresetPriceTwo = #{presetpricetwo,jdbcType=DOUBLE},
+        PresetPriceTwo = #{presetpricetwo,jdbcType=DECIMAL},
      </if>
      <if test="unitid != null">
        UnitId = #{unitid,jdbcType=BIGINT},
@@ -531,17 +531,17 @@
    set CategoryId = #{categoryid,jdbcType=BIGINT},
      Name = #{name,jdbcType=VARCHAR},
      Mfrs = #{mfrs,jdbcType=VARCHAR},
-      Packing = #{packing,jdbcType=DOUBLE},
-      SafetyStock = #{safetystock,jdbcType=DOUBLE},
+      Packing = #{packing,jdbcType=DECIMAL},
+      SafetyStock = #{safetystock,jdbcType=DECIMAL},
      Model = #{model,jdbcType=VARCHAR},
      Standard = #{standard,jdbcType=VARCHAR},
      Color = #{color,jdbcType=VARCHAR},
      Unit = #{unit,jdbcType=VARCHAR},
      Remark = #{remark,jdbcType=VARCHAR},
-      RetailPrice = #{retailprice,jdbcType=DOUBLE},
-      LowPrice = #{lowprice,jdbcType=DOUBLE},
-      PresetPriceOne = #{presetpriceone,jdbcType=DOUBLE},
-      PresetPriceTwo = #{presetpricetwo,jdbcType=DOUBLE},
+      RetailPrice = #{retailprice,jdbcType=DECIMAL},
+      LowPrice = #{lowprice,jdbcType=DECIMAL},
+      PresetPriceOne = #{presetpriceone,jdbcType=DECIMAL},
+      PresetPriceTwo = #{presetpricetwo,jdbcType=DECIMAL},
      UnitId = #{unitid,jdbcType=BIGINT},
      FirstOutUnit = #{firstoutunit,jdbcType=VARCHAR},
      FirstInUnit = #{firstinunit,jdbcType=VARCHAR},

--- a/src/main/resources/mapper_xml/SupplierMapper.xml
+++ b/src/main/resources/mapper_xml/SupplierMapper.xml
@@ -15,18 +15,18 @@
    <result column="isystem" jdbcType="TINYINT" property="isystem" />
    <result column="type" jdbcType="VARCHAR" property="type" />
    <result column="enabled" jdbcType="BIT" property="enabled" />
-    <result column="AdvanceIn" jdbcType="DOUBLE" property="advancein" />
-    <result column="BeginNeedGet" jdbcType="DOUBLE" property="beginneedget" />
-    <result column="BeginNeedPay" jdbcType="DOUBLE" property="beginneedpay" />
-    <result column="AllNeedGet" jdbcType="DOUBLE" property="allneedget" />
-    <result column="AllNeedPay" jdbcType="DOUBLE" property="allneedpay" />
+    <result column="AdvanceIn" jdbcType="DECIMAL" property="advancein" />
+    <result column="BeginNeedGet" jdbcType="DECIMAL" property="beginneedget" />
+    <result column="BeginNeedPay" jdbcType="DECIMAL" property="beginneedpay" />
+    <result column="AllNeedGet" jdbcType="DECIMAL" property="allneedget" />
+    <result column="AllNeedPay" jdbcType="DECIMAL" property="allneedpay" />
    <result column="fax" jdbcType="VARCHAR" property="fax" />
    <result column="telephone" jdbcType="VARCHAR" property="telephone" />
    <result column="address" jdbcType="VARCHAR" property="address" />
    <result column="taxNum" jdbcType="VARCHAR" property="taxnum" />
    <result column="bankName" jdbcType="VARCHAR" property="bankname" />
    <result column="accountNumber" jdbcType="VARCHAR" property="accountnumber" />
-    <result column="taxRate" jdbcType="DOUBLE" property="taxrate" />
+    <result column="taxRate" jdbcType="DECIMAL" property="taxrate" />
  </resultMap>
  <sql id="Example_Where_Clause">
    <!--
@@ -165,10 +165,10 @@
    values (#{id,jdbcType=BIGINT}, #{supplier,jdbcType=VARCHAR}, #{contacts,jdbcType=VARCHAR}, 
      #{phonenum,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, 
      #{isystem,jdbcType=TINYINT}, #{type,jdbcType=VARCHAR}, #{enabled,jdbcType=BIT}, 
-      #{advancein,jdbcType=DOUBLE}, #{beginneedget,jdbcType=DOUBLE}, #{beginneedpay,jdbcType=DOUBLE}, 
-      #{allneedget,jdbcType=DOUBLE}, #{allneedpay,jdbcType=DOUBLE}, #{fax,jdbcType=VARCHAR}, 
+      #{advancein,jdbcType=DECIMAL}, #{beginneedget,jdbcType=DECIMAL}, #{beginneedpay,jdbcType=DECIMAL}, 
+      #{allneedget,jdbcType=DECIMAL}, #{allneedpay,jdbcType=DECIMAL}, #{fax,jdbcType=VARCHAR}, 
      #{telephone,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, #{taxnum,jdbcType=VARCHAR}, 
-      #{bankname,jdbcType=VARCHAR}, #{accountnumber,jdbcType=VARCHAR}, #{taxrate,jdbcType=DOUBLE}
+      #{bankname,jdbcType=VARCHAR}, #{accountnumber,jdbcType=VARCHAR}, #{taxrate,jdbcType=DECIMAL}
      )
  </insert>
  <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Supplier">
@@ -271,19 +271,19 @@
        #{enabled,jdbcType=BIT},
      </if>
      <if test="advancein != null">
-        #{advancein,jdbcType=DOUBLE},
+        #{advancein,jdbcType=DECIMAL},
      </if>
      <if test="beginneedget != null">
-        #{beginneedget,jdbcType=DOUBLE},
+        #{beginneedget,jdbcType=DECIMAL},
      </if>
      <if test="beginneedpay != null">
-        #{beginneedpay,jdbcType=DOUBLE},
+        #{beginneedpay,jdbcType=DECIMAL},
      </if>
      <if test="allneedget != null">
-        #{allneedget,jdbcType=DOUBLE},
+        #{allneedget,jdbcType=DECIMAL},
      </if>
      <if test="allneedpay != null">
-        #{allneedpay,jdbcType=DOUBLE},
+        #{allneedpay,jdbcType=DECIMAL},
      </if>
      <if test="fax != null">
        #{fax,jdbcType=VARCHAR},
@@ -304,7 +304,7 @@
        #{accountnumber,jdbcType=VARCHAR},
      </if>
      <if test="taxrate != null">
-        #{taxrate,jdbcType=DOUBLE},
+        #{taxrate,jdbcType=DECIMAL},
      </if>
    </trim>
  </insert>
@@ -353,19 +353,19 @@
        enabled = #{record.enabled,jdbcType=BIT},
      </if>
      <if test="record.advancein != null">
-        AdvanceIn = #{record.advancein,jdbcType=DOUBLE},
+        AdvanceIn = #{record.advancein,jdbcType=DECIMAL},
      </if>
      <if test="record.beginneedget != null">
-        BeginNeedGet = #{record.beginneedget,jdbcType=DOUBLE},
+        BeginNeedGet = #{record.beginneedget,jdbcType=DECIMAL},
      </if>
      <if test="record.beginneedpay != null">
-        BeginNeedPay = #{record.beginneedpay,jdbcType=DOUBLE},
+        BeginNeedPay = #{record.beginneedpay,jdbcType=DECIMAL},
      </if>
      <if test="record.allneedget != null">
-        AllNeedGet = #{record.allneedget,jdbcType=DOUBLE},
+        AllNeedGet = #{record.allneedget,jdbcType=DECIMAL},
      </if>
      <if test="record.allneedpay != null">
-        AllNeedPay = #{record.allneedpay,jdbcType=DOUBLE},
+        AllNeedPay = #{record.allneedpay,jdbcType=DECIMAL},
      </if>
      <if test="record.fax != null">
        fax = #{record.fax,jdbcType=VARCHAR},
@@ -386,7 +386,7 @@
        accountNumber = #{record.accountnumber,jdbcType=VARCHAR},
      </if>
      <if test="record.taxrate != null">
-        taxRate = #{record.taxrate,jdbcType=DOUBLE},
+        taxRate = #{record.taxrate,jdbcType=DECIMAL},
      </if>
    </set>
    <if test="_parameter != null">
@@ -408,18 +408,18 @@
      isystem = #{record.isystem,jdbcType=TINYINT},
      type = #{record.type,jdbcType=VARCHAR},
      enabled = #{record.enabled,jdbcType=BIT},
-      AdvanceIn = #{record.advancein,jdbcType=DOUBLE},
-      BeginNeedGet = #{record.beginneedget,jdbcType=DOUBLE},
-      BeginNeedPay = #{record.beginneedpay,jdbcType=DOUBLE},
-      AllNeedGet = #{record.allneedget,jdbcType=DOUBLE},
-      AllNeedPay = #{record.allneedpay,jdbcType=DOUBLE},
+      AdvanceIn = #{record.advancein,jdbcType=DECIMAL},
+      BeginNeedGet = #{record.beginneedget,jdbcType=DECIMAL},
+      BeginNeedPay = #{record.beginneedpay,jdbcType=DECIMAL},
+      AllNeedGet = #{record.allneedget,jdbcType=DECIMAL},
+      AllNeedPay = #{record.allneedpay,jdbcType=DECIMAL},
      fax = #{record.fax,jdbcType=VARCHAR},
      telephone = #{record.telephone,jdbcType=VARCHAR},
      address = #{record.address,jdbcType=VARCHAR},
      taxNum = #{record.taxnum,jdbcType=VARCHAR},
      bankName = #{record.bankname,jdbcType=VARCHAR},
      accountNumber = #{record.accountnumber,jdbcType=VARCHAR},
-      taxRate = #{record.taxrate,jdbcType=DOUBLE}
+      taxRate = #{record.taxrate,jdbcType=DECIMAL}
    <if test="_parameter != null">
      <include refid="Update_By_Example_Where_Clause" />
    </if>
@@ -456,19 +456,19 @@
        enabled = #{enabled,jdbcType=BIT},
      </if>
      <if test="advancein != null">
-        AdvanceIn = #{advancein,jdbcType=DOUBLE},
+        AdvanceIn = #{advancein,jdbcType=DECIMAL},
      </if>
      <if test="beginneedget != null">
-        BeginNeedGet = #{beginneedget,jdbcType=DOUBLE},
+        BeginNeedGet = #{beginneedget,jdbcType=DECIMAL},
      </if>
      <if test="beginneedpay != null">
-        BeginNeedPay = #{beginneedpay,jdbcType=DOUBLE},
+        BeginNeedPay = #{beginneedpay,jdbcType=DECIMAL},
      </if>
      <if test="allneedget != null">
-        AllNeedGet = #{allneedget,jdbcType=DOUBLE},
+        AllNeedGet = #{allneedget,jdbcType=DECIMAL},
      </if>
      <if test="allneedpay != null">
-        AllNeedPay = #{allneedpay,jdbcType=DOUBLE},
+        AllNeedPay = #{allneedpay,jdbcType=DECIMAL},
      </if>
      <if test="fax != null">
        fax = #{fax,jdbcType=VARCHAR},
@@ -489,7 +489,7 @@
        accountNumber = #{accountnumber,jdbcType=VARCHAR},
      </if>
      <if test="taxrate != null">
-        taxRate = #{taxrate,jdbcType=DOUBLE},
+        taxRate = #{taxrate,jdbcType=DECIMAL},
      </if>
    </set>
    where id = #{id,jdbcType=BIGINT}
@@ -508,18 +508,18 @@
      isystem = #{isystem,jdbcType=TINYINT},
      type = #{type,jdbcType=VARCHAR},
      enabled = #{enabled,jdbcType=BIT},
-      AdvanceIn = #{advancein,jdbcType=DOUBLE},
-      BeginNeedGet = #{beginneedget,jdbcType=DOUBLE},
-      BeginNeedPay = #{beginneedpay,jdbcType=DOUBLE},
-      AllNeedGet = #{allneedget,jdbcType=DOUBLE},
-      AllNeedPay = #{allneedpay,jdbcType=DOUBLE},
+      AdvanceIn = #{advancein,jdbcType=DECIMAL},
+      BeginNeedGet = #{beginneedget,jdbcType=DECIMAL},
+      BeginNeedPay = #{beginneedpay,jdbcType=DECIMAL},
+      AllNeedGet = #{allneedget,jdbcType=DECIMAL},
+      AllNeedPay = #{allneedpay,jdbcType=DECIMAL},
      fax = #{fax,jdbcType=VARCHAR},
      telephone = #{telephone,jdbcType=VARCHAR},
      address = #{address,jdbcType=VARCHAR},
      taxNum = #{taxnum,jdbcType=VARCHAR},
      bankName = #{bankname,jdbcType=VARCHAR},
      accountNumber = #{accountnumber,jdbcType=VARCHAR},
-      taxRate = #{taxrate,jdbcType=DOUBLE}
+      taxRate = #{taxrate,jdbcType=DECIMAL}
    where id = #{id,jdbcType=BIGINT}
  </update>
 </mapper>
\ No newline at end of file