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

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

@@ -305,17 +305,19 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
      */
     private void updateAuditSubledeger(Long id , Double nowBalance){
         Subledger subledger = subledgerMapper.selectByPrimaryKey(Math.toIntExact(id));
-        Subledger newSubledeger = new Subledger();
-        newSubledeger.setId(id);
-        Double newNamout = subledger.getSl_namount()==null?new Double(0):subledger.getSl_namount()-nowBalance;
-        Double newYamout = subledger.getSl_yamount()==null?new Double(0):subledger.getSl_yamount()+nowBalance;
-        newSubledeger.setSl_yamount(newYamout);
-        newSubledeger.setSl_namount(newNamout);
-        newSubledeger.setCompanyId(BaseContextHolder.getCompanyId());
-        newSubledeger.setUpdaterName(BaseContextHolder.getUserName());
-        newSubledeger.setUpdaterId(BaseContextHolder.getUserId());
-        newSubledeger.setUpdateTime(new Date());
-        subledgerMapper.updateByPrimaryKeySelective(newSubledeger);
+        if (subledger != null) {
+            Subledger newSubledeger = new Subledger();
+            newSubledeger.setId(id);
+            Double newNamout = subledger.getSl_namount() == null ? new Double(0) : subledger.getSl_namount() - nowBalance;
+            Double newYamout = subledger.getSl_yamount() == null ? new Double(0) : subledger.getSl_yamount() + nowBalance;
+            newSubledeger.setSl_yamount(newYamout);
+            newSubledeger.setSl_namount(newNamout);
+            newSubledeger.setCompanyId(BaseContextHolder.getCompanyId());
+            newSubledeger.setUpdaterName(BaseContextHolder.getUserName());
+            newSubledeger.setUpdaterId(BaseContextHolder.getUserId());
+            newSubledeger.setUpdateTime(new Date());
+            subledgerMapper.updateByPrimaryKeySelective(newSubledeger);
+        }
     }
     /**
      * 反审核更新来源单据的已核销，未核销
@@ -324,17 +326,19 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
      */
     private void updateResAuditSubledeger(Long id , Double nowBalance){
         Subledger subledger = subledgerMapper.selectByPrimaryKey(Math.toIntExact(id));
-        Subledger newSubledeger = new Subledger();
-        newSubledeger.setId(Long.valueOf(String.valueOf(id)));
-        Double newNamout = subledger.getSl_namount()==null?new Double(0):subledger.getSl_namount()+nowBalance;
-        Double newYamout = subledger.getSl_yamount()==null?new Double(0):subledger.getSl_yamount()-nowBalance;
-        newSubledeger.setSl_yamount(newYamout);
-        newSubledeger.setSl_namount(newNamout);
-        newSubledeger.setCompanyId(BaseContextHolder.getCompanyId());
-        newSubledeger.setUpdaterName(BaseContextHolder.getUserName());
-        newSubledeger.setUpdaterId(BaseContextHolder.getUserId());
-        newSubledeger.setUpdateTime(new Date());
-        subledgerMapper.updateByPrimaryKeySelective(newSubledeger);
+        if(subledger != null) {
+            Subledger newSubledeger = new Subledger();
+            newSubledeger.setId(Long.valueOf(String.valueOf(id)));
+            Double newNamout = subledger.getSl_namount() == null ? new Double(0) : subledger.getSl_namount() + nowBalance;
+            Double newYamout = subledger.getSl_yamount() == null ? new Double(0) : subledger.getSl_yamount() - nowBalance;
+            newSubledeger.setSl_yamount(newYamout);
+            newSubledeger.setSl_namount(newNamout);
+            newSubledeger.setCompanyId(BaseContextHolder.getCompanyId());
+            newSubledeger.setUpdaterName(BaseContextHolder.getUserName());
+            newSubledeger.setUpdaterId(BaseContextHolder.getUserId());
+            newSubledeger.setUpdateTime(new Date());
+            subledgerMapper.updateByPrimaryKeySelective(newSubledeger);
+        }
     }
     /**
      * 转换核销单类型

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

@@ -512,6 +512,8 @@ public class SaleServiceImpl implements SaleService{
         saleMapper.updateByPrimaryKeySelective(sale);
         prodIODetailMapper.updatePDSaleOut(pi_id);
         prodInOutMapper.updatePiTotal(pi_id);
+        //更新创建人
+        prodInOutMapper.updateCreator(BaseContextHolder.getUserId(), BaseContextHolder.getUserName(), pi_id);
         //日志记录
         DocBaseDTO log = new DocBaseDTO(id, sale.getSa_code(), BillCodeSeq.SALEOUT.getCaller());
         messageLogService.customizeLog(log, Operation.TURNPRODOUT);

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

@@ -54,8 +54,8 @@ Ext.define('saas.util.BaseUtil', {
          * @param title: 标题
          * 
          */
