Merge remote-tracking branch 'origin/dev' into dev

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

@@ -431,7 +431,7 @@
   
   
   <!-- 销售订单转采购单-->
-  <insert id="turnPurchase" parameterType="com.usoftchina.saas.purchase.po.Purchase" >
+  <insert id="turnPurchase" parameterType="com.usoftchina.saas.sale.dto.PurchaseDTO" >
     <selectKey resultType="java.lang.Long" keyProperty="id">
       SELECT LAST_INSERT_ID() AS ID
     </selectKey>

frontend/saas-web/app/view/money/verification/FormPanelController.js

@@ -165,25 +165,28 @@ Ext.define('saas.view.money.verification.FormPanelController', {
                     Ext.apply(f, {
                         dbfinds: [{
                             from: 'id',
-                            to: 'vd_slid',ignore:true
+                            to: 'vcd_slid',ignore:true
                         }, {
                             from: 'sl_code',
-                            to: 'vd_slcode'
+                            to: 'vcd_slcode'
                         },{
                             from: 'sl_orderamount',
-                            to: 'vd_amount'
+                            to: 'vcd_amount'
                         },{
                             from: 'sl_yamount',
                             to: 'sl_yamount'
+                        },,{
+                            from: 'sl_namount',
+                            to: 'sl_namount'
                         },{
                             from:'sl_date',
-                            to:'vd_sldate'
+                            to:'vcd_sldate'
                         },{
                             from:'sl_kind',
-                            to:'vd_slkind'
+                            to:'vcd_slkind'
                         },{
                             from: 'sl_namount',
-                            to: 'vd_nowbalance'
+                            to: 'vcd_nowbalance'
                         }],
                     });
                 },