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

atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/dd/JournalEntryExportDto.java

@@ -219,6 +219,14 @@ public class JournalEntryExportDto {
 
     private Date updateTime;
 
+    public Integer getTmsPeriod() {
+        return tmsPeriod;
+    }
+
+    public void setTmsPeriod(Integer tmsPeriod) {
+        this.tmsPeriod = tmsPeriod;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column journal_entry.id

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

@@ -810,6 +810,31 @@ public class EbsApiServiceImpl implements EbsApiService {
 
     @Override
     public void changeCallBackStatus(EbsCallBackDto ebsCallBackDto) {
+        //当调用EBS接口失败之后，由于EBS调用callback和EBS返回response时间上几乎没有差异，
+        // 但callback的执行代码依赖于response返回后的插入代码，那就存在程序会先执行response还是先执行callback的问题，
+        // 在此做出判断先查一下数据库并给出查询次数限制防止一直查询数据库 create by zhikai.z.wei 20190505 17:08 start
+        //循环次数
+        int loopTimes = 0;
+        while(loopTimes < 3){
+            DataImportLog byPrimaryKey = dataImportLogMapper.selectByPrimaryKey(ebsCallBackDto.getTaskId());
+            if (byPrimaryKey == null){
+                try {
+                    logger.info(String.format("EBS Callback 未查询到抽取记录，沉睡2S taskId = [%s]",ebsCallBackDto.getTaskId()));
+                    Thread.sleep(2000);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                    logger.error(String.format("EBS CallBack 线程沉睡异常 taskId = [%s]",ebsCallBackDto.getTaskId()));
+                }
+            } else {
+                break;
+            }
+            if(loopTimes==2){
+                logger.error(String.format("循环三次仍未查询到抽取记录 taskId = [%s]",ebsCallBackDto.getTaskId()));
+                break;
+            }
+            loopTimes++;
+        }
+        // 在此做出判断先查一下数据库并给出查询次数限制防止一直查询数据库 create by zhikai.z.wei 20190505 17:08 end
         DataImportLog dataImportLog = new DataImportLog();
         dataImportLog.setId(ebsCallBackDto.getTaskId());
         dataImportLog.setImportResult("S".equals(ebsCallBackDto.getTaskStatus())?true:false);

atms-web/src/main/webapp/app-resources/i18n/en-us/basicData.json

@@ -316,6 +316,8 @@
 
  	"CannotDeleteAreaTips":"cannot delete the:{name} because of sub area exists!",
     "ComfirmAreaIsActive":"Comfirm {isActiveStr} Area:{areaName}",
-	 "UnSave": "You need save first!",
-	"addFileType": "add File Type"
+    "addFileType": "add File Type",
+    "ExportTable": "Export Table",
+	 "UnSave": "You need save first!"
+
 }

atms-web/src/main/webapp/app-resources/i18n/zh-CN/basicData.json

@@ -404,5 +404,6 @@
     "notAllowDisableMessage": "机构中已关联,不允许停用",
     "UnSave": "未点击保存按钮！",
     "addFileType": "新建档案类型",
+    "ExportTable": "导出列表",
     "~MustBeEndOneApp": "I Must be the End One, please!"
 }
\ No newline at end of file

atms-web/src/main/webapp/app/vat/preview/vat-preview-certified-invoices-list/vat-preview-certified-invoices-list.ctrl.js

@@ -280,27 +280,29 @@
                 enableSorting: false,
                 enableColumnMenus: false,
                 columnDefs: [
-                 { name: $translate.instant('InvoiceNoCol'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.seqNo}}<span></div>' },
+                 { name: $translate.instant('InvoiceNoCol'),width: 100, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.seqNo}}<span></div>' },
                  // { name: $translate.instant('InvoiceQJ'), width: '8%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.periodID}}<span></div>' },
-                 { name: $translate.instant('InvoiceCode'),  cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.invoiceCode}}<span></div>' },
-                 { name: $translate.instant('InvoiceNum'),  cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.invoiceNum}}</span></div>' },
-                 { name: $translate.instant('BillingDate'),  cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.billingDate | date:"yyyy-MM-dd"}}</span></div>' },
-                 { name: $translate.instant('SalesTaxNum'),  cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.salesTaxNum}}</span></div>' },
-                 { name: $translate.instant('SalesTaxName'),  cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.salespersonName}}</span></div>' },
+                 { name: $translate.instant('InvoiceCode'), width: 200,  cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.invoiceCode}}<span></div>' },
+                 { name: $translate.instant('InvoiceNum'), width: 200,  cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.invoiceNum}}</span></div>' },
+                 { name: $translate.instant('BillingDate'), width: 200,  cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.billingDate | date:"yyyy-MM-dd"}}</span></div>' },
+                 { name: $translate.instant('SalesTaxNum'), width: 300,  cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.salesTaxNum}}</span></div>' },
+                 { name: $translate.instant('SalesTaxName'), width: 300,  cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.salespersonName}}</span></div>' },
                  {
                      name: $translate.instant('Amount'),
+                     width: 200,
                      headerCellClass:'rightHeader',
                      cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.amount | number:2}}</span></div>'
                  },
                  {
                      name: $translate.instant('TaxAmount'),
+                     width: 200,
                      headerCellClass:'rightHeader',
                      cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.taxAmount | number:2}}</span></div>'
                  },
