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

applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/po/BillCodeSeq.java

@@ -40,9 +40,11 @@ public enum  BillCodeSeq {
 
     VERIFICATION("核价单", "Verification"),
 
-    OTHRECEIPTS("其他收入单", "Otherceipts"),
+    OTHRECEIPTS("其它收入单","OthReceipts"),
 
-    OTHSPENDINGS("其他收入单", "Otherceipts"),
+    OTHSPENDINGS ("其它支出单","OthSpendings"),
+
+    FUNDTRANSFER ("资金转存","FundTransfer"),
 
     BOM("BOM资料", "Bom");
 

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/service/impl/ProdInOutServiceImpl.java

@@ -122,7 +122,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
             if (insertDetails.size()>0) {
                 prodIODetailMapper.batchInsert(insertDetails);
             }
-            baseDTO = getBaseDTOById(pi_id,pi_class);
+            baseDTO = getBaseDTOById(pi_id,pi_class,pi_inoutno);
             //更新明细金额
             getTotal(pi_id,pi_class);
             //日志记录
@@ -151,7 +151,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         if (updateDetails.size()>0) {
             prodIODetailMapper.batchUpdate(updateDetails);
         }
-        baseDTO = getBaseDTOById(pi_id,pi_class);
+        baseDTO = getBaseDTOById(pi_id,pi_class,pi_inoutno);
         //更新已转数
         updateYqty(prodInOut);
         return baseDTO;
@@ -169,7 +169,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         prodIODetailMapper.deleteByForeignKey(id);
         //主表删除
         prodInOutMapper.deleteByPrimaryKey(id);
-        DocBaseDTO docBaseDTO = getBaseDTOById(id,prodInOut.getPi_class());
+        DocBaseDTO docBaseDTO = getBaseDTOById(id,prodInOut.getPi_class(),prodInOut.getPi_inoutno());
         //更新已转数
         updateYqty(prodInOut);
         //日志
@@ -188,7 +188,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
                 id = baseDTO.getId();
             }
             String res = singleAudit(formData.getMain());
-            if(res!=null){
+            if(StringUtils.hasText(res)){
                 new BizException(501,res);
             }
         }
@@ -197,19 +197,21 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
     }
     private String singleAudit(ProdInOutDTO prodInOutDTO) {
         String pi_class= prodInOutDTO.getPi_class();
+        String pi_inoutno = prodInOutDTO.getPi_inoutno();
         Map<String, Object> map = new HashMap<String, Object>();
-        map.put("inoutNo",prodInOutDTO.getPi_inoutno() );
+        map.put("inoutNo",pi_inoutno);
         map.put("class", pi_class);
         map.put("commitid",BaseContextHolder.getUserId());
         map.put("companyid",BaseContextHolder.getCompanyId());
         map.put("result","");
         warehouseApi.post(map);
         Object result =  map.get("result");
+        System.out.println("result:"+result);
         if(result!=null){
             return result.toString();
         }else{
             //记录日志
-            DocBaseDTO docBaseDTO = getBaseDTOById(prodInOutDTO.getId(),pi_class);
+            DocBaseDTO docBaseDTO = getBaseDTOById(prodInOutDTO.getId(),pi_class,pi_inoutno);
             //日志
             messageLogService.audit(docBaseDTO);
             return "";
@@ -232,9 +234,10 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         }
     }
     private String singleUnAudit(ProdInOutDTO prodInOutDTO) {
-        String pi_class= prodInOutDTO.getPi_class();
+        String pi_class = prodInOutDTO.getPi_class();
+        String  pi_inoutno = prodInOutDTO.getPi_inoutno();
         Map<String, Object> map = new HashMap<String, Object>();
-        map.put("inoutNo",prodInOutDTO.getPi_inoutno() );
+        map.put("inoutNo", pi_inoutno);
         map.put("class", pi_class);
         map.put("commitid",BaseContextHolder.getUserId());
         map.put("companyid",BaseContextHolder.getCompanyId());
@@ -252,7 +255,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
             prodInOut.setUpdaterId(BaseContextHolder.getUserId());
             getMapper().updateByPrimaryKeySelective(prodInOut);
             //记录日志
-            DocBaseDTO docBaseDTO = getBaseDTOById(prodInOutDTO.getId(),pi_class);
+            DocBaseDTO docBaseDTO = getBaseDTOById(prodInOutDTO.getId(),pi_class,pi_inoutno);
             //日志
             messageLogService.unAudit(docBaseDTO);
             return "";
@@ -311,7 +314,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         Integer num = prodIODetailMapper.deleteByPrimaryKey(id);
         //更新已转数
         updateYqty(prodInOut);
-        DocBaseDTO docBaseDTO = getBaseDTOById(id,prodInOut.getPi_class());
+        DocBaseDTO docBaseDTO = getBaseDTOById(id,prodInOut.getPi_class(),prodInOut.getPi_inoutno());
         //日志
        messageLogService.deleteDetail(docBaseDTO);
         return num;
@@ -473,7 +476,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
 
         prodInOutMapper.updateByPrimaryKeySelective(prodInOut);
         //记录日志
-        DocBaseDTO docBaseDTO = getBaseDTOById(prodInOut.getId(),prodInOut.getPi_class());
+        DocBaseDTO docBaseDTO = getBaseDTOById(prodInOut.getId(),prodInOut.getPi_class(),prodInOut.getPi_inoutno());
        messageLogService.close(docBaseDTO);
         return "";
     }
@@ -518,7 +521,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         prodInOut.setPi_statuscode(Status.AUDITED.getDisplay());
         prodInOutMapper.updateByPrimaryKeySelective(prodInOut);
         //记录日志
-        DocBaseDTO docBaseDTO = getBaseDTOById(prodInOut.getId(),prodInOut.getPi_class());
+        DocBaseDTO docBaseDTO = getBaseDTOById(prodInOut.getId(),prodInOut.getPi_class(),prodInOut.getPi_inoutno());
         messageLogService.open(docBaseDTO);
         return "";
     }
@@ -591,12 +594,11 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
      * @Author: wuyx
      * @Date: 2018/10/25
      */
