Browse Source

供应商、客户、资金账户增加币别

chenw 7 years ago
parent
commit
f305f036db

+ 2 - 0
applications/document/document-dto/src/main/java/com.usoftchina.saas.document.dto/CustomerDTO.java

@@ -61,4 +61,6 @@ public class CustomerDTO extends CommonBaseDTO implements Serializable {
     private Double cu_preamount;
 
     private String cu_remark;
+
+    private String cu_currency;
 }

+ 11 - 0
applications/document/document-dto/src/main/java/com/usoftchina/saas/document/entities/Bankinformation.java

@@ -38,8 +38,19 @@ public class Bankinformation extends CommonBaseEntity implements Serializable {
     private String bk_remark;
 
     private Double bk_income;
+
     private Double bk_spending;
 
+    private String bk_currency;
+
+    public String getBk_currency() {
+        return bk_currency;
+    }
+
+    public void setBk_currency(String bk_currency) {
+        this.bk_currency = bk_currency;
+    }
+
     public Double getBk_income() {
         return bk_income;
     }

+ 2 - 0
applications/document/document-dto/src/main/java/com/usoftchina/saas/document/entities/Customer.java

@@ -57,4 +57,6 @@ public class Customer extends CommonBaseEntity implements Serializable {
     private Double cu_preamount;
 
     private String cu_remark;
+
+    private String cu_currency;
 }

+ 2 - 0
applications/document/document-dto/src/main/java/com/usoftchina/saas/document/entities/Vendor.java

@@ -115,4 +115,6 @@ public class Vendor extends CommonBaseEntity implements Serializable{
 
     private String ve_address;
 
+    private String ve_currency;
+
 }

+ 2 - 0
applications/document/document-dto/src/main/java/com/usoftchina/saas/document/entities/VendorList.java

@@ -132,4 +132,6 @@ public class VendorList implements Serializable {
 
     private String vc_default;
 
+    private String ve_currency;
+
 }

+ 11 - 1
applications/document/document-server/src/main/resources/mapper/BankinformationMapper.xml

@@ -23,6 +23,7 @@
     <result column="bk_remark" property="bk_remark" jdbcType="VARCHAR" />
     <result column="bk_spending" property="bk_spending" jdbcType="DOUBLE" />
     <result column="bk_income" property="bk_income" jdbcType="DOUBLE" />
+    <result column="bk_currency" property="bk_currency" jdbcType="VARCHAR" />
   </resultMap>
   <resultMap id="ResultMapWithBLOBs" type="com.usoftchina.saas.document.entities.Bankinformation" extends="BaseResultMap" >
     <result column="bk_remark" property="bk_remark" jdbcType="LONGVARCHAR" />
@@ -30,7 +31,7 @@
   <sql id="Base_Column_List" >
     bk_id, bk_bankcode, bk_bankname, bk_date, bk_type, bk_beginamount, bk_thisamount, 
     bk_status, bk_statuscode, bk_ym, companyid,
-    updaterId, updateTime, bk_text1, bk_text2, bk_text3, bk_text4, bk_text5, bk_remark
+    updaterId, updateTime, bk_text1, bk_text2, bk_text3, bk_text4, bk_text5, bk_remark,bk_currency
   </sql>
   <sql id="Blob_Column_List" >
     bk_remark
@@ -137,6 +138,9 @@
       <if test="creatorName != null" >
         creatorName,
       </if>
+      <if test="bk_currency != null" >
+        bk_currency,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="bk_bankcode != null" >
@@ -208,6 +212,9 @@
       <if test="creatorName != null" >
         #{creatorName,jdbcType=VARCHAR},
       </if>
+      <if test="bk_currency != null" >
+        #{bk_currency,jdbcType=VARCHAR},
+      </if>
     </trim>
     <selectKey resultType="Long" keyProperty="id" order="AFTER">
       SELECT LAST_INSERT_ID()
@@ -276,6 +283,9 @@
       <if test="bk_spending != null" >
         bk_spending = #{bk_spending,jdbcType=DOUBLE},
       </if>
+      <if test="bk_currency != null" >
+        bk_currency = #{bk_currency,jdbcType=VARCHAR},
+      </if>
     </set>
     where bk_id = #{id,jdbcType=INTEGER}
   </update>

+ 11 - 1
applications/document/document-server/src/main/resources/mapper/CustomerMapper.xml

@@ -31,13 +31,14 @@
     <result column="cu_recamount" jdbcType="DOUBLE" property="cu_recamount" />
     <result column="cu_preamount" jdbcType="DOUBLE" property="cu_preamount" />
     <result column="cu_remark" jdbcType="VARCHAR" property="cu_remark" />
+    <result column="cu_currency" jdbcType="VARCHAR" property="cu_currency" />
   </resultMap>
   <sql id="Base_Column_List">
     cu_id, cu_code,cu_shortname, cu_name, cu_uu, cu_type, cu_begindate, cu_beginaramount, cu_beginprerecamount,
     cu_promisedays, cu_taxrate, cu_sellerid, cu_sellercode, cu_sellername, cu_credit, 
     cu_status, cu_statuscode, companyid,
     updaterid, updatetime, cu_text1, cu_text2, cu_text3, cu_text4, cu_text5, cu_leftamount, 
-    cu_recamount,cu_preamount,cu_remark
+    cu_recamount,cu_preamount,cu_remark,cu_currency
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     select
@@ -149,6 +150,9 @@
       <if test="cu_remark!=null">
         cu_remark,
       </if>
+      <if test="cu_currency!=null">
+        cu_currency,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
 
@@ -245,6 +249,9 @@
       <if test="cu_remark !=null">
         #{cu_remark,jdbcType=VARCHAR},
       </if>
+      <if test="cu_currency !=null">
+        #{cu_currency,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.document.entities.Customer">
@@ -334,6 +341,9 @@
       <if test="cu_remark != null">
         cu_remark = #{cu_remark,jdbcType=VARCHAR},
       </if>
+      <if test="cu_currency != null">
+        cu_currency = #{cu_currency,jdbcType=VARCHAR},
+      </if>
     </set>
     where cu_id = #{id,jdbcType=INTEGER}
   </update>

+ 15 - 4
applications/document/document-server/src/main/resources/mapper/VendorMapper.xml

@@ -32,6 +32,7 @@
         <result column="ve_preamount" property="ve_preamount" jdbcType="DOUBLE" />
         <result column="ve_remark" property="ve_remark" jdbcType="VARCHAR" />
         <result column="ve_address" property="ve_address" jdbcType="VARCHAR" />
+        <result column="ve_currency" property="ve_currency" jdbcType="VARCHAR" />
     </resultMap>
     <resultMap id="VendorDTOResultMapper" type="com.usoftchina.saas.document.dto.VendorDTO">
         <id column="ve_id" property="id" jdbcType="INTEGER" />
@@ -97,6 +98,7 @@
         <result column="vc_text4" property="vc_text4" jdbcType="VARCHAR" />
         <result column="vc_text5" property="vc_text5" jdbcType="VARCHAR" />
         <result column="vc_default" property="vc_default" jdbcType="VARCHAR" />
+        <result column="ve_currency" property="ve_currency" jdbcType="VARCHAR" />
     </resultMap>
 
     <select id="getListDataByCondition" resultMap="VendorListResultMapper">
@@ -115,7 +117,7 @@
         ve_promisedays, ve_taxrate, ve_nsrzh, ve_bankaccount, ve_bankcode, ve_status, ve_statuscode,
         companyId, updaterId, updateTime, ve_text1,
         ve_text2, ve_text3, ve_text4, ve_text5, ve_payamount, ve_leftamount, ve_beginym, ve_preamount,ve_remark,
-        ve_buyerid,ve_buyercode,ve_buyername,ve_address
+        ve_buyerid,ve_buyercode,ve_buyername,ve_address,ve_currency
     </sql>
     <select id="selectByPrimaryKey" resultMap="VendorResultMapper" parameterType="java.lang.Long" >
         select
@@ -236,7 +238,10 @@
                 ve_buyername,
             </if>
             <if test="ve_address!=null">
-                ve_address
+                ve_address,
+            </if>
+            <if test="ve_currency!=null">
+              ve_currency,
             </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides="," >
@@ -343,7 +348,10 @@
                 #{ve_buyername,jdbcType=VARCHAR},
             </if>
             <if test="ve_address != null">
-                #{ve_address,jdbcType=VARCHAR}
+                #{ve_address,jdbcType=VARCHAR},
+            </if>
+            <if test="ve_currency != null">
+              #{ve_currency,jdbcType=VARCHAR},
             </if>
         </trim>
     </insert>
@@ -444,7 +452,10 @@
                 ve_buyername = #{ve_buyername,jdbcType=VARCHAR},
             </if>
             <if test="ve_address != null">
-                ve_address = #{ve_address,jdbcType=VARCHAR}
+                ve_address = #{ve_address,jdbcType=VARCHAR},
+            </if>
+            <if test="ve_currency != null">
+              ve_currency = #{ve_currency,jdbcType=VARCHAR},
             </if>
         </set>
         where ve_id = #{id}