Browse Source

采购木块增加币别汇率

chenw 7 years ago
parent
commit
3d06273381

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

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

+ 2 - 0
applications/purchase/purchase-dto/src/main/java/com/usoftchina/saas/purchase/dto/PurchaseDTO.java

@@ -74,4 +74,6 @@ public class PurchaseDTO extends CommonBaseDTO implements Serializable{
     private String pu_sacode;
     private String pu_sacode;
 
 
     private String pu_currency;
     private String pu_currency;
+
+    private Double pu_rate;
 }
 }

+ 2 - 0
applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/po/ProdInOut.java

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

+ 2 - 0
applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/po/Purchase.java

@@ -68,4 +68,6 @@ public class Purchase extends CommonBaseEntity implements Serializable {
     private String pu_sacode;
     private String pu_sacode;
 
 
     private String pu_currency;
     private String pu_currency;
+
+    private Double pu_rate;
 }
 }

+ 11 - 1
applications/purchase/purchase-server/src/main/resources/mapper/ProdInOutMapper.xml

@@ -41,6 +41,7 @@
     <result column="pi_prstatus" jdbcType="VARCHAR" property="pi_prstatus" />
     <result column="pi_prstatus" jdbcType="VARCHAR" property="pi_prstatus" />
     <result column="pi_prstatuscode" jdbcType="VARCHAR" property="pi_prstatuscode" />
     <result column="pi_prstatuscode" jdbcType="VARCHAR" property="pi_prstatuscode" />
     <result column="pi_currency" jdbcType="VARCHAR" property="pi_currency" />
     <result column="pi_currency" jdbcType="VARCHAR" property="pi_currency" />
+    <result column="pi_rate" jdbcType="DOUBLE" property="pi_rate" />
     <result column="pi_buyerid" jdbcType="INTEGER" property="pi_buyerid" />
     <result column="pi_buyerid" jdbcType="INTEGER" property="pi_buyerid" />
     <result column="pi_buyercode" jdbcType="VARCHAR" property="pi_buyercode" />
     <result column="pi_buyercode" jdbcType="VARCHAR" property="pi_buyercode" />
     <result column="pi_buyername" jdbcType="VARCHAR" property="pi_buyername" />
     <result column="pi_buyername" jdbcType="VARCHAR" property="pi_buyername" />
@@ -59,7 +60,7 @@
     pi_id, pi_inoutno, pi_class, pi_date, pi_vendid, pi_vendcode, pi_vendname, pi_custid, 
     pi_id, pi_inoutno, pi_class, pi_date, pi_vendid, pi_vendcode, pi_vendname, pi_custid, 
     pi_custcode, pi_custname, pi_puid, pi_pucode, pi_said, pi_sacode, pi_total, pi_status, pi_statuscode, pi_printstatus, pi_printstatuscode,
     pi_custcode, pi_custname, pi_puid, pi_pucode, pi_said, pi_sacode, pi_total, pi_status, pi_statuscode, pi_printstatus, pi_printstatuscode,
     companyid, updaterid,updaterName,updatetime,creatorid,creatorName,createtime, pi_text1, pi_text2, pi_text3, pi_text4, pi_text5,pi_auditdate,
     companyid, updaterid,updaterName,updatetime,creatorid,creatorName,createtime, pi_text1, pi_text2, pi_text3, pi_text4, pi_text5,pi_auditdate,
-    pi_auditman,pi_remark,pi_ioid,pi_iocode,pi_prstatus,pi_prstatuscode,pi_currency,pi_buyerid,pi_buyercode,pi_buyername,pi_sellerid,pi_sellercode,pi_seller,pi_nettotal
+    pi_auditman,pi_remark,pi_ioid,pi_iocode,pi_prstatus,pi_prstatuscode,pi_currency,pi_buyerid,pi_buyercode,pi_buyername,pi_sellerid,pi_sellercode,pi_seller,pi_nettotal,pi_rate
   </sql>
   </sql>
   <sql id="Blob_Column_List">
   <sql id="Blob_Column_List">
     pi_address
     pi_address
@@ -212,6 +213,9 @@
       <if test="pi_buyername != null">
       <if test="pi_buyername != null">
         pi_buyername,
         pi_buyername,
       </if>
       </if>
+      <if test="pi_rate != null">
+        pi_rate,
+      </if>
     </trim>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
     <trim prefix="values (" suffix=")" suffixOverrides=",">
 
 
@@ -343,6 +347,9 @@
       <if test="pi_buyername != null">
       <if test="pi_buyername != null">
         #{pi_buyername,jdbcType=VARCHAR},
         #{pi_buyername,jdbcType=VARCHAR},
       </if>
       </if>
+      <if test="pi_rate != null">
+        #{pi_rate,jdbcType=VARCHAR},
+      </if>
     </trim>
     </trim>
   </insert>
   </insert>
 
 