-    private DocBaseDTO getBaseDTOById(Long id,String pi_class) {
+    private DocBaseDTO getBaseDTOById(Long id,String pi_class,String code) {
         if (null == id) {
             return null;
         }
         String caller = BillCodeSeq.SALEIN.getName().equals(pi_class)?BillCodeSeq.SALEIN.getCaller():BillCodeSeq.SALEOUT.getCaller();
-        String code = prodInOutMapper.selectCodeById(id);
         DocBaseDTO baseDTO = new DocBaseDTO();
         baseDTO.setId(id);
         baseDTO.setCode(code);

frontend/saas-web/app/view/core/baseform/FormPanel.js → frontend/saas-web/app/view/core/base/BasePanel.js

@@ -1,20 +1,20 @@
-Ext.define('saas.view.core.baseform.FormPanel', {
+Ext.define('saas.view.core.base.BasePanel', {
     extend: 'Ext.form.Panel',
-    xtype: 'core-baseform-formpanel',
-    controller: 'core-baseform-formpanel',
-    viewModel: 'core-baseform-formpanel',
+    xtype: 'core-base-basepanel',
+    
+    controller: 'core-base-basepanel',
+    viewModel: 'core-base-basepanel',
 
     //工具类
     FormUtil: Ext.create('saas.util.FormUtil'),
     BaseUtil: Ext.create('saas.util.BaseUtil'),
 
     //基础属性
-    layout: 'column',
     autoScroll: true,
     border: 1,
     bodyPadding: 5,
-    searchField:[],
-
+    layout: 'fit',
+    
     fieldDefaults: {
         margin: '0 5 5 0',
         labelAlign: 'right',
@@ -22,10 +22,18 @@ Ext.define('saas.view.core.baseform.FormPanel', {
         columnWidth: 0.25,
         blankText: '该字段不能为空'
     },
+    
+    searchField:[],
+    gridColumns: [],
 
     initComponent: function() {
 
-        var me = this;
+        var me = this,
+        gridConfig = me.gridConfig,
+        gridDataUrl = gridConfig.dataUrl,
+        gridIdField = gridConfig.idField,
+        gridCodeField = gridConfig.codeField,
+        gridColumns = gridConfig.columns;
 
         Ext.apply(me, {
             dockedItems: [{
@@ -40,8 +48,16 @@ Ext.define('saas.view.core.baseform.FormPanel', {
                     text: '查询',
                     handler: 'query'
                 }])
+            }],
+            items: [{
+                layout: 'fit',
+                xtype: 'core-base-gridpanel',
+                dataUrl: gridDataUrl,
+                idField: gridIdField,
+                codeField: gridCodeField,
+                columns: gridColumns
             }]
         });
         me.callParent(arguments);
-    }
+    },
 });

frontend/saas-web/app/view/core/baseform/FormPanelController.js → frontend/saas-web/app/view/core/base/BasePanelController.js

@@ -1,13 +1,13 @@
-Ext.define('saas.view.core.baseform.FormPanelController', {
+Ext.define('saas.view.core.base.BasePanelController', {
     extend: 'Ext.app.ViewController',
-    alias: 'controller.core-baseform-formpanel',
+    alias: 'controller.core-base-basepanel',
 
     BaseUtil: Ext.create('saas.util.BaseUtil'),
     FormUtil: Ext.create('saas.util.FormUtil'),
 
     query: function() {
         var form = this.view;
-        var grid = this.view.down('[name=baseGrid]');
+        var grid = form.down('core-baseform-gridpanel');
         grid.condition = '';
         var fields = form.searchField.map(f => f.name);
         var items = [];

frontend/saas-web/app/view/core/base/BasePanelModel.js

@@ -0,0 +1,4 @@
+Ext.define('saas.view.core.base.BasePanelModel', {
+    extend: 'Ext.app.ViewModel',
+    alias: 'viewmodel.core-base-basepanel',
+});

frontend/saas-web/app/view/core/baseform/GridPanel.js → frontend/saas-web/app/view/core/base/GridPanel.js

@@ -1,17 +1,17 @@
-Ext.define('saas.view.core.baseform.GridPanel', {
+Ext.define('saas.view.core.base.GridPanel', {
     extend: 'Ext.grid.Panel',
-    xtype: 'core-baseform-gridpanel',
-    BaseUtil: Ext.create('saas.util.BaseUtil'),
-    dataUrl: '',
-    dbSearchFields: [],
-    condition:'',
+    xtype: 'core-base-gridpanel',
 
     selModel: {
         checkOnly:true,
         type:'checkboxmodel',
         mode : "MULTI" ,
         ignoreRightMouseSelection : false
-	},
+    },
+    
+    dataUrl: '',
+    dbSearchFields: [],
+    condition:'',
 
     initComponent: function() {
         var me = this;

frontend/saas-web/app/view/core/baseform/FormPanelModel.js

@@ -1,4 +0,0 @@
-Ext.define('saas.view.core.baseform.FormPanelModel', {
-    extend: 'Ext.app.ViewModel',
-    alias: 'viewmodel.core-baseform-formpanel',
-});

frontend/saas-web/app/view/document/bom/BasePanel.js

@@ -0,0 +1,16 @@
+Ext.define('saas.view.document.bom.BasePanel', {
+    extend: 'saas.view.core.base.BasePanel',
+    xtype: 'document-bom-basepanel',
+
+    controller: 'document-bom-basepanel',
+    viewModel: 'document-bom-basepanel',
+
+    //字段属性
+    _title:'BOM资料',
+    _dataUrl:basePath + 'document/vendor/getVendorsByCondition',
+    _saveUrl:basePath + 'document/vendor/save',
+    _deleteUrl:basePath + 'document/vendor/delete',
+
+
+
+});

frontend/saas-web/app/view/document/bom/BasePanelController.js

@@ -0,0 +1,10 @@
+Ext.define('saas.view.document.bom.BasePanelController', {
+    extend: 'saas.view.core.base.BasePanelController',
+    alias: 'controller.document-bom-basepanel',
+    
+    init: function (form) {
+        var me = this;
+        this.control({
+        });
+    }
+});

frontend/saas-web/app/view/document/bom/BasePanelModel.js

@@ -0,0 +1,4 @@
+Ext.define('saas.view.document.bom.BasePanelModel', {
+    extend: 'saas.view.core.base.BasePanelModel',
+    alias: 'viewmodel.document-bom-basepanel'
+});

frontend/saas-web/app/view/document/customer/BasePanel.js

@@ -0,0 +1,92 @@
+Ext.define('saas.view.document.customer.BasePanel', {
+    extend: 'saas.view.core.base.BasePanel',
+    xtype: 'document-customer-basepanel',
+
+    controller: 'document-customer-basepanel',
+    viewModel: 'document-customer-basepanel',
+
+    searchField:[{
+        xtype : "remotecombo", 
+        storeUrl:basePath+'ducument/customerkind/getCombo',
+        name : "cu_type", 
+        emptyText : "请选择客户类型", 
+        allowBlank : true, 
+        queryMode: 'local',
+        displayField: 'display',
+        valueField: 'value',
+        columnWidth : 0.25,
+        etc:{
+            customerkind:{
+                keyField:'id',
+                dataField:'ck_name',
+                reqUrl:basePath+'ducument/customerkind/save',
+                delUrl:basePath+'ducument/customerkind/delete'
+            }
+        },
+        addHandler:function(b){
+            var form = this.ownerCmp.ownerCt.ownerCt;
+            this.dialog = form.getController().getView().add({
+                xtype: 'document-kind-childwin',
+                bind: {
+                    title: '新增客户类型'
+                },
+                dataKind:'customerkind',
+                belong:this.ownerCmp.etc['customerkind'],
+                _parent:form,
+                record:null,
+                session: true
+            });
+            this.dialog.show();
+        }  
+    }],
+
+    //字段属性
+    _formXtype:'document-customer-formpanel',
+    _title:'客户资料',
+    // _dataUrl:basePath+'ducument/customer/list',
+    _batchOpenUrl:basePath+'ducument/customer/batchOpen',
+    _batchCloseUrl:basePath+'ducument/customer/batchClose',
+    _batchDeleteUrl:basePath+'ducument/customer/batchDelete',
+
+    gridConfig: {
+        idField: 'id',
+        codeField: 'cu_code',
+        dataUrl: basePath+'ducument/customer/list',
+        columns : [{
+            text : "客户id", 
+            width : 0, 
+            dataIndex : "id", 
+            xtype : "numbercolumn", 
+        },{
+            text : "客户编号", 
+            width : 200.0, 
+            dataIndex : "cu_code", 
+        }, 
+        {
+            text : "客户名称", 
+            dataIndex : "cu_name", 
+            width : 120.0, 
+        }, 
+        {
+            text : "客户状态", 
+            dataIndex : "cu_status", 
+            width : 120.0, 
+        }, 
+        {
+            text : "客户UU", 
+            dataIndex : "cu_uu", 
+            width : 120.0, 
+        }, 
+        {
+            text : "默认客户地址", 
+            dataIndex : "ca_address", 
+            width : 120.0, 
+        }, 
+        {
+            text : "默认客户联系人", 
+            dataIndex : "cc_name", 
+            flex : 1.0, 
+        }]
+    },
+
+});

frontend/saas-web/app/view/document/customer/BasePanelController.js

@@ -0,0 +1,10 @@
+Ext.define('saas.view.document.customer.BasePanelController', {
+    extend: 'saas.view.core.base.BasePanelController',
+    alias: 'controller.document-customer-basepanel',
+
+    init: function (form) {
+        var me = this;
+        this.control({
+        });
+    }
+});

frontend/saas-web/app/view/document/customer/BasePanelModel.js

@@ -0,0 +1,4 @@
+Ext.define('saas.view.document.customer.BasePanelModel', {
+    extend: 'saas.view.core.base.BasePanelModel',
+    alias: 'viewmodel.document-customer-basepanel'
+});

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

@@ -1,6 +1,7 @@
-Ext.define('saas.view.document.customer.panel.FormController', {
+Ext.define('saas.view.document.customer.FormController', {
     extend: 'saas.view.core.form.FormPanelController',
-    alias: 'controller.customer-panel-formpanel',
+    alias: 'controller.document-customer-formpanel',
+    
     init: function (form) {
         var me = this;
         this.control({});

frontend/saas-web/app/view/document/customer/FormModel.js

@@ -0,0 +1,6 @@
+Ext.define('saas.view.document.customer.FormModel', {
+    extend: 'saas.view.core.form.FormPanelModel',
+    alias: 'viewmodel.document-customer-formpanel',
+
+    
+});

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

@@ -1,9 +1,9 @@
-Ext.define('saas.view.document.customer.panel.FormPanel', {
+Ext.define('saas.view.document.customer.FormPanel', {
     extend: 'saas.view.core.form.FormPanel',
-    xtype: 'customer-panel-formpanel',
+    xtype: 'document-customer-formpanel',
 
-    controller: 'customer-panel-formpanel',
-    viewModel: 'customer-panel-formpanel',
+    controller: 'document-customer-formpanel',
+    viewModel: 'document-customer-formpanel',
     
     caller:'Customer',
 

frontend/saas-web/app/view/document/customer/list/FormPanel.js

@@ -1,112 +0,0 @@
-Ext.define('saas.view.document.customer.list.FormPanel', {
-    extend: 'saas.view.core.baseform.FormPanel',
-    xtype: 'customer-list-formpanel',
-    controller: 'customer-list-formpanel',
-    viewModel: 'customer-list-formpanel',
-
-    fieldDefaults: {
-        margin: '0 5 5 0',
-        labelAlign: 'right',
-        labelWidth: 90,
-        blankText: '该字段不能为空'
-    },
-
-    searchField:[{
-        xtype : "remotecombo", 
-        storeUrl:basePath+'ducument/customerkind/getCombo',
-        name : "cu_type", 
-        emptyText : "请选择客户类型", 
-        allowBlank : true, 
-        queryMode: 'local',
-        displayField: 'display',
-        valueField: 'value',
-        columnWidth : 0.25,
-        etc:{
-            customerkind:{
-                keyField:'id',
-                dataField:'ck_name',
-                reqUrl:basePath+'ducument/customerkind/save',
-                delUrl:basePath+'ducument/customerkind/delete'
-            }
-        },
-        addHandler:function(b){
-            var form = this.ownerCmp.ownerCt.ownerCt;
-            this.dialog = form.getController().getView().add({
-                xtype: 'document-kind-childwin',
-                bind: {
-                    title: '新增客户类型'
-                },
-                dataKind:'customerkind',
-                belong:this.ownerCmp.etc['customerkind'],
-                _parent:form,
-                record:null,
-                session: true
-            });
-            this.dialog.show();
-        }  
-    }],
-
-    //字段属性
-    _formXtype:'customer-panel-formpanel',
-    _title:'客户资料',
-    _dataUrl:basePath+'ducument/customer/list',
-    _batchOpenUrl:basePath+'ducument/customer/batchOpen',
-    _batchCloseUrl:basePath+'ducument/customer/batchClose',
-    _batchDeleteUrl:basePath+'ducument/customer/batchDelete',
-
-    initComponent: function () {
-        var me = this;
-        Ext.apply(me, {
-            items: [{
-                idField: 'id',
-                codeField: 'cu_code',
-                name : "baseGrid", 
-                xtype : "core-baseform-gridpanel", 
-                layout:'fit',
-                dataUrl:me._dataUrl,
-                columns : [{
-                    text : "客户id", 
-                    width : 0, 
-                    dataIndex : "id", 
-                    xtype : "numbercolumn", 
-                },{
-                    text : "客户编号", 
-                    width : 200.0, 
-                    dataIndex : "cu_code", 
-                    xtype : "", 
-                }, 
-                {
-                    text : "客户名称", 
-                    dataIndex : "cu_name", 
-                    width : 120.0, 
-                    xtype : "", 
-                }, 
-                {
-                    text : "客户状态", 
-                    dataIndex : "cu_status", 
-                    width : 120.0, 
-                    xtype : ""
-                }, 
-                {
-                    text : "客户UU", 
-                    dataIndex : "cu_uu", 
-                    width : 120.0, 
-                    xtype : "",
-                }, 
-                {
-                    text : "默认客户地址", 
-                    dataIndex : "ca_address", 
-                    width : 120.0, 
-                    xtype : "",
-                }, 
-                {
-                    text : "默认客户联系人", 
-                    dataIndex : "cc_name", 
-                    flex : 1.0, 
-                    xtype : "",
-                }]
-            }]
-        });
-        me.callParent(arguments);
-    }
-});

frontend/saas-web/app/view/document/customer/list/FormPanelController.js

@@ -1,11 +0,0 @@
-Ext.define('saas.view.document.customer.list.FormPanelController', {
-    extend: 'saas.view.core.baseform.FormPanelController',
-    BaseUtil: Ext.create('saas.util.BaseUtil'),
-    FormUtil: Ext.create('saas.util.FormUtil'),
-    alias: 'controller.customer-list-formpanel',
-    init: function (form) {
-        var me = this;
-        this.control({
-        });
-    }
-});

frontend/saas-web/app/view/document/customer/list/FormPanelModel.js

@@ -1,4 +0,0 @@
-Ext.define('saas.view.document.customer.list.FormPanelModel', {
-    extend: 'saas.view.core.baseform.FormPanelModel',
-    alias: 'viewmodel.customer-list-formpanel'
-});

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

@@ -1,6 +0,0 @@
-Ext.define('saas.view.document.customer.panel.FormModel', {
-    extend: 'saas.view.core.form.FormPanelModel',
-    alias: 'viewmodel.customer-panel-formpanel',
-
-    
-});

frontend/saas-web/app/view/document/product/BasePanel.js

@@ -0,0 +1,86 @@
+Ext.define('saas.view.document.product.BasePanel', {
+    extend: 'saas.view.core.base.BasePanel',
+    xtype: 'document-product-basepanel',
+
+    controller: 'document-product-basepanel',
+    viewModel: 'document-product-basepanel',
+
+    searchField:[{
+        xtype : "remotecombo", 
+        storeUrl: basePath + 'document/producttype/getCombo',
+        name : "pr_type", 
+        emptyText : "请选择物料类型", 
+        allowBlank : true, 
+        queryMode: 'local',
+        displayField: 'display',
+        valueField: 'value',
+        columnWidth : 0.25,
+        etc:{
+            producttype:{
+                keyField:'id',
+                dataField:'pr_name',
+                reqUrl:basePath + 'document/producttype/save',
+                delUrl:basePath + 'document/producttype/delete'
+            }
+        },
+        addHandler:function(b){
+            var form = this.ownerCmp.ownerCt.ownerCt;
+            this.dialog = form.getController().getView().add({
+                xtype: 'document-kind-childwin',
+                bind: {
+                    title: '新增物料类型'
+                },
+                dataKind:'producttype',
+                belong:this.ownerCmp.etc['producttype'],
+                _parent:form,
+                record:null,
+                session: true
+            });
+            this.dialog.show();
+        }  
+    }],
+
+    //字段属性
+    _formXtype:'document-product-formpanel',
+    _title:'物料资料',
+    // _dataUrl: basePath + 'document/product/list',
+    _batchOpenUrl: basePath + 'document/product/batchOpen',
+    _batchCloseUrl: basePath + 'document/product/batchClose',
+    _batchDeleteUrl: basePath + 'document/product/batchDelete',
+
+    gridConfig: {
+        idField: 'id',
+        codeField: 'pr_code',
+        dataUrl: basePath + 'document/product/list',
+        columns : [{
+            text : "id", 
+            width : 0, 
+            dataIndex : "id", 
+            xtype : "numbercolumn", 
+        },{
+            text : "物料编号", 
+            width : 200.0, 
+            dataIndex : "pr_code", 
+            xtype : "", 
+        }, 
+        {
+            text : "物料名称", 
+            dataIndex : "pr_detail", 
+            width : 120.0, 
+            xtype : "", 
+        }, 
+        {
+            text : "状态", 
+            dataIndex : "pr_status", 
+            width : 120.0, 
+            xtype : ""
+        }, 
+        {
+            text : "物料种类", 
+            dataIndex : "pr_type", 
+            width : 120.0, 
+            xtype : "",
+        }]
+    },
+
+});

frontend/saas-web/app/view/document/product/BasePanelController.js

@@ -0,0 +1,10 @@
+Ext.define('saas.view.document.product.BasePanelController', {
+    extend: 'saas.view.core.base.BasePanelController',
+    alias: 'controller.document-product-basepanel',
+
+    init: function (form) {
+        var me = this;
+        this.control({
+        });
+    }
+});

frontend/saas-web/app/view/document/product/BasePanelModel.js

@@ -0,0 +1,4 @@
+Ext.define('saas.view.document.product.BasePanelModel', {
+    extend: 'saas.view.core.base.BasePanelModel',
+    alias: 'viewmodel.document-product-basepanel'
+});

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

@@ -1,6 +1,6 @@
-Ext.define('saas.view.document.product.panel.FormController', {
+Ext.define('saas.view.document.product.FormController', {
     extend: 'saas.view.core.form.FormPanelController',
-    alias: 'controller.product-panel-formpanel',
+    alias: 'controller.document-product-formpanel',
     init: function (form) {
         var me = this;
         this.control({

frontend/saas-web/app/view/document/product/FormModel.js

@@ -0,0 +1,6 @@
+Ext.define('saas.view.document.product.FormModel', {
+    extend: 'saas.view.core.form.FormPanelModel',
+    alias: 'viewmodel.document-product-formpanel',
+
+    
+});

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

@@ -1,9 +1,9 @@
-Ext.define('saas.view.document.product.panel.FormPanel', {
+Ext.define('saas.view.document.product.FormPanel', {
     extend: 'saas.view.core.form.FormPanel',
-    xtype: 'product-panel-formpanel',
+    xtype: 'document-product-formpanel',
 
-    controller: 'product-panel-formpanel',
-    viewModel: 'product-panel-formpanel',
+    controller: 'document-product-formpanel',
+    viewModel: 'document-product-formpanel',
     
     caller:'Product',
 

frontend/saas-web/app/view/document/product/list/FormPanel.js

@@ -1,109 +0,0 @@
-Ext.define('saas.view.document.product.list.FormPanel', {
-    extend: 'saas.view.core.baseform.FormPanel',
-    xtype: 'product-list-formpanel',
-    controller: 'product-list-formpanel',
-    viewModel: 'product-list-formpanel',
-
-    //工具类
-    FormUtil: Ext.create('saas.util.FormUtil'),
-    BaseUtil: Ext.create('saas.util.BaseUtil'),
-
-    //基础属性
-    layout: 'fit',
-    autoScroll: true,
-    border: 1,
-
-    fieldDefaults: {
-        margin: '0 5 5 0',
-        labelAlign: 'right',
-        labelWidth: 90,
-        blankText: '该字段不能为空'
-    },
-
-    searchField:[{
-        xtype : "remotecombo", 
-        storeUrl: basePath + 'document/producttype/getCombo',
-        name : "pr_type", 
-        emptyText : "请选择物料类型", 
-        allowBlank : true, 
-        queryMode: 'local',
-        displayField: 'display',
-        valueField: 'value',
-        columnWidth : 0.25,
-        etc:{
-            producttype:{
-                keyField:'id',
-                dataField:'pr_name',
-                reqUrl:basePath + 'document/producttype/save',
-                delUrl:basePath + 'document/producttype/delete'
-            }
-        },
-        addHandler:function(b){
-            var form = this.ownerCmp.ownerCt.ownerCt;
-            this.dialog = form.getController().getView().add({
-                xtype: 'document-kind-childwin',
-                bind: {
-                    title: '新增物料类型'
-                },
-                dataKind:'producttype',
-                belong:this.ownerCmp.etc['producttype'],
-                _parent:form,
-                record:null,
-                session: true
-            });
-            this.dialog.show();
-        }  
-    }],
-
-    //字段属性
-    _formXtype:'product-panel-formpanel',
-    _title:'物料资料',
-    _dataUrl:basePath + 'document/product/list',
-    _batchOpenUrl:basePath + 'document/product/batchOpen',
-    _batchCloseUrl:basePath + 'document/product/batchClose',
-    _batchDeleteUrl:basePath + 'document/product/batchDelete',
-
-    initComponent: function () {
-        var me = this;
-        Ext.apply(me, {
-            items: [{
-                idField: 'id',
-                codeField: 'pr_code',
-                name : "baseGrid", 
-                xtype : "core-baseform-gridpanel", 
-                layout:'fit',
-                dataUrl:me._dataUrl,
-                columns : [{
-                    text : "id", 
-                    width : 0, 
-                    dataIndex : "id", 
-                    xtype : "numbercolumn", 
-                },{
-                    text : "物料编号", 
-                    width : 200.0, 
-                    dataIndex : "pr_code", 
-                    xtype : "", 
-                }, 
-                {
-                    text : "物料名称", 
-                    dataIndex : "pr_detail", 
-                    width : 120.0, 
-                    xtype : "", 
-                }, 
-                {
-                    text : "状态", 
-                    dataIndex : "pr_status", 
-                    width : 120.0, 
-                    xtype : ""
-                }, 
-                {
-                    text : "物料种类", 
-                    dataIndex : "pr_type", 
-                    width : 120.0, 
-                    xtype : "",
-                }]
-            }]
-        });
-        me.callParent(arguments);
-    }
-});

frontend/saas-web/app/view/document/product/list/FormPanelController.js

@@ -1,11 +0,0 @@
-Ext.define('saas.view.document.product.list.FormPanelController', {
-    extend: 'saas.view.core.baseform.FormPanelController',
-    BaseUtil: Ext.create('saas.util.BaseUtil'),
-    FormUtil: Ext.create('saas.util.FormUtil'),
-    alias: 'controller.product-list-formpanel',
-    init: function (form) {
-        var me = this;
-        this.control({
-        });
-    }
-});

frontend/saas-web/app/view/document/product/list/FormPanelModel.js

@@ -1,4 +0,0 @@
-Ext.define('saas.view.document.product.list.FormPanelModel', {
-    extend: 'saas.view.core.baseform.FormPanelModel',
-    alias: 'viewmodel.product-list-formpanel'
-});

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

@@ -1,6 +0,0 @@
-Ext.define('saas.view.document.product.panel.FormModel', {
-    extend: 'saas.view.core.form.FormPanelModel',
-    alias: 'viewmodel.product-panel-formpanel',
-
-    
-});

frontend/saas-web/app/view/document/vendor/BasePanel.js

@@ -0,0 +1,91 @@
+Ext.define('saas.view.document.vendor.BasePanel', {
+    extend: 'saas.view.core.base.BasePanel',
+    xtype: 'document-vendor-basepanel',
+    controller: 'document-vendor-basepanel',
+    viewModel: 'document-vendor-basepanel',
+
+    searchField:[{
+        xtype : "remotecombo", 
+        storeUrl:basePath+'ducument/vendorkind/getCombo',
+        name : "ve_type", 
+        emptyText : "请选择供应商类型", 
+        allowBlank : true, 
+        queryMode: 'local',
+        displayField: 'display',
+        valueField: 'value',
+        columnWidth : 0.25,
+        etc:{
+            vendorkind:{
+                keyField:'id',
+                dataField:'vk_name',
+                reqUrl:basePath+'ducument/vendorkind/save',
+                delUrl:basePath+'ducument/vendorkind/delete'
+            }
+        },
+        addHandler:function(b){
+            var form = this.ownerCmp.ownerCt.ownerCt;
+            this.dialog = form.getController().getView().add({
+                xtype: 'document-kind-childwin',
+                bind: {
+                    title: '新增供应商类型'
+                },
+                dataKind:'vendorkind',
+                belong:this.ownerCmp.etc['vendorkind'],
+                _parent:form,
+                record:null,
+                session: true
+            });
+            this.dialog.show();
+        }  
+    }],
+
+    //字段属性
+    _formXtype:'document-vendor-formpanel',
+    _title:'供应商资料',
+    // _dataUrl:basePath+'ducument/vendor/list',
+    _deleteUrl:basePath+'ducument/vendor/delete/',
+    _batchOpenUrl:basePath+'ducument/vendor/batchOpen',
+    _batchCloseUrl:basePath+'ducument/vendor/batchClose',
+    _batchDeleteUrl:basePath+'ducument/vendor/batchDelete',
+
+    gridConfig: {
+        idField: 'id',
+        codeField: 've_code',
+        dataUrl: basePath+'ducument/vendor/list',
+        columns : [{
+            text : "供应商id", 
+            width : 0, 
+            dataIndex : "id", 
+            xtype : "numbercolumn", 
+        },{
+            text : "供应商编号", 
+            width : 200.0, 
+            dataIndex : "ve_code", 
+            xtype : "", 
+        }, 
+        {
+            text : "供应商名称", 
+            dataIndex : "ve_name", 
+            width : 120.0, 
+            xtype : "", 
+        }, 
+        {
+            text : "供应商状态", 
+            dataIndex : "ve_status", 
+            width : 120.0, 
+            xtype : ""
+        }, 
+        {
+            text : "供应商UU", 
+            dataIndex : "ve_uu", 
+            width : 120.0, 
+            xtype : "",
+        }, 
+        {
+            text : "默认供应商联系人", 
+            dataIndex : "vc_name", 
+            flex : 1.0, 
+            xtype : "",
+        }]
+    },
+});

frontend/saas-web/app/view/document/vendor/BasePanelController.js

@@ -0,0 +1,10 @@
+Ext.define('saas.view.document.vendor.BasePanelController', {
+    extend: 'saas.view.core.base.BasePanelController',
+    alias: 'controller.document-vendor-basepanel',
+
+    init: function (form) {
+        var me = this;
+        this.control({
+        });
+    }
+});

frontend/saas-web/app/view/document/vendor/BasePanelModel.js

@@ -0,0 +1,4 @@
+Ext.define('saas.view.document.vendor.BasePanelModel', {
+    extend: 'saas.view.core.base.BasePanelModel',
+    alias: 'viewmodel.document-vendor-basepanel'
+});

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

@@ -1,6 +1,6 @@
-Ext.define('saas.view.document.vendor.panel.FormController', {
+Ext.define('saas.view.document.vendor.FormController', {
     extend: 'saas.view.core.form.FormPanelController',
-    alias: 'controller.vendor-panel-formpanel',
+    alias: 'controller.document-vendor-formpanel',
     init: function (form) {
         var me = this;
         this.control({});

frontend/saas-web/app/view/document/vendor/FormModel.js

@@ -0,0 +1,6 @@
+Ext.define('saas.view.document.vendor.FormModel', {
+    extend: 'saas.view.core.form.FormPanelModel',
+    alias: 'viewmodel.document-vendor-formpanel',
+
+    
+});

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

@@ -1,9 +1,9 @@
-Ext.define('saas.view.document.vendor.panel.FormPanel', {
+Ext.define('saas.view.document.vendor.FormPanel', {
     extend: 'saas.view.core.form.FormPanel',
-    xtype: 'vendor-panel-formpanel',
+    xtype: 'document-vendor-formpanel',
 
-    controller: 'vendor-panel-formpanel',
-    viewModel: 'vendor-panel-formpanel',
+    controller: 'document-vendor-formpanel',
+    viewModel: 'document-vendor-formpanel',
     
     caller:'Vendor',
 

frontend/saas-web/app/view/document/vendor/list/FormPanel.js

@@ -1,116 +0,0 @@
-Ext.define('saas.view.document.vendor.list.FormPanel', {
-    extend: 'saas.view.core.baseform.FormPanel',
-    xtype: 'vendor-list-formpanel',
-    controller: 'vendor-list-formpanel',
-    viewModel: 'vendor-list-formpanel',
-
-    //工具类
-    FormUtil: Ext.create('saas.util.FormUtil'),
-    BaseUtil: Ext.create('saas.util.BaseUtil'),
-
-    //基础属性
-    layout: 'fit',
-    autoScroll: true,
-    border: 1,
-
-    fieldDefaults: {
-        margin: '0 5 5 0',
-        labelAlign: 'right',
-        labelWidth: 90,
-        blankText: '该字段不能为空'
-    },
-
-    searchField:[{
-        xtype : "remotecombo", 
-        storeUrl:basePath+'ducument/vendorkind/getCombo',
-        name : "ve_type", 
-        emptyText : "请选择供应商类型", 
-        allowBlank : true, 
-        queryMode: 'local',
-        displayField: 'display',
-        valueField: 'value',
-        columnWidth : 0.25,
-        etc:{
-            vendorkind:{
-                keyField:'id',
-                dataField:'vk_name',
-                reqUrl:basePath+'ducument/vendorkind/save',
-                delUrl:basePath+'ducument/vendorkind/delete'
-            }
-        },
-        addHandler:function(b){
-            var form = this.ownerCmp.ownerCt.ownerCt;
-            this.dialog = form.getController().getView().add({
-                xtype: 'document-kind-childwin',
-                bind: {
-                    title: '新增供应商类型'
-                },
-                dataKind:'vendorkind',
-                belong:this.ownerCmp.etc['vendorkind'],
-                _parent:form,
-                record:null,
-                session: true
-            });
-            this.dialog.show();
-        }  
-    }],
-
-    //字段属性
-    _formXtype:'vendor-panel-formpanel',
-    _title:'供应商资料',
-    _dataUrl:basePath+'ducument/vendor/list',
-    _deleteUrl:basePath+'ducument/vendor/delete/',
-    _batchOpenUrl:basePath+'ducument/vendor/batchOpen',
-    _batchCloseUrl:basePath+'ducument/vendor/batchClose',
-    _batchDeleteUrl:basePath+'ducument/vendor/batchDelete',
-
-    initComponent: function () {
-        var me = this;
-        Ext.apply(me, {
-            items: [{
-                idField: 'id',
-                codeField: 've_code',
-                name : "baseGrid", 
-                xtype : "core-baseform-gridpanel", 
-                layout:'fit',
-                dataUrl:me._dataUrl,
-                columns : [{
-                    text : "供应商id", 
-                    width : 0, 
-                    dataIndex : "id", 
-                    xtype : "numbercolumn", 
-                },{
-                    text : "供应商编号", 
-                    width : 200.0, 
-                    dataIndex : "ve_code", 
-                    xtype : "", 
-                }, 
-                {
-                    text : "供应商名称", 
-                    dataIndex : "ve_name", 
-                    width : 120.0, 
-                    xtype : "", 
-                }, 
-                {
-                    text : "供应商状态", 
-                    dataIndex : "ve_status", 
-                    width : 120.0, 
-                    xtype : ""
-                }, 
-                {
-                    text : "供应商UU", 
-                    dataIndex : "ve_uu", 
-                    width : 120.0, 
-                    xtype : "",
-                }, 
-                {
-                    text : "默认供应商联系人", 
-                    dataIndex : "vc_name", 
-                    flex : 1.0, 
-                    xtype : "",
-                }]
-            }]
-        });
-        me.callParent(arguments);
-    }
-});

frontend/saas-web/app/view/document/vendor/list/FormPanelController.js

@@ -1,11 +0,0 @@
-Ext.define('saas.view.document.vendor.list.FormPanelController', {
-    extend: 'saas.view.core.baseform.FormPanelController',
-    BaseUtil: Ext.create('saas.util.BaseUtil'),
-    FormUtil: Ext.create('saas.util.FormUtil'),
-    alias: 'controller.vendor-list-formpanel',
-    init: function (form) {
-        var me = this;
-        this.control({
-        });
-    }
-});

frontend/saas-web/app/view/document/vendor/list/FormPanelModel.js

@@ -1,4 +0,0 @@
-Ext.define('saas.view.document.vendor.list.FormPanelModel', {
-    extend: 'saas.view.core.baseform.FormPanelModel',
-    alias: 'viewmodel.vendor-list-formpanel'
-});

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

@@ -1,6 +0,0 @@
-Ext.define('saas.view.document.vendor.panel.FormModel', {
-    extend: 'saas.view.core.form.FormPanelModel',
-    alias: 'viewmodel.vendor-panel-formpanel',
-
-    
-});

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

@@ -9,7 +9,7 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         //数据接口
-                        dataUrl: 'http://192.168.253.31:9480/customer/list',
+                        dataUrl: basePath + 'document/customer/list',
                         //赋值 
                         dbfinds:[{
                             from: 'id', to: 'rb_custid'

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

@@ -61,7 +61,7 @@ Ext.define('saas.view.money.paybalance.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath + 'document/product/getProductsByCondition',
+                        dataUrl:basePath + 'document/product/list',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                         }, {

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.31:9480/customer/list',
+                        dataUrl: basePath + 'document/customer/list',
                         //赋值 
                         dbfinds:[{
                             from: 'id', to: 'rb_custid'
@@ -64,7 +64,7 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         //数据接口
-                        dataUrl: 'http://192.168.253.31:9480/customer/list',
+                        dataUrl: basePath + 'document/customer/list',
                         //赋值 
                         dbfinds:[{
                             from: '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/list',
+                        dataUrl: basePath + 'document/vendor/list',
                         dbfinds:[{
                             from:'ve_code',to:'pu_vendcode'
                         },{
@@ -61,7 +61,7 @@ Ext.define('saas.view.money.recBalance.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:'http://192.168.253.41:9480/api/document/product/getProductsByCondition',
+                        dataUrl: basePath + 'document/product/list',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                         }, {

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

@@ -70,7 +70,7 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         //数据接口
-                        dataUrl:basePath+'document/product/getProductsByCondition',
+                        dataUrl: basePath + 'document/product/list',
                         //放大镜赋值设置
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode'
@@ -132,7 +132,7 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         //数据接口
-                        dataUrl:'http://192.168.253.31:9480/product/getProductsByCondition',
+                        dataUrl: basePath + 'document/product/list',
                         //放大镜赋值设置
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode'

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

@@ -61,7 +61,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath+'document/product/getProductsByCondition',
+                        dataUrl:basePath+'document/product/list',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                         }, {

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

@@ -15,21 +15,21 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
     _statusField: 'pi_status',
     _statusCodeField: 'pi_statuscode',
     
-    // _relationColumn: 'pd_piid',
-    // _readUrl:basePath+'purchase/prodinout/read/',
-    // _saveUrl:basePath+'purchase/prodinout/save',
-    // _auditUrl:basePath+'purchase/prodinout/audit',
-    // _deleteDetailUrl:basePath+'purchase/prodinout/deleteItem/',
-    // _baseVastUrl:basePath+'purchase/prodinout/',
-    // _turnOutUrl:basePath+'purchase/prodinout/turnProdOut/',
-
     _relationColumn: 'pd_piid',
-    _readUrl:'http://localhost:8800/prodinout/read/',
-    _saveUrl:'http://localhost:8800/prodinout/save',
-    _auditUrl:'http://localhost:8800/prodinout/audit',
-    _deleteUrl:'http://localhost:8800/prodinout/delete/',
-    _baseVastUrl:'http://localhost:8800/prodinout/',
-    _turnOutUrl:'http://localhost:8800/prodinout/turnProdOut/',
+    _readUrl:basePath+'purchase/prodinout/read/',
+    _saveUrl:basePath+'purchase/prodinout/save',
+    _auditUrl:basePath+'purchase/prodinout/audit',
+    _deleteDetailUrl:basePath+'purchase/prodinout/deleteItem/',
+    _baseVastUrl:basePath+'purchase/prodinout/',
+    _turnOutUrl:basePath+'purchase/prodinout/turnProdOut/',
+
+    // _relationColumn: 'pd_piid',
+    // _readUrl:'http://localhost:8800/prodinout/read/',
+    // _saveUrl:'http://localhost:8800/prodinout/save',
+    // _auditUrl:'http://localhost:8800/prodinout/audit',
+    // _deleteUrl:'http://localhost:8800/prodinout/delete/',
+    // _baseVastUrl:'http://localhost:8800/prodinout/',
+    // _turnOutUrl:'http://localhost:8800/prodinout/turnProdOut/',
 
 
 
@@ -115,7 +115,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
         storeModel:'saas.model.document.ProductDTO',
         _deleteDetailUrl:'http://localhost:8800/prodinout/deleteItem/',
         // _deleteUrl:basePath+'purchase/prodinout/delete/',
-        _detnoColumn:  'pd_pdno',
+        detnoColumn:  'pd_pdno',
         columns : [
             {
                 text : "id", 

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

@@ -70,7 +70,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
             'dbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        // dataUrl:basePath+'document/product/getProductsByCondition',
+                        // dataUrl:basePath+'document/product/list',
                         dataUrl:'http://localhost:9480/product/list',
                         dbfinds:[{
                             from:'id',to:'pd_prodid'                          

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

@@ -61,7 +61,7 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath+'document/product/getProductsByCondition',
+                        dataUrl:basePath+'document/product/list',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                             from:'pr_unit',to:'pd_unit'

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

@@ -70,7 +70,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
             'dbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        // dataUrl:basePath+'document/product/getProductsByCondition',
+                        // dataUrl:basePath+'document/product/list',
                         dataUrl:'http://localhost:9480/product/list',
                         dbfinds:[{
                             from:'id',to:'pd_prodid'                          

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

@@ -61,7 +61,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath+'document/product/getProductsByCondition',
+                        dataUrl:basePath+'document/product/list',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                             from:'pr_unit',to:'pd_unit'

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

@@ -62,7 +62,7 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath+'document/product/getProductsByCondition',
+                        dataUrl:basePath+'document/product/list',
                         dbfinds:[
                         {
                             from:'pr_code',to:'sd_prodcode'

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

@@ -62,7 +62,7 @@ Ext.define('saas.view.sale.sale.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath+'document/product/getProductsByCondition',
+                        dataUrl:basePath+'document/product/list',
                         dbfinds:[{
                             from:'pr_code',to:'sd_prodcode',
                             from:'pr_detail',to:'pr_detail'

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

@@ -63,7 +63,7 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath+'document/product/getProductsByCondition',
+                        dataUrl:basePath+'document/product/list',
                         dbfinds:[
                         {
                             from:'id',to:'pd_prodid'

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

@@ -64,7 +64,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath+'document/product/getProductsByCondition',
+                        dataUrl:basePath+'document/product/list',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode'
                         }, {

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

@@ -64,7 +64,7 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath+'document/product/getProductsByCondition',
+                        dataUrl:basePath+'document/product/list',
                         dbfinds:[
                         {
                             from:'id',to:'pd_prodid'

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

@@ -65,7 +65,7 @@ Ext.define('saas.view.sale.saleout.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath+'document/product/getProductsByCondition',
+                        dataUrl:basePath+'document/product/list',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode'
                         }, {

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

@@ -15,19 +15,19 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
      _statusField: 'pi_status',
      _statusCodeField: 'pi_statuscode',
      
-    //  _relationColumn: 'pd_piid',
-    //  _readUrl:basePath+'storage/prodinout/read/',
-    //  _saveUrl:basePath+'storage/prodinout/save',
-    //  _auditUrl:basePath+'storage/prodinout/audit',
-    //  _deleteUrl:basePath+'storage/prodinout/delete/',
+     _relationColumn: 'pd_piid',
+     _readUrl:basePath+'storage/prodinout/read/',
+     _saveUrl:basePath+'storage/prodinout/save',
+     _auditUrl:basePath+'storage/prodinout/audit',
+     _deleteUrl:basePath+'storage/prodinout/delete/',
 
 
-     _relationColumn: 'pd_piid',
-     _readUrl:'http://localhost:9000/prodinout/read/',
-     _saveUrl:'http://localhost:9000/prodinout/save',
-     _auditUrl:'http://localhost:9000/prodinout/audit',
-     _deleteUrl:'http://localhost:9000/prodinout/delete/',
-     _baseVastUrl:'http://localhost:9000/prodinout/',
+    //  _relationColumn: 'pd_piid',
+    //  _readUrl:'http://localhost:9000/prodinout/read/',
+    //  _saveUrl:'http://localhost:9000/prodinout/save',
+    //  _auditUrl:'http://localhost:9000/prodinout/audit',
+    //  _deleteUrl:'http://localhost:9000/prodinout/delete/',
+    //  _baseVastUrl:'http://localhost:9000/prodinout/',
 
 
 

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

@@ -15,8 +15,8 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
             'dbfindtrigger[name=pu_vendcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        // dataUrl:basePath+'document/vendor/getVendorsByCondition',
-                        dataUrl:'http://localhost:9480/vendor/list',
+                        dataUrl:basePath+'document/vendor/list',
+                        // dataUrl:'http://localhost:9480/vendor/list',
                         dbfinds:[{
                             from:'ve_id',to:'pi_vendid'
                         },{
@@ -69,8 +69,8 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
             'dbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        // dataUrl:basePath+'document/product/getProductsByCondition',
-                        dataUrl:'http://localhost:9480/product/list',
+                        dataUrl:basePath+'document/product/list',
+                        // dataUrl:'http://localhost:9480/product/list',
                         dbfinds:[{
                             from:'id',to:'pd_prodid'                          
                         },{
@@ -130,8 +130,8 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
            'dbfindtrigger[name=pd_whname]':{
             beforerender:function(f){
                 Ext.apply(f,{
-                    // dataUrl:basePath+'document/warehouse/list',
-                    dataUrl:'http://localhost:9480/warehouse/list',
+                    dataUrl:basePath+'document/warehouse/list',
+                    // dataUrl:'http://localhost:9480/warehouse/list',
                     dbfinds:[{
                         from:'id',to:'pd_whid'                          
                     },{
@@ -173,8 +173,8 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
         'dbfindtrigger[name=pd_inwhname]':{
          beforerender:function(f){
              Ext.apply(f,{
-                 // dataUrl:basePath+'document/warehouse/list',
-                 dataUrl:'http://localhost:9480/warehouse/list',
+                 dataUrl:basePath+'document/warehouse/list',
+                //  dataUrl:'http://localhost:9480/warehouse/list',
                  dbfinds:[{
                      from:'id',to:'pd_inwhid'                          
                  },{

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

@@ -60,7 +60,7 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath + 'document/product/getProductsByCondition',
+                        dataUrl:basePath + 'document/product/list',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                             from:'pr_detail',to:'pr_detail'

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

@@ -70,7 +70,7 @@ Ext.define('saas.view.stock.make.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         //数据接口
-                        dataUrl:basePath+'document/product/getProductsByCondition',
+                        dataUrl:basePath+'document/product/list',
                         //放大镜赋值设置
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode'
@@ -132,7 +132,8 @@ Ext.define('saas.view.stock.make.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         //数据接口
-                        dataUrl:'http://192.168.253.31:9480/product/getProductsByCondition',
+                        dataUrl: basePath + 'document/product/list',
+                        // dataUrl:'http://192.168.253.31:9480/product/list',
                         //放大镜赋值设置
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode'

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

@@ -61,7 +61,7 @@ Ext.define('saas.view.stock.make.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath+'document/product/getProductsByCondition',
+                        dataUrl:basePath+'document/product/list',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                         }, {

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

@@ -15,19 +15,19 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
      _statusField: 'pi_status',
      _statusCodeField: 'pi_statuscode',
      
-    //  _relationColumn: 'pd_piid',
-    // _readUrl:basePath+'storage/prodinout/read/',
-    // _saveUrl:basePath+'storage/prodinout/save',
-    // _auditUrl:basePath+'storage/prodinout/audit',
-    // _deleteUrl:basePath+'storage/prodinout/delete/',
-    // _deleteDetailUrl:basePath+'storage/prodinout/deleteItem/',
+     _relationColumn: 'pd_piid',
+    _readUrl:basePath+'storage/prodinout/read/',
+    _saveUrl:basePath+'storage/prodinout/save',
+    _auditUrl:basePath+'storage/prodinout/audit',
+    _deleteUrl:basePath+'storage/prodinout/delete/',
+    _deleteDetailUrl:basePath+'storage/prodinout/deleteItem/',
 
-    _relationColumn: 'pd_piid',
-    _readUrl:'http://localhost:9000/prodinout/read/',
-    _saveUrl:'http://localhost:9000/prodinout/save',
-    _auditUrl:'http://localhost:9000/prodinout/audit',
-    _deleteUrl:'http://localhost:9000/prodinout/delete/',
-    _baseVastUrl:'http://localhost:9000/prodinout/',
+    // _relationColumn: 'pd_piid',
+    // _readUrl:'http://localhost:9000/prodinout/read/',
+    // _saveUrl:'http://localhost:9000/prodinout/save',
+    // _auditUrl:'http://localhost:9000/prodinout/audit',
+    // _deleteUrl:'http://localhost:9000/prodinout/delete/',
+    // _baseVastUrl:'http://localhost:9000/prodinout/',
 
 
     initId:0,

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

@@ -15,8 +15,8 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
         'dbfindtrigger[name=pu_vendcode]':{
             beforerender:function(f){
                 Ext.apply(f,{
-                    // dataUrl:basePath+'document/vendor/getVendorsByCondition',
-                    dataUrl:'http://localhost:9480/vendor/list',
+                    dataUrl:basePath+'document/vendor/list',
+                    // dataUrl:'http://localhost:9480/vendor/list',
                     dbfinds:[{
                         from:'ve_id',to:'pi_vendid'
                     },{
@@ -69,8 +69,8 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
             'dbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        // dataUrl:basePath+'document/product/getProductsByCondition',
-                        dataUrl:'http://localhost:9480/product/list',
+                        dataUrl:basePath+'document/product/list',
+                        // dataUrl:'http://localhost:9480/product/list',
                         dbfinds:[{
                             from:'id',to:'pd_prodid'                          
                         },{
@@ -130,8 +130,8 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
            'dbfindtrigger[name=pd_whname]':{
             beforerender:function(f){
                 Ext.apply(f,{
-                    // dataUrl:basePath+'document/warehouse/list',
-                    dataUrl:'http://localhost:9480/warehouse/list',
+                    dataUrl:basePath+'document/warehouse/list',
+                    // dataUrl:'http://localhost:9480/warehouse/list',
                     dbfinds:[{
                         from:'id',to:'pd_whid'                          
                     },{

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

@@ -60,7 +60,7 @@ Ext.define('saas.view.stock.otherIn.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath + 'document/product/getProductsByCondition',
+                        dataUrl:basePath + 'document/product/list',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                             from:'pr_detail',to:'pr_detail'

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

@@ -15,19 +15,19 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
      _statusField: 'pi_status',
      _statusCodeField: 'pi_statuscode',
      
-    //  _relationColumn: 'pd_piid',
-    //  _readUrl:basePath+'storage/prodinout/read/',
-    // _saveUrl:basePath+'storage/prodinout/save',
-    // _auditUrl:basePath+'storage/prodinout/audit',
-    // _deleteUrl:basePath+'storage/prodinout/delete/',
-    // _deleteDetailUrl:basePath+'storage/prodinout/deleteItem/',
+     _relationColumn: 'pd_piid',
+     _readUrl:basePath+'storage/prodinout/read/',
+    _saveUrl:basePath+'storage/prodinout/save',
+    _auditUrl:basePath+'storage/prodinout/audit',
+    _deleteUrl:basePath+'storage/prodinout/delete/',
+    _deleteDetailUrl:basePath+'storage/prodinout/deleteItem/',
 
-    _relationColumn: 'pd_piid',
-    _readUrl:'http://localhost:9000/prodinout/read/',
-    _saveUrl:'http://localhost:9000/prodinout/save',
-    _auditUrl:'http://localhost:9000/prodinout/audit',
-    _deleteUrl:'http://localhost:9000/prodinout/delete/',
-    _baseVastUrl:'http://localhost:9000/prodinout/',
+    // _relationColumn: 'pd_piid',
+    // _readUrl:'http://localhost:9000/prodinout/read/',
+    // _saveUrl:'http://localhost:9000/prodinout/save',
+    // _auditUrl:'http://localhost:9000/prodinout/audit',
+    // _deleteUrl:'http://localhost:9000/prodinout/delete/',
+    // _baseVastUrl:'http://localhost:9000/prodinout/',
 
 
 

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

@@ -14,8 +14,8 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
         'dbfindtrigger[name=pu_vendcode]':{
             beforerender:function(f){
                 Ext.apply(f,{
-                    // dataUrl:basePath+'document/vendor/getVendorsByCondition',
-                    dataUrl:'http://localhost:9480/vendor/list',
+                    dataUrl:basePath+'document/vendor/list',
+                    // dataUrl:'http://localhost:9480/vendor/list',
                     dbfinds:[{
                         from:'ve_id',to:'pi_vendid'
                     },{
@@ -68,8 +68,8 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
            'dbfindtrigger[name=pd_prodcode]':{
             beforerender:function(f){
                 Ext.apply(f,{
-                    // dataUrl:basePath+'document/product/getProductsByCondition',
-                    dataUrl:'http://localhost:9480/product/list',
+                    dataUrl:basePath+'document/product/list',
+                    // dataUrl:'http://localhost:9480/product/list',
                     dbfinds:[{
                         from:'id',to:'pd_prodid'                          
                     },{
@@ -128,8 +128,8 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
         'dbfindtrigger[name=pd_whname]':{
          beforerender:function(f){
              Ext.apply(f,{
-                 // dataUrl:basePath+'document/warehouse/list',
-                 dataUrl:'http://localhost:9480/warehouse/list',
+                 dataUrl:basePath+'document/warehouse/list',
+                //  dataUrl:'http://localhost:9480/warehouse/list',
                  dbfinds:[{
                      from:'id',to:'pd_whid'                          
                  },{

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

@@ -60,7 +60,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'pr_code',
-                        dataUrl:basePath + 'document/product/getProductsByCondition',
+                        dataUrl:basePath + 'document/product/list',
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode',
                             from:'pr_detail',to:'pr_detail'

frontend/saas-web/resources/json/navigation.json

@@ -167,20 +167,20 @@
         "items": [{
             "id":"vendor-list-formpanel",
             "text": "供应商资料",
-            "viewType": "vendor-list-formpanel",
-            "addType":"vendor-panel-formpanel",
+            "viewType": "document-vendor-basepanel",
+            "addType":"document-vendor-formpanel",
             "leaf": true
         }, {
             "id":"customer-list-formpanel",
             "text": "客户资料",
-            "viewType": "customer-list-formpanel",
-            "addType":"customer-panel-formpanel",
+            "viewType": "document-customer-basepanel",
+            "addType":"document-customer-formpanel",
             "leaf": true
         }, {
             "id":"product-list-formpanel",
             "text": "物料资料",
-            "viewType": "product-list-formpanel",
-            "addType":"product-panel-formpanel",
+            "viewType": "document-product-basepanel",
+            "addType":"document-product-formpanel",
             "leaf": true
         }, {
             "id":"other-storeinformation",
@@ -189,7 +189,8 @@
             "leaf": true
         }, {
             "text": "BOM资料",
-            "viewType": "document-bom-formpanel",
+            "viewType": "document-bom-basepanel",
+            "addTyep": "document-bom-formpanel",
             "leaf": true
         }, {
             "id":"other-bankinformation",