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

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/po/PurchaseList.java

@@ -122,6 +122,8 @@ public class PurchaseList extends CommonBaseEntity implements Serializable {
 
     private String pd_remark;
 
+    private String pd_ordercode;
+
     //private ProductDTO productDTO;
     private Long pr_id;
     private String pr_code;

applications/purchase/purchase-server/src/main/resources/mapper/PurchaseListMapper.xml

@@ -42,6 +42,7 @@
         <result column="PD_PRODID" property="pd_prodid" jdbcType="INTEGER" />
         <result column="PD_PRODCODE" property="pd_prodcode" jdbcType="VARCHAR" />
         <result column="PD_UNIT" property="pd_unit" jdbcType="VARCHAR" />
+        <result column="pd_ordercode" property="pd_ordercode" jdbcType="VARCHAR" />
         <result column="PD_QTY" property="pd_qty" jdbcType="DOUBLE" />
         <result column="PD_PRICE" property="pd_price" jdbcType="DOUBLE" />
         <result column="PD_TAXPRICE" property="pd_taxprice" jdbcType="DOUBLE" />

frontend/saas-web/app/view/core/query/QueryGridPanel.js

@@ -336,7 +336,7 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
         saas.util.BaseUtil.request({
             url: url,
             params: '',
-            method: 'POST',
+            method: 'GET',
         })
         .then(function(localJson) {
             if(localJson.success){

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

@@ -53,7 +53,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
         fieldLabel : "客户名称",
         allowBlank : false
     }, {
-        name : "pu_shipaddresscode", 
+        name : "sa_toplace", 
         editable:false,
         xtype : "remotecombo", 
         storeUrl:'/api/document/address/getCombo',
@@ -218,6 +218,15 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 renderer : function(v) {
                     return Ext.util.Format.number(v, '0');
                 }
+            },{
+                text : "交货日期", 
+                dataIndex : "sd_delivery", 
+                xtype:'datecolumn',
+                editor : {
+                    xtype : "datefield",
+                    editable : true, 
+                    hideTrigger : false
+                }
             },
             {
                 text : "含税金额", 
@@ -255,15 +264,6 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                     var format = '0,000.' + xr.join();
                     return Ext.util.Format.number(v, format);
                 }
-            },{
-                text : "交货日期", 
-                dataIndex : "sd_delivery", 
-                xtype:'datecolumn',
-                editor : {
-                    xtype : "datefield",
-                    editable : true, 
-                    hideTrigger : false
-                }
             },{
                 text : "关联采购订单", 
                 dataIndex : "sd_pucode",