Merge branch 'dev_oracle_sherlock' into 'dev_oracle'

Dev oracle sherlock

See merge request root/atms!214

atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/WPSR.java

@@ -111,7 +111,7 @@ public class WPSR extends FunctionBase implements FreeRefFunction {
             dto.setColumnName("");
             dto.setRowName("");
             dto.setReportName(ec.getWorkbook().getSheetName(ec.getSheetIndex()));
-            dto.setType(FormulaDataSourceType.Report.getCode());
+            dto.setType(FormulaDataSourceType.TrialBalanceSource.getCode());
             Long dataSourceId = saveDataSource(ec, Lists.newArrayList(dto), FormulaDataSourceDetailType.InputInvoiceDataSourceDto, val, formulaContext.getPeriod(),
                     formulaContext.getReportTemplateGroupId(), formulaContext.getProjectId());
             saveFormulaBlock(formulaContext.getPeriod(), ec, formulaExpression, val, dataSourceId,

atms-web/src/main/webapp/app/common/controls/tax-report-cell-detail-modal/tax-report-cell-detail-modal.ctrl.js

@@ -767,6 +767,8 @@
                                     return '贷方发生';
                                 } else if(formula.indexOf('JFFS') > -1){
                                     return '借方发生';
+                                } else if(formula.indexOf('WPSR') > -1){
+                                   return 'WPSR';
                                 }
                                 return '';
                             },