@@ -451,6 +458,9 @@
       <if test="pi_buyername != null">
       <if test="pi_buyername != null">
         pi_buyername = #{pi_buyername,jdbcType=VARCHAR},
         pi_buyername = #{pi_buyername,jdbcType=VARCHAR},
       </if>
       </if>
+      <if test="pi_rate != null">
+        pi_rate = #{pi_rate,jdbcType=VARCHAR},
+      </if>
     </set>
     </set>
     where pi_id = #{id,jdbcType=INTEGER}
     where pi_id = #{id,jdbcType=INTEGER}
   </update>
   </update>

+ 11 - 1
applications/purchase/purchase-server/src/main/resources/mapper/PurchaseMapper.xml

@@ -37,6 +37,7 @@
     <result column="pu_text4" property="pu_text4" jdbcType="VARCHAR" />
     <result column="pu_text4" property="pu_text4" jdbcType="VARCHAR" />
     <result column="pu_text5" property="pu_text5" jdbcType="VARCHAR" />
     <result column="pu_text5" property="pu_text5" jdbcType="VARCHAR" />
     <result column="pu_currency" property="pu_currency" jdbcType="VARCHAR" />
     <result column="pu_currency" property="pu_currency" jdbcType="VARCHAR" />
+    <result column="pu_rate" property="pu_rate" jdbcType="DOUBLE" />
   </resultMap>
   </resultMap>
  <resultMap id="ResultMapWithBLOBs" type="com.usoftchina.saas.purchase.po.Purchase" extends="BaseResultMap" >
  <resultMap id="ResultMapWithBLOBs" type="com.usoftchina.saas.purchase.po.Purchase" extends="BaseResultMap" >
     <result column="PU_SHIPADDRESSCODE" property="pu_shipaddresscode" jdbcType="LONGVARCHAR" />
     <result column="PU_SHIPADDRESSCODE" property="pu_shipaddresscode" jdbcType="LONGVARCHAR" />
@@ -47,7 +48,7 @@
     PU_BUYERNAME, PU_DELIVERY, PU_TAXTOTAL, PU_TOTAL, PU_REMARK, PU_TOTALUPPER,
     PU_BUYERNAME, PU_DELIVERY, PU_TAXTOTAL, PU_TOTAL, PU_REMARK, PU_TOTALUPPER,
     PU_PRINTSTATUS, PU_PRINTSTATUSCODE, PU_ACCEPTSTATUSCODE, PU_ACCEPTSTATUS, PU_STATUSCODE, 
     PU_PRINTSTATUS, PU_PRINTSTATUSCODE, PU_ACCEPTSTATUSCODE, PU_ACCEPTSTATUS, PU_STATUSCODE, 
     PU_STATUS, companyid, updaterId,updaterName,updateTime,creatorid,creatorName,createtime, pu_text1, pu_text2, pu_text3, pu_text4,
     PU_STATUS, companyid, updaterId,updaterName,updateTime,creatorid,creatorName,createtime, pu_text1, pu_text2, pu_text3, pu_text4,
-    pu_text5,pu_auditman,pu_auditdate,pu_currency
+    pu_text5,pu_auditman,pu_auditdate,pu_currency,pu_rate
   </sql>
   </sql>
   <sql id="Blob_Column_List" >
   <sql id="Blob_Column_List" >
     PU_SHIPADDRESSCODE
     PU_SHIPADDRESSCODE
@@ -170,6 +171,9 @@
       <if test="pu_currency != null" >
       <if test="pu_currency != null" >
       pu_currency,
       pu_currency,
       </if>
       </if>
+      <if test="pu_rate != null" >
+          pu_rate,
+      </if>
     </trim>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="pu_code != null" >
       <if test="pu_code != null" >
@@ -271,6 +275,9 @@
       <if test="pu_currency != null" >
       <if test="pu_currency != null" >
         #{pu_currency,jdbcType=VARCHAR},
         #{pu_currency,jdbcType=VARCHAR},
       </if>
       </if>
+      <if test="pu_rate != null" >
+          #{pu_rate,jdbcType=DOUBLE},
+      </if>
     </trim>
     </trim>
   </insert>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.purchase.po.Purchase" >
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.purchase.po.Purchase" >
@@ -372,6 +379,9 @@
       <if test="pu_currency != null" >
       <if test="pu_currency != null" >
         pu_currency = #{pu_currency,jdbcType=VARCHAR},
         pu_currency = #{pu_currency,jdbcType=VARCHAR},
       </if>
       </if>
+      <if test="pu_rate != null" >
+        pu_rate = #{pu_rate,jdbcType=DOUBLE},
+      </if>
     </set>
     </set>
     where pu_id = #{id,jdbcType=INTEGER}
     where pu_id = #{id,jdbcType=INTEGER}
   </update>
   </update>