Browse Source

销售增加币别汇率

chenw 7 years ago
parent
commit
df9523be5a

+ 2 - 0
applications/sale/sale-dto/src/main/java/com/usoftchina/saas/sale/dto/ProdInOutDTO.java

@@ -86,4 +86,6 @@ public class ProdInOutDTO extends CommonBaseDTO implements Serializable {
     private String pi_seller;
 
     private Double pi_nettotal;
+
+    private Double pi_rate;
 }

+ 2 - 0
applications/sale/sale-dto/src/main/java/com/usoftchina/saas/sale/dto/SaleDTO.java

@@ -67,4 +67,6 @@ public class SaleDTO extends CommonBaseDTO{
     private Double sa_nettotal;
 
     private Date sa_delivery;
+
+    private Double sa_rate;
 }

+ 2 - 0
applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/po/Sale.java

@@ -66,4 +66,6 @@ public class Sale extends CommonBaseEntity{
     private Double sa_nettotal;
 
     private Date sa_delivery;
+
+    private Double sa_rate;
 }

+ 10 - 0
applications/sale/sale-server/src/main/resources/mapper/ProdInOutMapper.xml

@@ -42,6 +42,7 @@
     <result column="pi_sellercode" jdbcType="VARCHAR" property="pi_sellercode" />
     <result column="pi_seller" jdbcType="VARCHAR" property="pi_seller" />
     <result column="pi_nettotal"  jdbcType="DOUBLE" property="pi_nettotal"/>
+    <result column="pi_rate"  jdbcType="DOUBLE" property="pi_rate"/>
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.usoftchina.saas.storage.po.ProdInOut">
     <result column="pi_address" jdbcType="LONGVARCHAR" property="pi_address" />
@@ -260,6 +261,9 @@
       <if test="pi_seller != null">
         pi_seller,
       </if>
+      <if test="pi_rate != null">
+        pi_rate,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
 
@@ -371,6 +375,9 @@
       <if test="pi_seller != null">
         pi_seller = #{pi_seller,jdbcType=VARCHAR},
       </if>
+      <if test="pi_rate != null">
+        pi_rate = #{pi_rate,jdbcType=DOUBLE},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.storage.po.ProdInOut">
@@ -478,6 +485,9 @@
       <if test="pi_seller!=null">
         pi_seller = #{pi_seller,jdbcType=VARCHAR},
       </if>
+      <if test="pi_rate!=null">
+        pi_rate = #{pi_rate,jdbcType=DOUBLE},
+      </if>
     </set>
     where pi_id = #{id,jdbcType=INTEGER}
   </update>

+ 12 - 2
applications/sale/sale-server/src/main/resources/mapper/SaleMapper.xml

@@ -36,13 +36,14 @@
     <result column="sa_sellerid" property="sa_sellerid" jdbcType="INTEGER" />
     <result column="sa_currency" property="sa_currency" jdbcType="VARCHAR" />
     <result column="sa_nettotal" property="sa_nettotal" jdbcType="DOUBLE" />
+    <result column="sa_rate" property="sa_rate" jdbcType="DOUBLE" />
   </resultMap>
   <sql id="Base_Column_List" >
     sa_id, sa_code, sa_custid, sa_custcode, sa_custname, sa_toplace, sa_total, sa_totalupper, 
     sa_remark, sa_status, sa_statuscode, sa_sendstatuscode, sa_sendstatus, sa_printstatus, 
-    sa_printstatuscode,companyId, updaterId,
+    sa_printstatuscode,companyId, updaterId,sa_currency
     updateTime, sa_text1, sa_text2, sa_text3, sa_text4, sa_text5,sa_auditman,sa_auditdate,
-    sa_seller,sa_sellercode,sa_date,sa_sellerid
+    sa_seller,sa_sellercode,sa_date,sa_sellerid,sa_rate
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" >
     select * from sale where sa_id = #{id}
@@ -162,6 +163,9 @@
       <if test="sa_delivery != null">
         sa_delivery,
       </if>
+      <if test="sa_rate != null">
+        sa_rate,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="sa_code != null" >
@@ -251,6 +255,9 @@
       <if test="sa_delivery != null" >
         #{sa_delivery,jdbcType=TIMESTAMP},
       </if>
+      <if test="sa_rate != null" >
+        #{sa_rate,jdbcType=DOUBLE},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.sale.po.Sale" >
@@ -349,6 +356,9 @@
       <if test="sa_delivery!=null">
         sa_delivery = #{sa_delivery,jdbcType=TIMESTAMP},
       </if>
+      <if test="sa_rate!=null">
+        sa_rate = #{sa_rate,jdbcType=DOUBLE},
+      </if>
     </set>
     where sa_id = #{id,jdbcType=INTEGER}
   </update>

+ 2 - 0
applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/po/ProdInOut.java

@@ -86,4 +86,6 @@ public class ProdInOut extends CommonBaseEntity implements Serializable {
     private String pi_seller;
 
     private Double pi_costtotal;
+
+    private Double pi_rate;
 }