-                 { name: $translate.instant('VerificationMethod'),  cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.verificationMethod}}</span></div>' },
-                 { name: $translate.instant('ConfirmDate'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.certifiedDate | date:"yyyy-MM-dd"}}</span></div>' },
-                 { name: $translate.instant('InvoiceType'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.invoiceType}}</span></div>' },
-                 { name: $translate.instant('InvoiceStatus'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.invoiceStatus}}</span></div>' }
+                 { name: $translate.instant('VerificationMethod'), width: 200,  cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.verificationMethod}}</span></div>' },
+                 { name: $translate.instant('ConfirmDate'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.certifiedDate | date:"yyyy-MM-dd"}}</span></div>' },
+                 { name: $translate.instant('InvoiceType'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.invoiceType}}</span></div>' },
+                 { name: $translate.instant('InvoiceStatus'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.invoiceStatus}}</span></div>' }
                  ]
             };
 

atms-web/src/main/webapp/app/vat/preview/vat-preview-invoice-record/vat-preview-invoice-record.ctrl.js

@@ -294,12 +294,12 @@
                 enableSorting: false,
                 enableColumnMenus: false,
                 columnDefs: [
-                 { name: $translate.instant('VatInvoiceRecordNoCol'),width: 200,  cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.seqNo}}<span></div>' },
+                 { name: $translate.instant('VatInvoiceRecordNoCol'),width: 100,  cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.seqNo}}<span></div>' },
                  // { name: $translate.instant('InvoiceQJ'), width: '8%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.periodID}}<span></div>' },
-                 { name: $translate.instant('BillingBody'),width: 200,   cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.billingBody }}<span></div>' },
+                 { name: $translate.instant('BillingBody'),width: 300,   cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.billingBody }}<span></div>' },
                  { name: $translate.instant('CustomerCompanyName'),width: 200,   cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.fpdm}}">{{row.entity.customerCompanyName}}</span></div>' },
                  { name: $translate.instant('InvoiceType'),width: 200,   cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.fphm}}">{{row.entity.invoiceType}}</span></div>' },
-                 { name: $translate.instant('BillingContent'), width: 200,  cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.xfsh}}">{{row.entity.billingContent}}</span></div>' },
+                 { name: $translate.instant('BillingContent'), width: 300,  cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.xfsh}}">{{row.entity.billingContent}}</span></div>' },
                  {
                      name: $translate.instant('InvoiceAmount'),
                      headerCellClass:'rightHeader',
@@ -312,13 +312,13 @@
                  {
                      name: $translate.instant('ContractAmount'),
                      headerCellClass:'rightHeader',
-                     width: 200,
+                     width: 160,
                      cellTemplate: '<div class="ui-grid-cell-contents" style="text-align: right"><span>{{row.entity.contractAmount | number:2}}</span></div>'
                  },
-                 { name: $translate.instant('Department'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.department}}</span></div>' },
+                 { name: $translate.instant('Department'), width: 340, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.department}}</span></div>' },
                  { name: $translate.instant('ApplicationDate'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.applicationDate| date:"yyyy-MM-dd"}}</span></div>' },
                  { name: $translate.instant('BillingDate'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.billingDate| date:"yyyy-MM-dd"}}</span></div>' },
