销售含税金额字段修改

applications/sale/sale-dto/src/main/java/com/usoftchina/saas/sale/dto/ProdIODetailDTO.java

@@ -88,6 +88,8 @@ public class ProdIODetailDTO implements Serializable {
 
     private Long pd_ioid;
 
+    private Double pd_ordertotal;
+
     private ProductDTO productDTO;
 
 }

applications/sale/sale-server/src/main/resources/mapper/ProdIODetailMapper.xml

@@ -41,6 +41,7 @@
     <result column="pd_ym" jdbcType="INTEGER" property="pd_ym" />
     <result column="pd_yqty" jdbcType="INTEGER" property="pd_yqty" />
     <result column="pd_ioid" jdbcType="INTEGER" property="pd_ioid" />
+    <result column="pd_ordertotal" jdbcType="DOUBLE" property="pd_ordertotal" />
     <association property="productDTO" javaType="com.usoftchina.saas.document.dto.ProductDTO">
       <id column="pr_id" property="id"/>
       <result column="pr_code" property="pr_code"/>
@@ -759,14 +760,14 @@ update prodiodetail a
 
   <update id="updatePDSaleIN" parameterType="long">
    update prodiodetail set
-   pd_total=round(IFNULL(pd_inqty,0)*IFNULL(pd_sendprice,0),2),
+   pd_ordertotal=round(IFNULL(pd_inqty,0)*IFNULL(pd_sendprice,0),2),
    pd_netprice = round(IFNULL(pd_sendprice,0)/(1+IFNULL(pd_taxrate,0)/100),2),
    pd_nettotal = round((IFNULL(pd_sendprice,0)/(1+IFNULL(pd_taxrate,0)/100))*IFNULL(pd_inqty,0),2)
    where pd_piid=#{id}
   </update>
   <update id="updatePDSaleOut" parameterType="long">
     update prodiodetail set
-    pd_total=round(IFNULL(pd_outqty,0)*IFNULL(pd_sendprice,0),2),
+    pd_ordertotal=round(IFNULL(pd_outqty,0)*IFNULL(pd_sendprice,0),2),
     pd_netprice = round(IFNULL(pd_sendprice,0)/(1+IFNULL(pd_taxrate,0)/100),2),
     pd_nettotal = round((IFNULL(pd_sendprice,0)/(1+IFNULL(pd_taxrate,0)/100))*IFNULL(pd_outqty,0),2)
     where pd_piid=#{id}

applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/po/ProdIODetail.java

@@ -81,6 +81,8 @@ public class ProdIODetail extends CommonBaseEntity implements Serializable {
 
     private Long pd_ioid;
 
+    private Double pd_ordertotal;
+
     private ProductDTO productDTO;
 
 }

frontend/saas-web/app/model/sale/ProdIODetail.js

@@ -35,6 +35,7 @@ Ext.define('saas.model.sale.ProdIODetail', {
         { name: 'pd_yqty', type: 'int' },
         { name: 'pd_remark', type: 'string' },
         { name: 'pd_ioid', type: 'int' },
+        { name: 'pd_ordertotal', type: 'float' }
     ],
     //一对一映射
     associations: [{ type: 'hasOne', model: 'saas.model.document.Product', associationKey: 'productDTO'}]

frontend/saas-web/app/view/sale/saleIn/FormPanel.js

@@ -172,7 +172,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
             }, 
            {
                 text : "含税金额", 
-                dataIndex : "pd_total", 
+                dataIndex : "pd_ordertotal", 
                 width : 120.0, 
                 editor : {
                     xtype : "numberfield",

frontend/saas-web/app/view/sale/saleOut/FormPanel.js

@@ -183,7 +183,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
             }, 
            {
                 text : "含税金额", 
-                dataIndex : "pd_total", 
+                dataIndex : "pd_ordertotal", 
                 width : 120.0, 
                 editor : {
                     xtype : "numberfield",