资金模块-恢复审核方法，调整字段名称

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

@@ -3,6 +3,7 @@ package com.usoftchina.saas.money.service.impl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
+import com.usoftchina.saas.commons.api.CommonService;
 import com.usoftchina.saas.commons.api.MaxnumberService;
 import com.usoftchina.saas.commons.api.MessageLogService;
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
@@ -46,6 +47,8 @@ public class OthreceiptsServiceImpl extends CommonBaseServiceImpl<OthreceiptsMap
     private StatsinfoMapper statsinfoMapper;
     @Autowired
     private MessageLogService messageLogService;
+//    @Autowired
+//    private CommonService commonService;
 
     @Override
     public DocBaseDTO insert(Othte othte) {
@@ -126,6 +129,9 @@ public class OthreceiptsServiceImpl extends CommonBaseServiceImpl<OthreceiptsMap
         }
 
         DocBaseDTO baseDTO = getBaseDTOById(id);
+//        commonService.commonAudit(BillCodeSeq.RECBALANCE.getCaller(),
+//                "rb_id="+baseDTO.getId(),"rb_status","rb_statuscode",
+//                "rb_auditdate","rb_auditman");
         //日志记录
         messageLogService.save(baseDTO);
         return baseDTO;

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

@@ -47,8 +47,8 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
     private StatsinfoMapper statsinfoMapper;
     @Autowired
     private MessageLogService messageLogService;
-    @Autowired
-    private CommonService commonService;
+//    @Autowired
+//    private CommonService commonService;
 
 
     public DocBaseDTO insert(Pay pay) {
@@ -178,6 +178,8 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
         Long companyId = BaseContextHolder.getCompanyId();
         Paybalance paybalance = pay.getMain();
         paybalance.setCompanyId(companyId);
+        paybalance.setPb_status(Status.AUDITED.getDisplay());
+        paybalance.setPb_statuscode(Status.AUDITED.name());
         Subledger subledger = this.changSubledgerUntil(paybalance);
         if (subledger.getSl_code() == null){
             subledgerMapper.insertSelective(subledger);
@@ -264,9 +266,9 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
             statsinfoMapper.update(statsinfo);
         }
         DocBaseDTO baseDTO = getBaseDTOById(id);
-        commonService.commonAudit(BillCodeSeq.PAYBALANCE.getCaller(),
-                "pb_id='+baseDTO.getId()","pb_status","pb_statuscode",
-                "pb_auditdate","pb_auditman");
+//        commonService.commonAudit(BillCodeSeq.PAYBALANCE.getCaller(),
+//                "pb_id="+baseDTO.getId(),"pb_status","pb_statuscode",
+//                "pb_auditdate","pb_auditman");
         //日志记录
         messageLogService.save(baseDTO);
         return baseDTO;

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

@@ -213,6 +213,8 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
         Long companyId = BaseContextHolder.getCompanyId();
         Recbalance recbalance = rec.getMain();
         recbalance.setCompanyId(companyId);
+        recbalance.setRb_status(Status.AUDITED.getDisplay());
+        recbalance.setRb_statuscode(Status.AUDITED.name());
         Subledger subledger = this.changSubledgerUntil(recbalance);
         if (subledger.getSl_code() == null){
             subledgerMapper.insertSelective(subledger);
@@ -300,9 +302,9 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
             statsinfoMapper.update(statsinfo);
         }
         DocBaseDTO baseDTO = getBaseDTOById(id);
-        commonService.commonAudit(BillCodeSeq.RECBALANCE.getCaller(),
-                "rb_id="+baseDTO.getId(),"rb_status","rb_statuscode",
-                "rb_auditdate","rb_auditman");
+//        commonService.commonAudit(BillCodeSeq.RECBALANCE.getCaller(),
+//                "rb_id="+baseDTO.getId(),"rb_status","rb_statuscode",
+//                "rb_auditdate","rb_auditman");
         //日志记录
         messageLogService.save(baseDTO);
         return baseDTO;

frontend/saas-web/app/view/money/fundtransfer/QueryPanel.js

@@ -10,7 +10,7 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
     queryFormItems: [{
         xtype : "textfield",
         name : "ft_code",
-        fieldLabel : "单号",
+        fieldLabel : "单据编号",
         columnWidth: 0.3
     },{
         xtype : "condatefield",

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

@@ -20,7 +20,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
    }, {
         xtype: 'textfield',
         name: 'or_code',
-        fieldLabel: '单号',
+        fieldLabel: '单据编号',
         columnWidth: 0.3
     }, {
         xtype: 'hidden',

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

@@ -20,7 +20,7 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
    }, {
         xtype : 'textfield',
         name : 'os_code',
-        fieldLabel : '单号',
+        fieldLabel : '单据编号',
         columnWidth: 0.3,
     }, {
         xtype: 'hidden',

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

@@ -59,7 +59,7 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
             xtype: 'numbercolumn',
             hidden:true
         }, {
-            text: '单号',
+            text: '单据编号',
             dataIndex: 'pb_code',
             width: 200
         }, {