Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

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

@@ -51,7 +51,8 @@
     </resultMap>
 
     <select id="selectPurchaseListByCondition" resultMap="BaseResultMap">
-        select  *  from sale left join saledetail on sa_id=sd_said
+        select  *  from sale left join saledetail on sa_id=sd_said left join product
+        on sd_prodid = pr_id and sale.companyId = product.companyid
         <where>
             <if test="con != null">
                 ${con}

frontend/saas-web/app/view/stock/otherOut/FormPanel.js

@@ -152,7 +152,7 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
             },
             {
                 text: "数量",
-                dataIndex: "pd_inqty",
+                dataIndex: "pd_outqty",
                 editor: {
                     xtype: "numberfield"
                 },