-                 { name: $translate.instant('BillingMonth'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.billingMonth| date:"MM"}}</span></div>' },
+                 { name: $translate.instant('BillingMonth'), width: 100, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.billingMonth| date:"MM"}}</span></div>' },
                  { name: $translate.instant('invoiceCode'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.invoiceCode}}</span></div>' },
                  { name: $translate.instant('InvoiceNum'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.invoiceNum}}</span></div>' },
                  { name: $translate.instant('InvoicePaperNum'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.invoicesAmount}}</span></div>' },

atms-web/src/main/webapp/app/vat/preview/vat-preview-red-letter-info-tab/vat-preview-red-letter-info-tab.ctrl.js

@@ -294,27 +294,36 @@
                 enableSorting: false,
                 enableColumnMenus: false,
                 columnDefs: [
-                 { name: $translate.instant('SubjectNum'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.subjectNum}}<span></div>' },
+                 { name: $translate.instant('SubjectNum'), width: 150,
+                     cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.subjectNum}}<span></div>' },
                  // { name: $translate.instant('InvoiceQJ'), width: '8%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.periodID}}<span></div>' },
-                 { name: $translate.instant('SubjectName'),  cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.subjectName}}<span></div>' },
-                 { name: $translate.instant('RedLetterInvoiceInfoTableNum'),  cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.redLetterInvoiceInfoTableNum}}</span></div>' },
-                 { name: $translate.instant('FillInDate'),  cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.fphm}}">{{row.entity.fillInDate | date:"yyyy-MM-dd"}}</span></div>' },
-                 { name: $translate.instant('RedLetterInfoSalesTaxNum'),  cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.xfsh}}">{{row.entity.salesTaxNumber}}</span></div>' },
-                 { name: $translate.instant('SalespersonName'),  cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.fplx}}">{{row.entity.salespersonName}}</span></div>' },
+                 {
+                     name: $translate.instant('SubjectName'),
+                     width: 300,
+                     cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.subjectName}}<span></div>'
+                },
+                 { name: $translate.instant('RedLetterInvoiceInfoTableNum'),  width: 300,
+                     cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.redLetterInvoiceInfoTableNum}}</span></div>' },
+                 { name: $translate.instant('FillInDate'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.fphm}}">{{row.entity.fillInDate | date:"yyyy-MM-dd"}}</span></div>' },
+                 { name: $translate.instant('RedLetterInfoSalesTaxNum'),  width: 300,
+                     cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.xfsh}}">{{row.entity.salesTaxNumber}}</span></div>' },
+                 { name: $translate.instant('SalespersonName'),  width: 300,
+                     cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.fplx}}">{{row.entity.salespersonName}}</span></div>' },
                  {
                      name: $translate.instant('RedLetterInfoTotalAmount'),
+                     width: 200,
                      headerCellClass:'rightHeader',
                      cellTemplate: '<div class="ui-grid-cell-contents right"><span style="float:right">{{row.entity.totalAmount | number:2}}</span></div>'
                  },
                  {
-                     name: $translate.instant('RedLetterInfoTotalTaxAmount'),
+                     name: $translate.instant('RedLetterInfoTotalTaxAmount'),width: 200,
                      headerCellClass:'rightHeader',
                      cellTemplate: '<div class="ui-grid-cell-contents right"><span style="float:right">{{row.entity.totalTaxAmount | number:2}}</span></div>'
                  },
-                 { name: $translate.instant('ApplicationSelectionDescription'),  cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.applicationDescription}}</span></div>' },
-                 { name: $translate.instant('ApplicantsManager'),  cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.applicantManager }}</span></div>' },
-                 { name: $translate.instant('InvoiceCode'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.invoiceCode}}</span></div>' },
-                 { name: $translate.instant('RedLetterInfoInvoiceNum'), cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.invoiceNumber}}</span></div>' }
+                 { name: $translate.instant('ApplicationSelectionDescription'),width: 200,  cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.applicationDescription}}</span></div>' },
+                 { name: $translate.instant('ApplicantsManager'), width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.applicantManager }}</span></div>' },
+                 { name: $translate.instant('InvoiceCode'), width: 200,cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.invoiceCode}}</span></div>' },
+                 { name: $translate.instant('RedLetterInfoInvoiceNum'),width: 200, cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.invoiceNumber}}</span></div>' }
                  ]
             };