-        showSuccessToast: function (content, title) {
-            Ext.toast({
+        showSuccessToast: function (content, title, configs) {
+            Ext.toast(Ext.Object.merge({
                 cls:'x-toast-success',
                 html: content,
                 title: title,
@@ -64,11 +64,11 @@ Ext.define('saas.util.BaseUtil', {
                 autoCloseDelay:3000,
                 autoClose:true,
                 maxWidth: 400
-            });
+            }, configs));
         },
 
-        showErrorToast: function (content, title) {
-            Ext.toast({
+        showErrorToast: function (content, title, configs) {
+            Ext.toast(Ext.Object.merge({
                 cls:'x-toast-error',
                 html: content,
                 title: title,
@@ -77,7 +77,7 @@ Ext.define('saas.util.BaseUtil', {
                 autoCloseDelay:3000,
                 autoClose:true,
                 maxWidth: 400
-            });
+            }, configs));
         },
 
         /**

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

@@ -63,14 +63,14 @@ Ext.define('saas.view.core.form.FormPanelController', {
         main[form._statusCodeField] = auditTexts.unAuditCode;
         main[form._statusField] = auditTexts.unAuditText;
         //录入人，录入日期，审核人，审核日期清空
-        main['creatorId'] = null;
-        main['creatorName'] = null;
-        main['createTime'] = null;
-        main['updaterId'] = null;
-        main['updaterName'] = null;
-        main['updateTime'] = null;
-        main[form._auditmanField] = null;
-        main[form._auditdateField] = null;
+        main['creatorId'] = undefined;
+        main['creatorName'] = undefined;
+        main['createTime'] = undefined;
+        main['updaterId'] = undefined;
+        main['updaterName'] = undefined;
+        main['updateTime'] = undefined;
+        main[form._auditmanField] = undefined;
+        main[form._auditdateField] = undefined;
 
 
 

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

@@ -496,7 +496,6 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 fieldLabel: '联系电话',
                 name: 'em_mobile',
                 allowBlank:false,
-                beforeLabelTextTpl: '',
                 maxLength: 20
             },{
                 xtype:'textfield',

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

@@ -14,6 +14,8 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
      _codeField: 'ft_code',
      _statusField: 'ft_status',
      _statusCodeField: 'ft_statuscode',
+     _auditmanField: 'ft_auditman',
+     _auditdateField:'ft_auditdate',
      _relationColumn: 'ftd_ftid',
      _readUrl:'/api/money/fundtransfer/read',
      _saveUrl:'/api/money/fundtransfer/save',

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

@@ -14,6 +14,8 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
      _codeField: 'or_code',
      _statusField: 'or_status',
      _statusCodeField: 'or_statuscode',
+     _auditmanField: 'or_auditman',
+     _auditdateField:'or_auditdate',
      _relationColumn: 'ord_orid',
      _readUrl:'/api/money/othreceipts/read',
      _saveUrl:'/api/money/othreceipts/save',

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

@@ -14,6 +14,8 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
      _codeField: 'os_code',
      _statusField: 'os_status',
      _statusCodeField: 'os_statuscode',
+     _auditmanField: 'os_auditman',
+     _auditdateField:'os_auditdate',
      _relationColumn: 'osd_osid',
      _readUrl:'/api/money/othspendings/read',
      _saveUrl:'/api/money/othspendings/save',

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

@@ -14,7 +14,8 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
     _codeField: 'pb_code',
     _statusField: 'pb_status',
     _statusCodeField: 'pb_statuscode',
-    
+    _auditmanField: 'pb_auditman',
+    _auditdateField:'pb_auditdate',
     _readUrl: '/api/money/paybalance/read',
     _saveUrl: '/api/money/paybalance/save',
     _auditUrl: '/api/money/paybalance/audit',

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

@@ -15,7 +15,8 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
     _codeField: 'rb_code',
     _statusField: 'rb_status',
     _statusCodeField: 'rb_statuscode',
-    
+    _auditmanField: 'rb_auditman',
+    _auditdateField:'rb_auditdate',
     _readUrl: '/api/money/recbalance/read',
     _saveUrl: '/api/money/recbalance/save',
     _auditUrl: '/api/money/recbalance/audit',

frontend/saas-web/app/view/money/report/VendorCheck.js

@@ -61,11 +61,13 @@ Ext.define('saas.view.money.report.VendorCheck', {
     },{
         text:'供应商编号',
         dataIndex:'pi_vendcode',
-        width: 150
+        width: 150,
+        hidden:true
     },{
         text:'供应商名称',
         dataIndex:'pi_vendname',
-        width: 200
+        width: 200,
+        hidden:true
     },{
         text: '物料编号',
         dataIndex: 'pr_code',

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

@@ -16,7 +16,8 @@ Ext.define('saas.view.money.verification.FormPanel', {
     _codeField: 'vc_code',
     _statusField: 'vc_status',
     _statusCodeField: 'vc_statuscode',
-
+    _auditmanField: 'vc_auditman',
+    _auditdateField:'vc_auditdate',
     _readUrl: '/api/money/verification/read',
     _saveUrl: '/api/money/verification/save',
     _auditUrl: '/api/money/verification/audit',

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

@@ -14,7 +14,8 @@ Ext.define('saas.view.sale.sale.FormPanel', {
      _codeField: 'sa_code',
      _statusField: 'sa_status',
      _statusCodeField: 'sa_statuscode',
-     
+     _auditmanField: 'sa_auditman',
+     _auditdateField:'sa_auditdate',
      _relationColumn: 'sd_puid',
      _readUrl:'/api/sale/sale/read',
      _saveUrl:'/api/sale/sale/save',

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

@@ -14,7 +14,8 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
     _codeField: 'pi_inoutno',
     _statusField: 'pi_status',
     _statusCodeField: 'pi_statuscode',
-    
+    _auditmanField: 'pi_auditman',
+    _auditdateField:'pi_auditdate',
     _relationColumn: 'pd_piid',
     _readUrl:'/api/sale/prodinout/read',
     _saveUrl:'/api/sale/prodinout/save',

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

@@ -14,7 +14,8 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
     _codeField: 'pi_inoutno',
     _statusField: 'pi_status',
     _statusCodeField: 'pi_statuscode',
-    
+    _auditmanField: 'pi_auditman',
+    _auditdateField:'pi_auditdate',
     _relationColumn: 'pd_piid',
     _readUrl:'/api/sale/prodinout/read',
     _saveUrl:'/api/sale/prodinout/save',