[DEV] when approval agree and can add manual data

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

@@ -873,10 +873,6 @@ public class ReportServiceImpl {
 
     public OperationResultDto addCellManualDataSource(ManualDataSourceDto data, String projectId) {
         OperationResultDto operationResultDto = new OperationResultDto();
-        String status = periodApprovalMapper.getStatusByProjectIdAndPeriod(projectId, data.getPeriod());
-        MyAsserts.assertTrue(status == null || status.equals(Constant.APPROVAL_DISAGREED), Exceptions.REPORT_IN_PROCESS_OR_AGREED_EXCEPTION);
-
-
         try {
             if (data.getCellId() == null) {
                 //todo: insert celldata for manual datasource

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

@@ -1493,6 +1493,10 @@
 
         //单元格详细信息点击确定时执行
         $scope.confirm = function () {
+            vatApproveService.approvalStatus(vatSessionService.project.id,vatSessionService.project.period).success(function(result){
+                if(result&&result=='committed'){
+                   SweetAlert.error('报表提审中！');
+                }else{
                    $scope.handInputModel.name = $scope.taxCellDetail.inputMemo;
                   $scope.handInputModel.amount = $scope.taxCellDetail.inputValue;
                   $scope.handInputModel.description = $scope.taxCellDetail.inputMemo;
@@ -1522,6 +1526,8 @@
                   }
 
                   return $q.reject();
+                });
+
         };
 
 
@@ -2554,7 +2560,7 @@
                  vatSessionService.project.period=vatSessionService.month;
                  vatApproveService.approvalStatus(vatSessionService.project.id,vatSessionService.project.period).success(function(result){
                   if(result&&result=='committed'){
-                     SweetAlert.error('报表提审中或审核已通过！');
+                     SweetAlert.error('报表提审中！');
                   }else{
                         SweetAlert.swal({
                             title: "warning!",
@@ -2685,7 +2691,7 @@
                vatSessionService.project.period=vatSessionService.month;
                vatApproveService.approvalStatus(vatSessionService.project.id,vatSessionService.project.period).success(function(result){
                 if(result&&result=='committed'){
-                   SweetAlert.error('报表提审中或审核已通过！');
+                   SweetAlert.error('报表提审中！');
                 }else{
                    var text= $(".li").find(".active").text();
                   $log.debug(text);

atms-web/src/main/webapp/app/common/vatservices/vatReportService.js

@@ -96,13 +96,9 @@
                     data.dataSourceType = enums.cellDataSourceType.KeyIn;
                     return $q.when(data);
                 },function (data) {
-                   if(data.status==412){
-                      SweetAlert.error('报表提审中或审核已通过！');
-                   }else{
                     logInfo.UpdateState = $translate.instant('ManualInputFail');
                     SweetAlert.error($translate.instant('PleaseContactAdministrator'));
                     return vatOperationLogService.addOperationLog(logInfo);
-                   }
                 });
             },
             deleteCellVoucher: function (voucherId, datasourceId) {