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

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/BankinformationServiceImpl.java

@@ -45,7 +45,6 @@ public class BankinformationServiceImpl extends CommonBaseServiceImpl<Bankinform
     @Override
     public boolean save(Bankinformation bankinformation){
         bankinformation.setCompanyId(BaseContextHolder.getCompanyId());
-        bankinformation.setBk_thisamount(bankinformation.getBk_beginamount());
         bankinformation.setBk_income(new Double(0));
         bankinformation.setBk_spending(new Double(0));
 
@@ -56,10 +55,11 @@ public class BankinformationServiceImpl extends CommonBaseServiceImpl<Bankinform
             if (bktion != null){
                 throw new BizException(500, BizExceptionCode.ACCOUNT_EXISTS.getMessage());
             }
+            bankinformation.setBk_thisamount(bankinformation.getBk_beginamount());
             bankinformationMapper.insertSelective(bankinformation);
         }else {
+            Long id = bankinformationMapper.selectBankId(bankinformation.getBk_bankcode());
             if (bktion != null){
-                Long id = bankinformationMapper.selectBankId(bankinformation.getBk_bankcode());
                 if (id.equals(bankinformation.getId())){
                     bankinformationMapper.updateByPrimaryKeySelective(bankinformation);
                 }else {

applications/document/document-server/src/main/resources/application.yml

@@ -47,7 +47,7 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@127.0.0.1:8500/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
 management:
   endpoints:
     web:

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/FundtransferServiceImpl.java

@@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
+import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
@@ -70,6 +71,7 @@ public class FundtransferServiceImpl extends CommonBaseServiceImpl<FundtransferM
         }else {
             fundtransfer.setCompanyId(BaseContextHolder.getCompanyId());
             fundtransfer.setFt_recorder(BaseContextHolder.getUserName());
+            fundtransfer.setCreatorName(BaseContextHolder.getUserName());
             fundtransferMapper.insertSelective(fundtransfer);
             id = fundtransfer.getId();
 
@@ -99,6 +101,8 @@ public class FundtransferServiceImpl extends CommonBaseServiceImpl<FundtransferM
         Fundtransfer fundtransfer = fundtran.getMain();
         fundtransfer.setFt_status(Status.AUDITED.getDisplay());
         fundtransfer.setFt_statuscode(Status.AUDITED.name());
+        fundtransfer.setFt_auditman(BaseContextHolder.getUserName());
+        fundtransfer.setFt_auditdate(new Date());
         fundtransfer.setCompanyId(companyId);
         this.changBankUntil(fundtran);
         DocBaseDTO docBaseDTO = this.insert(fundtran);
@@ -186,6 +190,8 @@ public class FundtransferServiceImpl extends CommonBaseServiceImpl<FundtransferM
         fundtransfer.setId(Long.valueOf(id));
         fundtransfer.setFt_status(com.usoftchina.saas.commons.po.Status.UNAUDITED.getDisplay());
         fundtransfer.setFt_statuscode(Status.UNAUDITED.name());
+        fundtransfer.setFt_auditman(null);
+        fundtransfer.setFt_auditdate(null);
         fundtransferMapper.updateByPrimaryKeySelective(fundtransfer);
 
         //删除中间表

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/OthreceiptsServiceImpl.java

@@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
+import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
@@ -78,6 +79,8 @@ public class OthreceiptsServiceImpl extends CommonBaseServiceImpl<OthreceiptsMap
         }else {
             othreceipts.setCompanyId(BaseContextHolder.getCompanyId());
             othreceipts.setOr_recorder(BaseContextHolder.getUserName());
+            othreceipts.setCreatorName(BaseContextHolder.getUserName());
+            othreceipts.setCreateTime(new Date());
             othreceiptsMapper.insertSelective(othreceipts);
             id = othreceipts.getId();
             baseDTO = getBaseDTOById(id);
@@ -106,6 +109,8 @@ public class OthreceiptsServiceImpl extends CommonBaseServiceImpl<OthreceiptsMap
         Othreceipts othreceipts = othte.getMain();
         othreceipts.setOr_status(Status.AUDITED.getDisplay());
         othreceipts.setOr_statuscode(Status.AUDITED.name());
+        othreceipts.setOr_auditman(BaseContextHolder.getUserName());
+        othreceipts.setOr_auditdate(new Date());
         this.changBankUntil(othte);
         DocBaseDTO docBaseDTO = this.insert(othte);
         Long id = docBaseDTO.getId();
@@ -197,6 +202,8 @@ public class OthreceiptsServiceImpl extends CommonBaseServiceImpl<OthreceiptsMap
         othreceipts.setId(Long.valueOf(id));
         othreceipts.setOr_status(com.usoftchina.saas.commons.po.Status.UNAUDITED.getDisplay());
         othreceipts.setOr_statuscode(Status.UNAUDITED.name());
+        othreceipts.setOr_auditman(null);
+        othreceipts.setOr_auditdate(null);
         othreceiptsMapper.updateByPrimaryKeySelective(othreceipts);
 
         //删除中间表

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/OthspendingsServiceImpl.java

@@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
+import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
@@ -73,6 +74,8 @@ public class OthspendingsServiceImpl extends CommonBaseServiceImpl<OthspendingsM
         }else {
             othspendings.setCompanyId(BaseContextHolder.getCompanyId());
             othspendings.setOs_recorder(BaseContextHolder.getUserName());
+            othspendings.setCreatorName(BaseContextHolder.getUserName());
+            othspendings.setCreateTime(new Date());
             othspendingsMapper.insertSelective(othspendings);
             id = othspendings.getId();
 
@@ -143,6 +146,8 @@ public class OthspendingsServiceImpl extends CommonBaseServiceImpl<OthspendingsM
         othspendings.setOs_status(Status.AUDITED.getDisplay());
         othspendings.setOs_statuscode(Status.AUDITED.name());
         othspendings.setCompanyId(companyId);
+        othspendings.setOs_auditdate(new Date());
+        othspendings.setOs_auditman(BaseContextHolder.getUserName());
         this.changBankUntil(othsp);
         DocBaseDTO docBaseDTO = this.insert(othsp);
         Long id = docBaseDTO.getId();
@@ -228,6 +233,8 @@ public class OthspendingsServiceImpl extends CommonBaseServiceImpl<OthspendingsM
         othspendings.setId(Long.valueOf(id));
         othspendings.setOs_status(com.usoftchina.saas.commons.po.Status.UNAUDITED.getDisplay());
         othspendings.setOs_statuscode(Status.UNAUDITED.name());
+        othspendings.setOs_auditman(null);
+        othspendings.setOs_auditdate(null);
         othspendingsMapper.updateByPrimaryKeySelective(othspendings);
 
         //删除中间表

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/PaybalanceServiceImpl.java

@@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
+import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
@@ -78,6 +79,8 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
         }else {
             paybalance.setCompanyId(BaseContextHolder.getCompanyId());
             paybalance.setPb_recorder(BaseContextHolder.getUserName());
+            paybalance.setCreatorName(BaseContextHolder.getUserName());
+            paybalance.setCreateTime(new Date());
             paybalanceMapper.insertSelective(paybalance);
             pbId = paybalance.getId();
             baseDTO = getBaseDTOById(pbId);
@@ -188,6 +191,9 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
         paybalance.setCompanyId(companyId);
         paybalance.setPb_status(Status.AUDITED.getDisplay());
         paybalance.setPb_statuscode(Status.AUDITED.name());
+        paybalance.setPb_auditman(BaseContextHolder.getUserName());
+        paybalance.setPb_auditdate(new Date());
+        pay.setMain(paybalance);
         Subledger subledger = this.changSubledgerUntil(paybalance);
         if (subledger.getSl_code() == null){
             subledgerMapper.insertSelective(subledger);
@@ -338,6 +344,8 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
         paybalance.setId(Long.valueOf(id));
         paybalance.setPb_status(com.usoftchina.saas.commons.po.Status.UNAUDITED.getDisplay());
         paybalance.setPb_statuscode(Status.UNAUDITED.name());
+        paybalance.setPb_auditman(null);
+        paybalance.setPb_auditdate(null);
         paybalanceMapper.updateByPrimaryKeySelective(paybalance);
 
         //删除中间表

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/RecbalanceServiceImpl.java

@@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
+import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
@@ -76,6 +77,8 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
         }else {
             recbalance.setCompanyId(BaseContextHolder.getCompanyId());
             recbalance.setRb_recorder(BaseContextHolder.getUserName());
+            recbalance.setCreatorName(BaseContextHolder.getUserName());
+            recbalance.setCreateTime(new Date());
             recbalanceMapper.insertSelective(recbalance);
             rbId = recbalance.getId();
 
@@ -224,6 +227,9 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
         recbalance.setCompanyId(companyId);
         recbalance.setRb_status(Status.AUDITED.getDisplay());
         recbalance.setRb_statuscode(Status.AUDITED.name());
+        recbalance.setRb_auditman(BaseContextHolder.getUserName());
+        recbalance.setRb_auditdate(new Date());
+        rec.setMain(recbalance);
         Subledger subledger = this.changSubledgerUntil(recbalance);
         if (subledger.getSl_code() == null){
             subledgerMapper.insertSelective(subledger);
@@ -363,6 +369,8 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
         recbalance.setId(id);
         recbalance.setRb_status(Status.UNAUDITED.getDisplay());
         recbalance.setRb_statuscode(Status.UNAUDITED.name());
+        recbalance.setRb_auditman(null);
+        recbalance.setRb_auditdate(null);
         recbalanceMapper.updateByPrimaryKeySelective(recbalance);
 
         //删除中间表

applications/money/money-server/src/main/resources/mapper/FundtransferMapper.xml

@@ -225,6 +225,8 @@
       <if test="ft_text5 != null" >
         ft_text5 = #{ft_text5,jdbcType=VARCHAR},
       </if>
+        ft_auditman = #{ft_auditman,jdbcType=VARCHAR},
+        ft_auditdate = #{ft_auditdate,jdbcType=TIMESTAMP}
     </set>
     where ft_id = #{id,jdbcType=INTEGER}
   </update>

applications/money/money-server/src/main/resources/mapper/OthreceiptsMapper.xml

@@ -300,6 +300,8 @@
       <if test="or_text5 != null" >
         or_text5 = #{or_text5,jdbcType=VARCHAR},
       </if>
+      or_auditman = #{or_auditman,jdbcType=VARCHAR},
+      or_auditdate = #{or_auditdate,jdbcType=TIMESTAMP}
     </set>
     where or_id = #{id,jdbcType=INTEGER}
   </update>

applications/money/money-server/src/main/resources/mapper/OthspendingsMapper.xml

@@ -295,6 +295,8 @@
       <if test="os_text5 != null" >
         os_text5 = #{os_text5,jdbcType=VARCHAR},
       </if>
+      os_auditman = #{os_auditman,jdbcType=VARCHAR},
+      os_auditdate = #{os_auditdate,jdbcType=TIMESTAMP}
     </set>
     where os_id = #{id,jdbcType=INTEGER}
   </update>

applications/money/money-server/src/main/resources/mapper/PaybalanceMapper.xml

@@ -414,6 +414,12 @@
       <if test="pb_text5 != null">
         pb_text5 = #{pb_text5,jdbcType=VARCHAR},
       </if>
+      <if test="pb_auditman !=null">
+        pb_auditman = #{pb_auditman,jdbcType=VARCHAR},
+      </if>
+      <if test="pb_auditdate !=null">
+        pb_auditdate = #{pb_auditdate,jdbcType=TIMESTAMP}
+      </if>
     </set>
     where pb_id = #{id,jdbcType=INTEGER}
   </update>

applications/money/money-server/src/main/resources/mapper/RecbalanceMapper.xml

@@ -581,6 +581,12 @@
       <if test="rb_text5 != null">
         rb_text5 = #{rb_text5,jdbcType=VARCHAR},
       </if>
+      <if test="rb_auditman !=null">
+        rb_auditman = #{rb_auditman,jdbcType=VARCHAR},
+      </if>
+    <if test="rb_auditdate !=null">
+      rb_auditdate = #{rb_auditdate,jdbcType=TIMESTAMP}
+    </if>
     </set>
     where rb_id = #{id,jdbcType=INTEGER}
   </update>

frontend/saas-web/app/view/core/dbfind/types/CustomerDbfindTrigger.js~2496f4a5e0d652d0a04afaa39f7ce066459fbea1

@@ -1,89 +0,0 @@
-/**
- * 客户资料放大镜
- */
-Ext.define('saas.view.core.dbfind.types.CustomerDbfindTrigger', {
-    extend: 'saas.view.core.dbfind.DbfindTrigger',
-    xtype: 'customerDbfindTrigger',
-
-    dataUrl: '/api/document/customer/dbfind',
-    addXtype: 'document-customer-formpanel',
-    addTitle: '客户资料',
-    defaultCondition: "cu_statuscode='OPEN'",
-    
-    dbtpls: [{
-        field: 'cu_code',
-        width: 100
-    }, {
-        field: 'cu_name',
-        width: 100
-    }],
-    dbSearchFields: [{
-        emptyText: '输入客户编号或客户名称',
-        xtype: "textfield",
-        name: "search",
-        getCondition: function (v) {
-            return "(upper(cu_code) like '%" + v.toUpperCase() + "%' or upper(cu_name) like '%" + v.toUpperCase() + "%')";
-        },
-        allowBlank: true,
-        columnWidth: 0.25
-    }],
-    dbColumns: [{
-        conditionCode: 'id',
-        text: "客户ID",
-        dataIndex: "id",
-        width: 0,
-        xtype: "",
-    }, {
-        conditionCode: 'cu_code',
-        text: "客户编号",
-        dataIndex: "cu_code",
-        width: 150,
-        xtype: "",
-    }, {
-        conditionCode: 'cu_name',
-        text: "客户名称",
-        dataIndex: "cu_name",
-        width: 180,
-        xtype: "",
-    }, {
-        conditionCode: 'cu_type',
-        text: "客户类型",
-        dataIndex: "cu_type",
-        width: 150,
-        xtype: "",
-    }, {
-        text: "业务员编号",
-        dataIndex: "cu_sellercode",
-        width:150
-    }, {
-        text: "业务员",
-        dataIndex: "cu_sellername",
-        width:180
-    }, {
-        text: "税率",
-        dataIndex: "cu_taxrate",
-        xtype: 'numbercolumn',
-        width:80,
-        renderer: function (v) {
-            return Ext.util.Format.number(v, '0');
-        }
-    }, {
-        text: "承付天数",
-        dataIndex: "cu_promisedays",
-        width:100,
-        xtype: 'numbercolumn',
-        renderer: function (v) {
-            return Ext.util.Format.number(v, '0');
-        }
-    }, {
-        text: "额度",
-        dataIndex: "cu_credit",
-        width:100,
-        xtype: 'numbercolumn',
-    }, {
-        text: "客户地址",
-        dataIndex: "ca_address",
-        width: 250
-    }]
-
-});

frontend/saas-web/app/view/core/dbfind/types/ProductDbfindTrigger.js~2496f4a5e0d652d0a04afaa39f7ce066459fbea1

@@ -1,110 +0,0 @@
-/**
- * 物料资料放大镜（单选）
- */
-Ext.define('saas.view.core.dbfind.types.ProductDbfindTrigger', {
-    extend: 'saas.view.core.dbfind.DbfindTrigger',
-    xtype: 'productDbfindTrigger',
-
-    dataUrl:'/api/document/product/list',
-    addXtype: 'document-product-formpanel',
-    addTitle: '物料资料',
-    dbtpls:[{
-        field:'pr_code',width:100
-    },{
-        field:'pr_detail',width:100
-    }],
-    defaultCondition: "pr_statuscode='OPEN'",
-    dbSearchFields:[{
-        emptyText:'输入物料编号、名称或规格',
-        xtype : "textfield", 
-        name : "search", 
-        width: 200,
-        getCondition: function(v) {
-            return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
-        },
-        allowBlank : true, 
-        columnWidth : 0.25
-    }],
-    dbColumns:[{
-        text: "物料ID",
-        hidden: true,
-        dataIndex: "id",
-    }, {
-        text: "物料编号",       
-        dataIndex: "pr_code",
-        width: 200,
-    }, {
-        text: "物料名称",
-        width: 200,
-        dataIndex: "pr_detail",
-    }, {
-        text: "规格",
-        dataIndex: "pr_spec",
-        width: 100,
-    }, {
-        text: "单位",
-        dataIndex: "pr_spec",
-        width: 100,
-    },{
-        text: "仓库id",
-        dataIndex: "pr_whid",
-        hidden: true,
-    },{
-        text: "仓库编号",
-        dataIndex: "pr_whcode",
-        hidden: true,
-    },{
-        text: "仓库",
-        dataIndex: "pr_whname",
-        width: 200,
-        hidden: true
-    },{
-        text: "总库存数",
-        dataIndex: "po_onhand",
-        width: 100,
-        xtype: 'numbercolumn',
-        renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join();
-            return Ext.util.Format.number(v, format);
-        },                            
-        align:'end'
-    },{
-        text: "类型",
-        dataIndex: "pr_kind",
-        width: 100,
-    },{
-        text: "型号",
-        dataIndex: "pr_orispeccode",
-        width: 100,
-    },{
-        text: "品牌",
-        dataIndex: "pr_brand",
-        width: 100,
-    },{
-        text: "供应商",
-        dataIndex: "pr_vendname",
-        width: 100,
-    },{
-        text: "最小包装",
-        dataIndex: "pr_zxbzs",
-        width: 100,
-        xtype: 'numbercolumn',
-        align: 'end',
-        renderer : function(v) {
-            if(!v) {
-                return 0;
-            }
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
-            var format = '0.' + xr.join();
-            return Ext.util.Format.number(v, format);
-        }
-    },{
-        text: "L/T",
-        dataIndex: "pr_leadtime",
-        width: 100,
-    }]
-
-});

frontend/saas-web/app/view/core/dbfind/types/VendorDbfindTrigger.js

@@ -73,15 +73,15 @@ Ext.define('saas.view.core.dbfind.types.VendorDbfindTrigger', {
         }
     }, {
         text: "纳税人识别号",
-        dataIndex: "ve_bankaccount",
+        dataIndex: "ve_nsrzh",
         width: 150
     }, {
         text: "开户银行",
-        dataIndex: "ve_bankaccount",
+        dataIndex: "ve_bankcode",
         width: 150
     }, {
         text: "银行账户",
-        dataIndex: "ve_bankcode",
+        dataIndex: "ve_bankaccount",
         width: 200
     }]
 

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

@@ -15,7 +15,7 @@ Ext.define('saas.view.core.query.QueryFormPanel', {
         labelAlign: 'right',
         labelWidth: 90,
         columnWidth: 0.25,
-        blankText: '该字段不能为空'
+        blankText: '该字段不能为空',
 	},
 
     dockedItems: [{
@@ -30,6 +30,19 @@ Ext.define('saas.view.core.query.QueryFormPanel', {
             text: '查询',
             handler: 'onQuery'
         },'->']
-    }]
+    }],
+
+    listeners: {
+        beforerender: function(form) {
+            var fiels = form.getForm().getFields();
+            fiels.each(function(f) {
+                f.on && f.on({
+                    keydown: {
+                        fn: 'onQuery',
+                    }
+                });
+            });
+        }
+    }
 
 });

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

@@ -13,7 +13,7 @@ Ext.define('saas.view.core.query.QueryPanelController', {
         });
         this.queryWin.show();
     },
-    onQuery: function (btn) {
+    onQuery: function () {
         var me = this,
         queryPanel = me.getView(),
         viewModel = me.getViewModel(),