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/model/money/RecBalance1.js

@@ -1,9 +1,13 @@
 Ext.define('saas.model.money.RecBalance1', {
     extend: 'saas.model.Base',
     fields: [
-        { name: 'rd_detno', type: 'number' },
+        { name: 'id', type: 'int' },
+        { name: 'rd_detno', type: 'int' },
+        { name: 'rd_ym', type: 'int' },
+        { name: 'rd_bankid', type: 'int' },
+        { name: 'rd_bankcode', type: 'string' },
         { name: 'rd_bankname', type: 'string' },
-        { name: 'rd_amount', type: 'number' },
+        { name: 'rd_amount', type: 'float' },
         { name: 'rd_paymethod', type: 'string' },
         { name: 'rd_paycode', type: 'string' },
         { name: 'rd_remark', type: 'string' }

frontend/saas-web/app/model/money/RecBalance2.js

@@ -1,14 +1,15 @@
 Ext.define('saas.model.money.RecBalance2', {
     extend: 'saas.model.Base',
     fields: [
-        { name: 'rbd_detno', type: 'number' },
+        { name: 'id', type: 'int' },
+        { name: 'rbd_detno', type: 'int' },
+        { name: 'rbd_ym', type: 'int' },
+        { name: 'rbd_slid', type: 'int' },
         { name: 'rbd_slcode', type: 'string' },
         { name: 'rbd_slkind', type: 'string' },
         { name: 'rbd_sldate', type: 'date' },
-        { name: 'rbd_amount', type: 'number' },
-        { name: 'rbd_remark', type: 'number' },
-        { name: 'pbd_nowbalance', type: 'number' },
-        { name: 'pbd_nowbalance', type: 'number' },
-        { name: 'pbd_nowbalance', type: 'number' }
+        { name: 'rbd_amount', type: 'float' },
+        { name: 'rbd_nowbalance', type: 'float' },
+        { name: 'rbd_remark', type: 'string' }
     ]
 });

frontend/saas-web/app/model/purchase/prodIODetail.js

@@ -36,6 +36,7 @@ Ext.define('saas.model.purchase.ProdIODetail', {
         { name: 'pd_yqty', type: 'int' },
         { name: 'pd_remark', type: 'string' },
         { name: 'pd_ioid', type: 'int' },
+        { name: 'pd_delivery', type: 'date' }
     ],
     //一对一映射
     associations: [{ type: 'hasOne', model: 'saas.model.document.Product', associationKey: 'product'}]

frontend/saas-web/app/util/BaseUtil.js

@@ -27,12 +27,12 @@ Ext.define('saas.util.BaseUtil', {
                 success: function (response, opts) {
                     var res = Ext.decode(response.responseText);
                     if(res.success) {
-                        return resolve(response);
+                        return resolve(res);
                     }else {
                         // Ext.toast(res.message || '请求错误');
                         console.error('server request failure with code ' + res.code + '.');
                         console.error('failure message: ' + res.message);
-                        return reject(response);
+                        return reject(res);
                     }
                 },
                 failure: function (response, opts) {

frontend/saas-web/app/util/FormUtil.js

@@ -23,8 +23,7 @@ Ext.define('saas.util.FormUtil', {
         brr = brr.concat(form.defaultItems);
 
         this.BaseUtil.request({url, async: false})
-        .then(function(response) {
-            var res = Ext.decode(response.responseText);
+        .then(function(res) {
             if(res.success) {
                 var config = res.data || true, items = defaultItems || [];
                 if(config) {
@@ -88,9 +87,8 @@ Ext.define('saas.util.FormUtil', {
         if(form.initId && form.initId!=0) {
             var url = form._readUrl + form.initId;
             me.BaseUtil.request({url })
-            .then(function(response) {
+            .then(function(res) {
                 form.setLoading(false);
-                var res = Ext.decode(response.responseText);
                 if(res.success) {
                     var d = res.data;
                     var o = {
@@ -123,9 +121,8 @@ Ext.define('saas.util.FormUtil', {
                     caller:form.caller
                 },
                 method: 'POST',
-            }).then(function(response) {
+            }).then(function(res) {
                 form.setLoading(false);
-                var res = Ext.decode(response.responseText);
                 if(res.success){
                     var code = res.data;
                     var viewModel = form.getViewModel();

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

@@ -179,8 +179,7 @@ Ext.define('saas.view.core.baseform.GridPanel', {
                         url: form._deleteUrl+id,
                         method: 'POST',
                     })
-                    .then(function(res) {
-                        var localJson = new Ext.decode(res.responseText);
+                    .then(function(localJson) {
                         if(localJson.success){
                             //解析参数
                             Ext.Msg.alert('提示','删除成功');

frontend/saas-web/app/view/core/form/FormPanelController.js

@@ -31,8 +31,7 @@ Ext.define('saas.view.core.form.FormPanelController', {
                 url: form._deleteUrl+id.value,
                 method: 'POST',
             })
-            .then(function(res) {
-                var localJson = new Ext.decode(res.responseText);
+            .then(function(localJson) {
                 if(localJson.success){
                     var mainTab = Ext.getCmp('main-tab-panel');
                     mainTab.getActiveTab().close();
@@ -111,15 +110,15 @@ Ext.define('saas.view.core.form.FormPanelController', {
             params: JSON.stringify(params),
             method: 'POST',
         })
-        .then(function(res) {
-            var localJson = new Ext.decode(res.responseText);
+        .then(function(localJson) {
             if(localJson.success){
                 Ext.toast('保存成功');
                 form.initId = localJson.data.id;
                 form.FormUtil.loadData(form);
             }
         })
-        .catch(function() {
+        .catch(function(e) {
+            console.error(e);
             Ext.toast('保存失败');
         });
     },
@@ -181,8 +180,7 @@ Ext.define('saas.view.core.form.FormPanelController', {
             params: JSON.stringify(params),
             method: 'POST',
         })
-        .then(function(res) {
-            var localJson = new Ext.decode(res.responseText);
+        .then(function(localJson) {
             if(localJson.success){
                 Ext.toast('审核成功');
                 form.initId = localJson.data.id;
@@ -190,8 +188,8 @@ Ext.define('saas.view.core.form.FormPanelController', {
                 viewModel.set('base.editable', false);
             }
         })
-        .catch(function() {
-            Ext.toast('审核失败');
+        .catch(function(res) {
+            Ext.toast('审核失败: ' + res.message);
         });
     },
     unAudit: function() {

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

@@ -219,8 +219,7 @@ Ext.define('saas.view.document.customer.panel.FormController', {
             params: '',
             method: 'POST',
         })
-        .then(function(res) {
-            var localJson = new Ext.decode(res.responseText);
+        .then(function(localJson) {
             if(localJson.success){
                 Ext.Msg.alert('提示','启用成功');
                 form.initId = localJson.data.id;
@@ -242,8 +241,7 @@ Ext.define('saas.view.document.customer.panel.FormController', {
             params: '',
             method: 'POST',
         })
-        .then(function(res) {
-            var localJson = new Ext.decode(res.responseText);
+        .then(function(localJson) {
             if(localJson.success){
                 Ext.Msg.alert('提示','禁用成功');
                 form.initId = localJson.data.id;

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

@@ -36,9 +36,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 name:'ck_name',
                 allowBlank:false,
                 fieldLabel:'类型'
-            }],
-            keyField:'id',
-            saveUrl:''
+            }]
         },
         vendorkind:{
             items:[{
@@ -49,7 +47,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 name:'vk_name',
                 allowBlank:false,
                 fieldLabel:'类型'
-            }],
+            }]
         },
         productkind:{
             items:[{
@@ -60,7 +58,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 name:'pt_name',
                 allowBlank:false,
                 fieldLabel:'类型'
-            }],
+            }]
         },
         bankinformation:{
             items:[{
@@ -86,7 +84,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 name:'bk_thisamount',
                 allowBlank:false,
                 fieldLabel:'当前金额'
-            }],
+            }]
         },
         productbrand:{
             items:[{
@@ -97,7 +95,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 name:'pb_name',
                 allowBlank:false,
                 fieldLabel:'类型'
-            }],
+            }]
         },
         inoutkind:{
             items:[{
@@ -142,23 +140,25 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
     onSave:function(){
         var belong = this.belong;
         var form=this.down('form');
-        var dataField = form.down('[name='+belong.dataField+']');
-        // if(!dataField.value){
-        //      Ext.Msg.alert('提示','数据有误');
-        //     return false;
-        // }
-        var keyField = form.down('[name='+belong.keyField+']');
-        //保存接口
         var params = {};
-        params[belong.dataField] = dataField.value;
-        params[belong.keyField] = keyField.value || 0;
+        var names = belong.columns.map(column => column.dataIndex);
+        Ext.Array.each(names,function(name) {
+            if(name){
+                var dataField = form.down('[name='+name+']');
+                if(dataField&&dataField.value){
+                    params[name] = dataField.value;
+                }
+            }
+        });
+        var idField = form.down('[name='+belong.keyField+']');
+        params[belong.keyField] = idField.value || 0;
+        //保存接口
         this.BaseUtil.request({
             url: belong.reqUrl,
             params: JSON.stringify(params),
             method: 'POST',
         })
-        .then(function(res) {
-            var localJson = new Ext.decode(res.responseText);
+        .then(function(localJson) {
             if(localJson.success){
                 Ext.Msg.alert('提示','保存成功');
                 var grid = form.ownerCt._parent.lookup('document-kind-Grid');

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

@@ -67,7 +67,6 @@ Ext.define('saas.view.document.kind.Kind', {
                 flex: 1
             }],
             keyField:'id',
-            dataField:'ck_name',
             reqUrl:basePath + 'document/customerkind/save',
             delUrl:basePath + 'document/customerkind/delete'
         },
@@ -78,7 +77,6 @@ Ext.define('saas.view.document.kind.Kind', {
                 flex: 1
             }],
             keyField:'id',
-            dataField:'vk_name',
             reqUrl:basePath + 'document/vendorkind/save',
             delUrl:basePath + 'document/vendorkind/delete'
         },
@@ -89,7 +87,6 @@ Ext.define('saas.view.document.kind.Kind', {
                 flex: 1
             }],
             keyField:'id',
-            dataField:'pt_name',
             reqUrl:basePath + 'document/producttype/save',
             delUrl:basePath + 'document/producttype/delete'
         },
@@ -100,7 +97,6 @@ Ext.define('saas.view.document.kind.Kind', {
                 flex: 1
             }],
             keyField:'id',
-            dataField:'pb_name',
             reqUrl:basePath + 'document/productbrand/save',
             delUrl:basePath + 'document/productbrand/delete'
         },
@@ -142,7 +138,6 @@ Ext.define('saas.view.document.kind.Kind', {
                 flex: 1
             }],
             keyField:'id',
-            dataField:'ft_name',
             reqUrl: 'http://192.168.253.31:9480/fundinouttype/save',
             delUrl: 'http://192.168.253.31:9480/fundinouttype/delete'
         }

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

@@ -65,10 +65,8 @@ Ext.define('saas.view.document.kind.KindController', {
     },
     onEdit:function(grid,row,col){
         var me=this,
-            view=me.getView(),
             dataKind=me.getViewModel().getData()['dataKind'].value;
             rec = grid.getStore().getAt(row);
-        var keyField=rec.get(view.etc[dataKind].keyField);
         this.createDialog(dataKind,rec);
     },
     onDelete:function(grid,row,col){
@@ -82,8 +80,7 @@ Ext.define('saas.view.document.kind.KindController', {
             url: view.etc[dataKind].delUrl+'/'+keyV,
             method: 'POST'
         })
-        .then(function(res) {
-            var localJson = new Ext.decode(res.responseText);
+        .then(function(localJson) {
             if(localJson.success){
                 Ext.Msg.alert('提示','删除成功');
                 grid.store.load();

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

@@ -109,7 +109,7 @@ Ext.define('saas.view.document.kind.KindModel', {
             autoLoad: false
         },
         inoutkind:{ 
-        fields:[
+            fields:[
                 {name: 'id', type: 'int'},
                 {name: 'ft_type',  type: 'string'},
                 {name: 'ft_name',  type: 'string'}
@@ -128,5 +128,26 @@ Ext.define('saas.view.document.kind.KindModel', {
             pageSize: null,
             autoLoad: false
         },
+        storeinformation: {
+            fields:[
+                {name: 'id', type: 'int'},
+                {name: 'wh_code',  type: 'string'},
+                {name: 'wh_description',  type: 'string'},
+                {name: 'wh_statuscode',  type: 'string'}
+            ],
+            proxy: {
+                type: 'ajax',
+                url: basePath + 'document/customerkind/getAll',
+                actionMethods: {
+                    read: 'GET'
+                },
+                reader: {
+                    type: 'json',
+                    rootProperty: 'data'
+                }
+            },
+            pageSize: null,
+            autoLoad: false
+        }
     }
 });

frontend/saas-web/app/view/document/other/StoreInformation.js

@@ -0,0 +1,20 @@
+Ext.define('saas.view.document.other.StoreInformation', {
+    extend: 'saas.view.document.kind.Kind',
+    xtype: 'other-storeinformation',
+    autoScroll: true,
+    layout:'fit',
+    defaultType:'storeinformation',
+    tbar: ['->',{
+        xtype:'button',
+        text:'新增',
+        listeners: {
+            click: 'onAdd'
+        }
+    },{
+        xtype:'button',
+        text:'刷新',
+        listeners: {
+            click: 'onRefresh'
+        }
+    }]
+})

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

@@ -219,8 +219,7 @@ Ext.define('saas.view.document.product.panel.FormController', {
             params: '',
             method: 'POST',
         })
-        .then(function(res) {
-            var localJson = new Ext.decode(res.responseText);
+        .then(function(localJson) {
             if(localJson.success){
                 Ext.Msg.alert('提示','启用成功');
                 form.initId = localJson.data.id;
@@ -242,8 +241,7 @@ Ext.define('saas.view.document.product.panel.FormController', {
             params: '',
             method: 'POST',
         })
-        .then(function(res) {
-            var localJson = new Ext.decode(res.responseText);
+        .then(function(localJson) {
             if(localJson.success){
                 Ext.Msg.alert('提示','禁用成功');
                 form.initId = localJson.data.id;

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

@@ -219,8 +219,7 @@ Ext.define('saas.view.document.vendor.panel.FormController', {
             params: '',
             method: 'POST',
         })
-        .then(function(res) {
-            var localJson = new Ext.decode(res.responseText);
+        .then(function(localJson) {
             if(localJson.success){
                 Ext.Msg.alert('提示','启用成功');
                 form.initId = localJson.data.id;
@@ -242,8 +241,7 @@ Ext.define('saas.view.document.vendor.panel.FormController', {
             params: '',
             method: 'POST',
         })
-        .then(function(res) {
-            var localJson = new Ext.decode(res.responseText);
+        .then(function(localJson) {
             if(localJson.success){
                 Ext.Msg.alert('提示','禁用成功');
                 form.initId = localJson.data.id;

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

@@ -149,7 +149,7 @@ Ext.define('saas.view.document.vendor.panel.FormPanel', {
         xtype : "detailGridField", 
         detnoColumn:  'vc_detno',
         storeModel:'saas.model.document.vendorcontact',
-        _deleteDetailUrl:'http://192.168.253.31:9480/vendor/deletecontact/',
+        _deleteDetailUrl:'http://192.168.253.31:9480/vendor/deleteContact/',
         columns : [
             {
                 text : "ID", 

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

@@ -187,14 +187,15 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                 xtype : "numbercolumn"
             }, 
             {
-                text : "未税金额", 
+                text : "未含税金额", 
                 dataIndex : "pd_taxtotal", 
+                width : 120.0, 
                 xtype : "numbercolumn"
             },{
                 text : "需求日期", 
                 dataIndex : "pd_delivery", 
-                flex : 1.0, 
                 xtype:'datecolumn',
+                width : 120.0, 
                 format : "Y-m-d H:i:s", 
                 editor : {
                     xtype : "datefield",
@@ -206,8 +207,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
             {
                 text : "关联销售单号", 
                 dataIndex : "pd_salecode", 
-                width : 120.0,
-                flex : 1.0
+                width : 120.0
             }
         ]
     }, {

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

@@ -200,8 +200,7 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
             url: form._turnInUrl+id.value,
             method: 'GET',
         })
-        .then(function(res) {
-            var localJson = new Ext.decode(res.responseText);
+        .then(function(localJson) {
             if(localJson.success){
                 Ext.Msg.alert('提示','转单成功');
               

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

@@ -158,8 +158,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
             url: form._turnOutUrl+id.value,
             method: 'GET',
         })
-        .then(function(res) {
-            var localJson = new Ext.decode(res.responseText);
+        .then(function(localJson) {
             if(localJson.success){
                 Ext.Msg.alert('提示','转单成功');
               

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

@@ -119,8 +119,7 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
             url: form._turnOutUrl+id.value,
             method: 'POST',
         })
-        .then(function(res) {
-            var localJson = new Ext.decode(res.responseText);
+        .then(function(localJson) {
             if(localJson.success){
                 Ext.Msg.alert('提示','转单成功');
             }

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

@@ -186,8 +186,7 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
             url: form._turnInUrl+id.value,
             method: 'GET',
         })
-        .then(function(res) {
-            var localJson = new Ext.decode(res.responseText);
+        .then(function(localJson) {
             if(localJson.success){
                 Ext.Msg.alert('提示','转单成功');
               

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

@@ -144,8 +144,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
             url: form._turnInUrl+id.value,
             method: 'GET',
         })
-        .then(function(res) {
-            var localJson = new Ext.decode(res.responseText);
+        .then(function(localJson) {
             if(localJson.success){
                 Ext.Msg.alert('提示','转单成功');
               

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

@@ -200,8 +200,7 @@ Ext.define('saas.view.stock.make.FormPanelController', {
             url: form._turnInUrl+id.value,
             method: 'GET',
         })
-        .then(function(res) {
-            var localJson = new Ext.decode(res.responseText);
+        .then(function(localJson) {
             if(localJson.success){
                 Ext.Msg.alert('提示','转单成功');
               

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

@@ -144,8 +144,7 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
             url: form._turnInUrl+id.value,
             method: 'GET',
         })
-        .then(function(res) {
-            var localJson = new Ext.decode(res.responseText);
+        .then(function(localJson) {
             if(localJson.success){
                 Ext.Msg.alert('提示','转单成功');
               

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

@@ -143,8 +143,7 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
             url: form._turnInUrl+id.value,
             method: 'GET',
         })
-        .then(function(res) {
-            var localJson = new Ext.decode(res.responseText);
+        .then(function(localJson) {
             if(localJson.success){
                 Ext.Msg.alert('提示','转单成功');