Merge branch 'dev_oracle' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_oracle

atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportServiceImpl.java

@@ -706,6 +706,8 @@ public class ReportServiceImpl {
     private Integer convertType(Integer dataSourceType) {
         if (dataSourceType.equals(FormulaDataSourceDetailType.InputInvoiceDataSourceDto.getCode())) {
             return CellDataSourceType.InputInvoice.getCode();
+        } else if(dataSourceType.equals(FormulaDataSourceDetailType.OutputInvoiceDataSourceDto.getCode())){
+            return CellDataSourceType.OutputInvoice.getCode();
         } else {
             return CellDataSourceType.Formula.getCode();
         }
@@ -714,7 +716,9 @@ public class ReportServiceImpl {
     private Integer convetToFType(Integer cellDataSourceType) {
         if (cellDataSourceType.equals(CellDataSourceType.InputInvoice.getCode())) {
             return FormulaDataSourceType.InputInvoice.getCode();
-        } else {
+        } if(cellDataSourceType.equals(CellDataSourceType.OutputInvoice.getCode())){
+            return FormulaDataSourceType.OutputInvoice.getCode();
+        }else {
             return FormulaDataSourceType.Other.getCode();
         }
     }

atms-web/src/main/webapp/app/common/controls/vat-report-view/vat-report-view.ctrl.js

@@ -160,7 +160,7 @@
                 //销项数据源
                 case enums.formulaDataSourceType.OutputInvoice:
                     obj.period = sourceData.period;
-                    obj.date = sourceData.invoiceDate ? sourceData.invoiceDate.substring(0, 10) : '';
+                    obj.date = sourceData.invoiceDate ? (new Date(sourceData.invoiceDate)).dateTimeToString('yyyyMMdd') : "";
                     obj.acquiringEnterprise = sourceData.buyerName;
                     obj.invoiceCode = sourceData.invoiceCode;
                     obj.invoiceNumber = sourceData.invoiceNumber;
@@ -1120,6 +1120,10 @@
                             if (report && report.result && report.data) {
                                 $scope.reportId = report.data.id;
                                 getReportData();
+                            } else if(!(report.result && report.data)){
+                                $scope.reportData = [];
+                                $scope.formulaBlocks = [];
+                                $scope.manualDataSources = [];
                             }
                         });
                     }

atms-web/src/main/webapp/app/vat/reduction/vat-caculate-data/vat-caculate-data.ctrl.js

@@ -278,7 +278,9 @@
         }
 
        function doStartCaculate2(isMergeManualDataSource) {
+
              vatReportService.generateAll(vatSessionService.project.id, isMergeManualDataSource, vatSessionService.month, vatSessionService.logUser.id ? vatSessionService.logUser.id : "").success(function (data) {
+                 $scope.readonly = true;
                  if(data && data.result)
                    updateTasksStatus(data.data);
                    if(data.data.status=='Begin'){