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

applications/document/document-api/src/main/java/com/usoftchina/saas/document/api/WarehouseApi.java

@@ -3,16 +3,18 @@ package com.usoftchina.saas.document.api;
 import com.usoftchina.saas.base.Result;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.Map;
 
 @FeignClient(name = "document-server")
 public interface WarehouseApi {
 
-    @GetMapping("/warehouse/post")
-    public Result post(Map<String, Object> param);
+    @PostMapping("/warehouse/post")
+    public Result post(@RequestBody Map<String, Object> map);
 
-    @GetMapping("/warehouse/unPost")
-    public Result unPost(Map<String, Object> param);
+    @PostMapping("/warehouse/unPost")
+    public Result unPost(@RequestBody Map<String, Object> map);
 
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/controller/WarehouseController.java

@@ -23,8 +23,8 @@ public class WarehouseController {
      * 过账
      * @return
      */
-    @GetMapping("/post")
-    public Result post(Map<String, Object> map){
+    @PostMapping("/post")
+    public Result post(@RequestBody Map<String, Object> map){
         warehouseService.post(map);
         return Result.success(map.get("result"));
     }
@@ -34,8 +34,8 @@ public class WarehouseController {
      * @param map
      * @return
      */
-    @GetMapping("/unPost")
-    public Result unPost(Map<String, Object> map){
+    @PostMapping("/unPost")
+    public Result unPost(@RequestBody Map<String, Object> map){
         warehouseService.unPost(map);
         return Result.success();
     }

frontend/saas-web/app/view/document/customer/panel/FormController.js

@@ -16,7 +16,7 @@ Ext.define('saas.view.document.customer.panel.FormController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         //数据接口
-                        dataUrl:'http://192.168.253.41:9480/api/document/vendor/getVendorsByCondition',
+                        dataUrl:'http://192.168.253.41:9480/api/document/vendor/list',
                         //赋值 
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
@@ -201,7 +201,6 @@ Ext.define('saas.view.document.customer.panel.FormController', {
     },
 
     auditBtnClick: function() {
-        debugger
         var me = this,
         form = me.getView(),
         statusCodeField = form._statusCodeField,

frontend/saas-web/app/view/document/kind/KindModel.js

@@ -15,7 +15,7 @@ Ext.define('saas.view.document.kind.KindModel', {
             ],
             proxy: {
                 type: 'ajax',
-                url: basePath + 'document/customerkind/getAll',
+                url: basePath + 'document/customerkind/list',
                 actionMethods: {
                     read: 'GET'
                 },
@@ -34,7 +34,7 @@ Ext.define('saas.view.document.kind.KindModel', {
             ],
             proxy: {
                 type: 'ajax',
-                url: basePath + 'document/vendorkind/getAll',
+                url: basePath + 'document/vendorkind/list',
                 actionMethods: {
                     read: 'GET'
                 },
@@ -53,7 +53,7 @@ Ext.define('saas.view.document.kind.KindModel', {
             ],
             proxy: {
                 type: 'ajax',
-                url: basePath + 'document/producttype/getAll',
+                url: basePath + 'document/producttype/list',
                 actionMethods: {
                     read: 'GET'
                 },
@@ -72,7 +72,7 @@ Ext.define('saas.view.document.kind.KindModel', {
             ],
             proxy: {
                 type: 'ajax',
-                url: basePath + 'document/productbrand/getAll',
+                url: basePath + 'document/productbrand/list',
                 actionMethods: {
                     read: 'GET'
                 },
@@ -96,7 +96,7 @@ Ext.define('saas.view.document.kind.KindModel', {
             ],
             proxy: {
                 type: 'ajax',
-                url: 'http://192.168.253.129:9480/bankinformation/getAll',
+                url: 'http://192.168.253.129:9480/bankinformation/list',
                 actionMethods: {
                     read: 'GET'
                 },
@@ -116,7 +116,7 @@ Ext.define('saas.view.document.kind.KindModel', {
             ],
             proxy: {  
                 type: 'ajax',
-                url: 'http://192.168.253.31:9480/fundinouttype/getAll',
+                url: 'http://192.168.253.31:9480/fundinouttype/list',
                 actionMethods: {
                     read: 'GET'
                 },

frontend/saas-web/app/view/document/product/panel/FormController.js

@@ -16,7 +16,7 @@ Ext.define('saas.view.document.product.panel.FormController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         //数据接口
-                        dataUrl:'http://192.168.253.41:9480/api/document/vendor/getVendorsByCondition',
+                        dataUrl:'http://192.168.253.41:9480/api/document/vendor/list',
                         //赋值 
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'

frontend/saas-web/app/view/document/vendor/panel/FormController.js

@@ -16,7 +16,7 @@ Ext.define('saas.view.document.vendor.panel.FormController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         //数据接口
-                        dataUrl:'http://192.168.253.41:9480/api/document/vendor/getVendorsByCondition',
+                        dataUrl:'http://192.168.253.41:9480/api/document/vendor/list',
                         //赋值 
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'

frontend/saas-web/app/view/money/othreceipts/FormPanel.js

@@ -18,9 +18,7 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
      _relationColumn: 'ord_orid',
      _readUrl:basePath+'money/othreceipts/read/',
      _saveUrl:basePath+'money/othreceipts/save',
-     _auditUrl:'',
      _deleteUrl:basePath+'money/othreceipts/delete/',
-     _turnOutUrl:'', 
      initId:0,
 
     defaultItems: [{
@@ -62,7 +60,8 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
             {
                 text : "id", 
                 dataIndex : "id", 
-                xtype : "hidden"
+                xtype : "numbercolumn",
+                width:0
             }, {
                 text : "期间", 
                 dataIndex : "ord_ym", 
@@ -80,7 +79,7 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
                 items : null,
                 editor : {
                     xtype : "remotecombo", 
-                    storeUrl:basePath+'ducument/fundinoutType/getAll',
+                    storeUrl:basePath+'ducument/fundinoutType/list',
                     name : "ord_type", 
                     fieldLabel : "收入类别", 
                     allowBlank : true, 
@@ -89,21 +88,22 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
                     valueField: 'value',
                     columnWidth : 0.25,
                     etc:{
-                        vendorkind:{
+                        inoutkind:{
                             keyField:'id',
-                            dataField:'vk_name',
+                            dataField:'ft_name',
                             reqUrl:basePath+'ducument/fundinoutType/save',
                             delUrl:basePath+'ducument/fundinoutType/delete'
                         }
                     },
                     addHandler:function(b){
+                        //this.ownerCmp.etc['inoutkind'],
                         var form = this.ownerCmp.ownerCt;
                         this.dialog = form.getController().getView().add({
-                            xtype: 'document-inoutkind-childwin',
+                            xtype: 'document-kind-childwin',
                             bind: {
                                 title: '新增收入类型'
                             },
-                            dataKind:'vendorkind',
+                            dataKind:'inoutkind',
                             belong:this.ownerCmp.etc['inoutkind'],
                             _parent:form,
                             record:null,

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

@@ -22,53 +22,44 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                             field:'cu_name',width:100
                         }],
                         dbColumns:[{
-                            conditionCode:'id',
                             "text": "客户ID",
                             "flex": 0,
                             "dataIndex": "id",
                             "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "xtype": ""
                         },{
-                            conditionCode:'cu_code',
                             "text": "客户编号",
                             "flex": 1,
                             "dataIndex": "cu_code",
                             "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "xtype": ""
                         }, {
-                            conditionCode:'cu_name',
                             "text": "客户名称",
                             "flex": 1,
                             "dataIndex": "cu_name",
-                            "xtype": "",
-                            "items": null
+                            "xtype": ""
                         }, {
-                            conditionCode:'cu_type',
                             "text": "客户类型",
                             "flex": 0,
                             "dataIndex": "cu_type",
                             "width": 200,
-                            "xtype": "",
-                            "items": null
+                            "xtype": ""
                         }]
                     }) ;   
 
                 }
-            },
+          },
             //放大镜赋值关系 以及 tpl模板
             'dbfindtrigger[name=or_bankname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        conditionCode:'or_bankcode',
                         dataUrl:basePath+'document/bankinformation/list',
                         dbfinds:[{
                             from:'bk_bankcode',to:'or_bankcode'
                         },{
                             from:'bk_bankname',to:'or_bankname'
                         },{
-                            from:'bk_id',to:'or_bankid'
+                            from:'id',to:'or_bankid'
                     }],
                         dbtpls:[{
                             field:'bk_bankcode',width:100
@@ -78,36 +69,31 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                         dbColumns:[{
                             "text": "账户ID",
                             "flex": 0,
-                            "dataIndex": "bk_id",
+                            "dataIndex": "id",
                             "width": 0,
-                            "xtype": "",
-                            "items": null
+                            "xtype": ""
                         },{
                             "text": "账户编号",
                             "flex": 1,
                             "dataIndex": "bk_bankcode",
                             "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "xtype": ""
                         }, {
                             "text": "账户名称",
                             "flex": 1,
                             "dataIndex": "bk_bankname",
-                            "xtype": "",
-                            "items": null
+                            "xtype": ""
                         }, {
                             "text": "账户类型",
                             "flex": 0,
                             "dataIndex": "bk_type",
                             "width": 200,
-                            "xtype": "",
-                            "items": null
+                            "xtype": ""
                         }]
                     }) ;   
 
                 }
             }
         });
-
     }
 });

frontend/saas-web/app/view/money/othreceipts/QueryPanelController.js

@@ -22,36 +22,28 @@ Ext.define('saas.view.money.othreceipts.QueryPanelController', {
                             field:'cu_name',width:100
                         }],
                         dbColumns:[{
-                            conditionCode:'id',
                             "text": "客户ID",
                             "flex": 0,
                             "dataIndex": "id",
                             "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "xtype": ""
                         },{
-                            conditionCode:'cu_code',
                             "text": "客户编号",
                             "flex": 1,
                             "dataIndex": "cu_code",
                             "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "xtype": ""
                         }, {
-                            conditionCode:'cu_name',
                             "text": "客户名称",
                             "flex": 1,
                             "dataIndex": "cu_name",
-                            "xtype": "",
-                            "items": null
+                            "xtype": ""
                         }, {
-                            conditionCode:'cu_type',
                             "text": "客户类型",
                             "flex": 0,
                             "dataIndex": "cu_type",
                             "width": 200,
-                            "xtype": "",
-                            "items": null
+                            "xtype": ""
                         }]
                     }) ;   
 
@@ -61,14 +53,13 @@ Ext.define('saas.view.money.othreceipts.QueryPanelController', {
             'dbfindtrigger[name=or_bankname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        conditionCode:'or_bankcode',
                         dataUrl:basePath+'document/bankinformation/list',
                         dbfinds:[{
                             from:'bk_bankcode',to:'or_bankcode'
                         },{
                             from:'bk_bankname',to:'or_bankname'
                         },{
-                            from:'bk_id',to:'or_bankid'
+                            from:'id',to:'or_bankid'
                     }],
                         dbtpls:[{
                             field:'bk_bankcode',width:100
@@ -78,30 +69,26 @@ Ext.define('saas.view.money.othreceipts.QueryPanelController', {
                         dbColumns:[{
                             "text": "账户ID",
                             "flex": 0,
-                            "dataIndex": "bk_id",
+                            "dataIndex": "id",
                             "width": 0,
-                            "xtype": "",
-                            "items": null
+                            "xtype": ""
                         },{
                             "text": "账户编号",
                             "flex": 1,
                             "dataIndex": "bk_bankcode",
                             "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "xtype": ""
                         }, {
                             "text": "账户名称",
                             "flex": 1,
                             "dataIndex": "bk_bankname",
-                            "xtype": "",
-                            "items": null
+                            "xtype": ""
                         }, {
                             "text": "账户类型",
                             "flex": 0,
                             "dataIndex": "bk_type",
                             "width": 200,
-                            "xtype": "",
-                            "items": null
+                            "xtype": ""
                         }]
                     }) ;   
 

frontend/saas-web/app/view/money/othspendings/FormPanel.js

@@ -59,7 +59,8 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
             {
                 text : "id", 
                 dataIndex : "id", 
-                xtype : "hidden"
+                xtype : "numbercolumn",
+                width:0
             }, {
                 text : "期间", 
                 dataIndex : "osd_ym", 
@@ -77,7 +78,7 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
                 items : null,
                 editor : {
                     xtype : "remotecombo", 
-                    storeUrl:basePath+'ducument/fundinoutType/getAll',
+                    storeUrl:basePath+'ducument/fundinoutType/list',
                     name : "osd_type", 
                     fieldLabel : "支出类别", 
                     allowBlank : true, 
@@ -96,11 +97,11 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
                     addHandler:function(b){
                         var form = this.ownerCmp.ownerCt;
                         this.dialog = form.getController().getView().add({
-                            xtype: 'document-inoutkind-childwin',
+                            xtype: 'document-kind-childwin',
                             bind: {
                                 title: '新增收入类型'
                             },
-                            dataKind:'vendorkind',
+                            dataKind:'inoutkind',
                             belong:this.ownerCmp.etc['inoutkind'],
                             _parent:form,
                             record:null,

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

@@ -8,7 +8,7 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
             'dbfindtrigger[name=os_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath+'document/vendor/getVendorsByCondition',
+                        dataUrl:basePath+'document/vendor/list',
                         dbfinds:[{
                             from:'id',to:'os_vendid'
                         },{
@@ -56,7 +56,7 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'os_bankcode',
-                        dataUrl:basePath+'document/bankinformation/getAll',
+                        dataUrl:basePath+'document/bankinformation/list',
                         dbfinds:[{
                             from:'bk_bankcode',to:'os_bankcode'
                         },{

frontend/saas-web/app/view/money/othspendings/QueryPanelController.js

@@ -8,7 +8,7 @@ Ext.define('saas.view.money.othspendings.QueryPanelController', {
             'dbfindtrigger[name=os_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath+'document/vendor/getVendorsByCondition',
+                        dataUrl:basePath+'document/vendor/list',
                         dbfinds:[{
                             from:'id',to:'os_vendid'
                         },{
@@ -56,7 +56,7 @@ Ext.define('saas.view.money.othspendings.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'os_bankcode',
-                        dataUrl:basePath+'document/bankinformation/getAll',
+                        dataUrl:basePath+'document/bankinformation/list',
                         dbfinds:[{
                             from:'bk_bankcode',to:'os_bankcode'
                         },{

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

@@ -15,7 +15,7 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
             'dbfindtrigger[name=pu_vendcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath + 'document/vendor/getVendorsByCondition',
+                        dataUrl:basePath + 'document/vendor/list',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{

frontend/saas-web/app/view/money/payBalance/QueryPanelController.js

@@ -9,7 +9,7 @@ Ext.define('saas.view.money.paybalance.QueryPanelController', {
             'dbfindtrigger[name=pu_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath + 'document/vendor/getVendorsByCondition',
+                        dataUrl:basePath + 'document/vendor/list',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{

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

@@ -9,7 +9,7 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         //数据接口
-                        dataUrl: 'http://192.168.253.41:9480/vendor/getVendorsByCondition',
+                        dataUrl: 'http://192.168.253.41:9480/vendor/list',
                         //赋值 
                         dbfinds:[{
                             from: 've_id', to: 'rb_custid'

frontend/saas-web/app/view/money/recBalance/QueryPanelController.js

@@ -9,7 +9,7 @@ Ext.define('saas.view.money.recBalance.QueryPanelController', {
             'dbfindtrigger[name=pu_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'http://192.168.253.41:9480/api/document/vendor/getVendorsByCondition',
+                        dataUrl:'http://192.168.253.41:9480/api/document/vendor/list',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{

frontend/saas-web/app/view/purchase/purchase/FormPanelController.js

@@ -9,7 +9,7 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         //数据接口
-                        dataUrl:basePath+'document/vendor/getVendorsByCondition',
+                        dataUrl:basePath+'document/vendor/list',
                         //赋值 
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'

frontend/saas-web/app/view/purchase/purchase/QueryPanelController.js

@@ -9,7 +9,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanelController', {
             'dbfindtrigger[name=pu_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath+'document/vendor/getVendorsByCondition',
+                        dataUrl:basePath+'document/vendor/list',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{

frontend/saas-web/app/view/purchase/purchaseIn/FormPanelController.js

@@ -15,7 +15,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
             'dbfindtrigger[name=pu_vendcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath+'document/vendor/getVendorsByCondition',
+                        dataUrl:basePath+'document/vendor/list',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{

frontend/saas-web/app/view/purchase/purchaseIn/QueryPanelController.js

@@ -9,7 +9,7 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanelController', {
             'dbfindtrigger[name=pu_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath+'document/vendor/getVendorsByCondition',
+                        dataUrl:basePath+'document/vendor/list',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{

frontend/saas-web/app/view/purchase/purchaseOut/FormPanelController.js

@@ -14,7 +14,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
             'dbfindtrigger[name=pu_vendcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath+'document/vendor/getVendorsByCondition',
+                        dataUrl:basePath+'document/vendor/list',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{

frontend/saas-web/app/view/purchase/purchaseOut/QueryPanelController.js

@@ -9,7 +9,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanelController', {
             'dbfindtrigger[name=pu_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath+'document/vendor/getVendorsByCondition',
+                        dataUrl:basePath+'document/vendor/list',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{

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

@@ -25,7 +25,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
  
      toolBtns: [{
          xtype: 'button',
-         text: '转出货单',
+         text: '转销售出货单',
          handler: 'turnOut'
      }],
 
@@ -54,16 +54,20 @@ Ext.define('saas.view.sale.sale.FormPanel', {
     }, {
         name : "detailGridField", 
         xtype : "detailGridField", 
-        detnoColumn:  'sd_detno',
+        detnoColumn: 'sd_detno',
         storeModel:'saas.model.sale.Saledetail',
         _deleteDetailUrl:basePath+'sale/deleteItem/',
         columns : [
            {
                 text : "id", 
                 dataIndex : "id", 
-                xtype : "hidden"
-            },
-            {
+                xtype : "numbercolumn",
+                width:0
+            }, {
+                text : "物料id", 
+                dataIndex : "pd_prodid", 
+                width : 0
+            }, {
                 text : "物料编号", 
                 width : 200.0, 
                 dataIndex : "sd_prodcode", 
@@ -82,18 +86,15 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                     valueField : "value", 
                     xtype : "dbfindtrigger"
                 }
-            },
-            {
+            }, {
                 text : "名称", 
                 dataIndex : "pr_detail",
                 ignore:true,
                 width : 150.0, 
                 renderer: function (v, m, r) {
-                    debugger;
 				    return r.data["product"]?r.data["product"][m.column.dataIndex]:v;
 				}
-            },
-            {
+            }, {
                 text : "规格", 
                 dataIndex : "pr_spec",
                 ignore:true,
@@ -101,8 +102,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 renderer: function (v, m, r) {
 				    return r.data["product"]?r.data["product"][m.column.dataIndex]:v;
 				}
-            },
-            {
+            }, {
                 text : "数量", 
                 dataIndex : "sd_qty", 
                 editor : {
@@ -113,7 +113,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 format:'0,000.00',
                 items : null,
                 summaryType: 'sum'
-            },
+            }, 
             {
                 text : "单价", 
                 editor : {
@@ -171,19 +171,6 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 ignore:true,
                 flex : 1.0,
             }
-           /*  {
-                text : "已转数", 
-                dataIndex : "sd_yqty", 
-                editor : {
-                    xtype : "numberfield"
-                },
-                width : 120.0, 
-                xtype : "numbercolumn", 
-                format:'0',
-                 
-                items : null,
-                summaryType: 'sum'
-            }, */
         ]
     }, {
         xtype : "textfield", 

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

@@ -77,7 +77,7 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
         baseColumn: [{
             text: 'id',
             dataIndex: 'sa_id',
-            width: 100,
+            width: 0,
             xtype: 'numbercolumn'
         }, {
             text: '单据编号',

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

@@ -16,10 +16,11 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
     _statusCodeField: 'pi_statuscode',
     
     _relationColumn: 'pd_piid',
-    _readUrl:basePath+'prodinout/read/',
-    _saveUrl:basePath+'prodinout/save',
-    _auditUrl:basePath+'prodinout/audit',
-    _deleteUrl:basePath+'prodinout/delete/',
+    _readUrl:basePath+'sale/prodinout/read/',
+    _saveUrl:basePath+'sale/prodinout/save',
+    _auditUrl:basePath+'sale/prodinout/audit',
+    _deleteUrl:basePath+'sale/prodinout/delete/',
+    _turnInUrl:basePath+'sale/prodinout/turnProdIn/',
     initId:0,
 
     defaultItems: [{
@@ -56,8 +57,9 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
             {
                 text : "id", 
                 dataIndex : "id", 
-                xtype : "hidden"
-            },{
+                xtype : "numbercolumn",
+                width:0
+            }, {
                 text : "物料id", 
                 dataIndex : "pd_prodid", 
                 width :0
@@ -80,18 +82,23 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                     valueField : "value", 
                     xtype : "dbfindtrigger"
                 }
-            },
-            {
+            }, {
                 text : "名称", 
                 dataIndex : "pr_detail",
-                ignore:true
-            },
-            {
+                ignore:true,
+                width : 150.0, 
+                renderer: function (v, m, r) {
+				    return r.data["product"]?r.data["product"][m.column.dataIndex]:v;
+				}
+            }, {
                 text : "规格", 
                 dataIndex : "pr_spec",
-                ignore:true
-            }, 
-            {
+                ignore:true,
+                width : 150.0, 
+                renderer: function (v, m, r) {
+				    return r.data["product"]?r.data["product"][m.column.dataIndex]:v;
+                }
+            }, {
                 text : "数量", 
                 dataIndex : "pd_inqty", 
                 editor : {

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

@@ -97,7 +97,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
         baseColumn: [{
             text: 'id',
             dataIndex: 'id',
-            width: 100,
+            width: 0,
             xtype: 'numbercolumn'
         }, {
             text: '单据编号',

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

@@ -67,7 +67,8 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
             {
                 text : "id", 
                 dataIndex : "id", 
-                xtype : "hidden"
+                xtype : "numbercolumn",
+                width:0
             }, {
                 text : "物料id", 
                 dataIndex : "pd_prodid", 
@@ -97,21 +98,17 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 ignore:true,
                 width : 150.0, 
                 renderer: function (v, m, r) {
-                    debugger;
 				    return r.data["product"]?r.data["product"][m.column.dataIndex]:v;
 				}
-            },
-            {
+            }, {
                 text : "规格", 
                 dataIndex : "pr_spec",
                 ignore:true,
                 width : 150.0, 
                 renderer: function (v, m, r) {
-                    debugger;
 				    return r.data["product"]?r.data["product"][m.column.dataIndex]:v;
 				}
-            }, 
-            {
+            },  {
                 text : "出货数量", 
                 dataIndex : "pd_outqty", 
                 editor : {

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

@@ -64,7 +64,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
     }],
     moreQueryFormItems: [],
     queryGridConfig: {
-        idField:'pi_id',
+        idField:'id',
         codeField:'pi_inoutno',
         addTitle:'销售出货单',
         addXtype:'sale-saleout-formpanel',
@@ -72,7 +72,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
         baseVastUrl: basePath+'sale/prodinout/',
         baseColumn: [{
             text: 'id',
-            dataIndex: 'pi_id',
+            dataIndex: 'id',
             width: 100,
             xtype: 'numbercolumn'
         }, {

frontend/saas-web/app/view/stock/appropriationInOut/FormPanelController.js

@@ -15,7 +15,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
             'dbfindtrigger[name=pu_vendcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath + 'document/vendor/getVendorsByCondition',
+                        dataUrl:basePath + 'document/vendor/list',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{

frontend/saas-web/app/view/stock/appropriationInOut/QueryPanelController.js

@@ -8,7 +8,7 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanelController', {
             'dbfindtrigger[name=pu_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath + 'document/vendor/getVendorsByCondition',
+                        dataUrl:basePath + 'document/vendor/list',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{

frontend/saas-web/app/view/stock/make/FormPanelController.js

@@ -9,7 +9,7 @@ Ext.define('saas.view.stock.make.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         //数据接口
-                        dataUrl:basePath+'document/vendor/getVendorsByCondition',
+                        dataUrl:basePath+'document/vendor/list',
                         //赋值 
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'

frontend/saas-web/app/view/stock/make/QueryPanelController.js

@@ -9,7 +9,7 @@ Ext.define('saas.view.stock.make.QueryPanelController', {
             'dbfindtrigger[name=pu_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath+'document/vendor/getVendorsByCondition',
+                        dataUrl:basePath+'document/vendor/list',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{

frontend/saas-web/app/view/stock/otherIn/FormPanelController.js

@@ -15,7 +15,7 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
             'dbfindtrigger[name=pu_vendcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath + 'document/vendor/getVendorsByCondition',
+                        dataUrl:basePath + 'document/vendor/list',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{

frontend/saas-web/app/view/stock/otherIn/QueryPanelController.js

@@ -8,7 +8,7 @@ Ext.define('saas.view.stock.otherIn.QueryPanelController', {
             'dbfindtrigger[name=pu_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath + 'document/vendor/getVendorsByCondition',
+                        dataUrl:basePath + 'document/vendor/list',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{

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

@@ -14,7 +14,7 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
             'dbfindtrigger[name=pu_vendcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath + 'document/vendor/getVendorsByCondition',
+                        dataUrl:basePath + 'document/vendor/list',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{

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

@@ -8,7 +8,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
             'dbfindtrigger[name=pu_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:basePath + 'document/vendor/getVendorsByCondition',
+                        dataUrl:basePath + 'document/vendor/list',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{

frontend/saas-web/app/view/test/order/FormController.js

@@ -15,7 +15,7 @@ Ext.define('saas.view.test.order.FormController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         //数据接口
-                        dataUrl:basePath + 'document/vendor/getVendorsByCondition',
+                        dataUrl:basePath + 'document/vendor/list',
                         //赋值 
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'

frontend/saas-web/app/view/test/query/QueryPanel.js

@@ -23,7 +23,7 @@ Ext.define('saas.view.test.query.QueryPanel', {
         fieldLabel: '单据编号',
         allowBlank: true,
         columnWidth: 0.25,
-        dataUrl:basePath+'ducument/vendor/getVendorsByCondition',
+        dataUrl:basePath+'ducument/vendor/list',
         dbfinds:[{
             from:'ve_code',to:'pu_code'
         }],