Browse Source

销售订单增加不含税金额字段

guq 7 years ago
parent
commit
1648a1a749

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

@@ -63,4 +63,6 @@ public class SaleDTO extends CommonBaseDTO{
     private Integer sa_sellerid;
 
     private String sa_currency;
+
+    private Double sa_nettotal;
 }

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

@@ -62,4 +62,6 @@ public class Sale extends CommonBaseEntity{
     private Integer sa_sellerid;
 
     private String sa_currency;
+
+    private Double sa_nettotal;
 }

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

@@ -69,6 +69,8 @@ public class SaleList implements Serializable {
 
     private Integer sa_sellerid;
 
+    private Double sa_nettotal;
+
     private Integer sd_id;
 
     private Integer sd_said;

+ 1 - 0
applications/sale/sale-server/src/main/resources/mapper/SaleListMapper.xml

@@ -9,6 +9,7 @@
         <result column="sa_custname" property="sa_custname" jdbcType="VARCHAR" />
         <result column="sa_toplace" property="sa_toplace" jdbcType="VARCHAR" />
         <result column="sa_total" property="sa_total" jdbcType="DOUBLE" />
+        <result column="sa_nettotal" property="sa_nettotal" jdbcType="DOUBLE" />
         <result column="sa_totalupper" property="sa_totalupper" jdbcType="VARCHAR" />
         <result column="sa_remark" property="sa_remark" jdbcType="VARCHAR" />
         <result column="sa_status" property="sa_status" jdbcType="VARCHAR" />

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

@@ -35,6 +35,7 @@
     <result column="createTime" property="createTime" jdbcType="TIMESTAMP"/>
     <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" />
   </resultMap>
   <sql id="Base_Column_List" >
     sa_id, sa_code, sa_custid, sa_custcode, sa_custname, sa_toplace, sa_total, sa_totalupper, 
@@ -155,6 +156,9 @@
       <if test="sa_currency != null">
         sa_currency,
       </if>
+      <if test="sa_nettotal != null">
+        sa_nettotal,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="sa_code != null" >
@@ -238,6 +242,9 @@
       <if test="sa_currency != null" >
         #{sa_currency,jdbcType=VARCHAR},
       </if>
+      <if test="sa_nettotal != null" >
+        #{sa_nettotal,jdbcType=DOUBLE},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.sale.po.Sale" >
@@ -330,6 +337,9 @@
       <if test="sa_currency != null" >
         sa_currency = #{sa_currency,jdbcType=VARCHAR},
       </if>
+      <if test="sa_nettotal != null" >
+        sa_nettotal = #{sa_nettotal,jdbcType=DOUBLE},
+      </if>
     </set>
     where sa_id = #{id,jdbcType=INTEGER}
   </update>