Skip to content

T
traffic-front
Commit 96dbe8ac authored by sherlock's avatar sherlock
Browse files
Options

Merge branch 'dev_oracle_sherlock' into 'dev_oracle' 

Dev oracle sherlock

See merge request root/atms!171
parents 5f760aa4 52408455
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 36 deletions
atms-api/src/main/java/pwc/taxtech/atms/service/impl/OrganizationStructureServiceImpl.java
View file @ 96dbe8ac
......@@ -142,7 +142,9 @@ public class OrganizationStructureServiceImpl {
organizationStructure.setName(organizationStructureDto.getName());
if (!organizationStructureDto.getIsActive()
&& organizationService.isOrganizationStructureExists(organizationStructureDto.getId())) {
continue;
// continue;
// return false;
throw new ApplicationException("the organization must not contain sub-organization!");
}
}
organizationStructure.setUpdateTime(new Date());
......
atms-dao/src/main/resources/pwc/taxtech/atms/invoice/extends/OutputInvoiceExtendsMapper.xml
View file @ 96dbe8ac
......@@ -30,14 +30,14 @@
<select id="selectOutputVATInvoiceInfoLeftJoinItem" parameterType="pwc.taxtech.atms.dto.vatdto.QueryOutputDto" resultMap="OutputVATInvoiceInfoDto">
SELECT
O.INVOICE_ID,
O.INVOICE_TYPE,
O.ID AS INVOICE_ID,
O.FPLX AS INVOICE_TYPE,
O.CLASS_CODE,
O.INVOICE_NUMBER,
O.BUYER_NAME,
O.BUYER_TAX_NUMBER,
O.BANK_ACCOUNT,
O.PHONE_NUM,
O.FPHM AS INVOICE_NUMBER,
O.GFMC AS BUYER_NAME,
O.GFSH AS BUYER_TAX_NUMBER,
O.GFYHZH AS BANK_ACCOUNT,
O.GFDZDH AS PHONE_NUM,
O.INVOICE_DATE,
IFNULL (
OI.CODE_VERSION,
......@@ -45,65 +45,65 @@
)
AS CODE_VERSION,
IFNULL (
OI.PRODUCT_NAME,
OI.SPMC,
''
)
AS PRODUCT_NAME,
IFNULL (
OI.DOCUMENT_NUM,
OI.MXXH,
''
)
AS DOCUMENT_NUM,
IFNULL (
OI.PRODUCT_STANDARD,
OI.GGXH,
''
)
AS PRODUCT_STANDARD,
IFNULL (
OI.UNIT,
OI.DW,
''
)
AS UNIT,
IFNULL (
OI.QUANTITY,
OI.SL,
''
)
AS QUANTITY,
IFNULL (
OI.UNIT_PRICE,
OI.DJ,
''
)
AS UNIT_PRICE,
IFNULL (
OI.AMOUNT,
OI.JE,
''
)
AS AMOUNT,
IFNULL (
OI.TAX_AMOUNT,
OI.SE,
''
)
AS TAX_AMOUNT,
IFNULL (
OI.TAX_CLASS_CODE,
OI.SSFLDM,
''
)
AS TAX_CLASS_CODE,
O.PERIOD_ID
FROM
OUTPUT_VAT_INVOICE O
OUTPUT_INVOICE O
LEFT JOIN
OUTPUT_VAT_INVOICE_ITEM OI
OUTPUT_INVOICE_DETAIL OI
ON
O.INVOICE_ID = OI.INVOICE_ID
O.FPQQLSH = OI.FPQQLSH
WHERE
1=1
<if test="queryDto.periodStart">
AND O.PERIOD_ID &gt;= #{queryDto.periodStart,jdbcType=VARCHAR}
</if>
<if test="queryDto.periodEnd">
AND O.PERIOD_ID &lt;= #{queryDto.periodEnd,jdbcType=VARCHAR}
</if>
<!--<if test="queryDto.periodStart">-->
<!--AND O.PERIOD_ID &gt;= #{queryDto.periodStart,jdbcType=VARCHAR}-->
<!--</if>-->
<!--<if test="queryDto.periodEnd">-->
<!--AND O.PERIOD_ID &lt;= #{queryDto.periodEnd,jdbcType=VARCHAR}-->
<!--</if>-->
<if test="queryDto.productName!=null and queryDto.productName!=''">
AND PRODUCT_NAME LIKE concat (
'%',
......
atms-web/src/main/webapp/app/admin/basicData/masterData/orangizationStructureManage/orangization-structure-manage.ctrl.js
View file @ 96dbe8ac
......@@ -98,6 +98,9 @@
organizationStructureService.updateOrganizationStructure(osArray).success(function(rst) {
$scope.refreshData();
}).error(function(){
$scope.refreshData();
SweetAlert.warning("修改失败！");
});
};
......
atms-web/src/main/webapp/app/admin/basicData/masterData/orangizationStructureManage/orangization-structure-manage.html
View file @ 96dbe8ac
......@@ -58,4 +58,9 @@
</div>
</div>
</div>
<!--<div class="modal fade" id="wrongMessage" tabindex="-1" role="dialog">-->
<!--<div class="modal-dialog" style="height: 300px; width: 610px;" role="document">-->
<!--<span></span>-->
<!--</div>-->
<!--</div>-->
</div>
\ No newline at end of file
atms-web/src/main/webapp/app/vat/preview/vat-preview-input-invoice/vat-preview-input-invoice.ctrl.js
View file @ 96dbe8ac
......@@ -594,11 +594,11 @@
enableSorting: false,
enableColumnMenus: false,
columnDefs: [
{ name: $translate.instant('ImportErrorPopUpNoCol'), width: '10%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.index}}<span></div>' },
// { name: $translate.instant('ImportErrorPopUpNoCol'), width: '10%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.index}}<span></div>' },
{ name: $translate.instant('InvoiceHWMC'), width: '23%', cellTemplate: '<div class="ui-grid-cell-contents"><span title="{{row.entity.spmc}}">{{row.entity.spmc}}<span></div>' },
{ name: $translate.instant('InvoiceJE'), headerCellClass:'toRight', width: '23%', cellTemplate: '<div class="ui-grid-cell-contents"><span style="float:right">{{row.entity.je}}<span></div>' },
{ name: $translate.instant('InvoiceJE'), headerCellClass:'right', width: '23%', cellTemplate: '<div class="ui-grid-cell-contents"><span style="float:right">{{row.entity.je}}<span></div>' },
{ name: $translate.instant('InvoiceSL'), width: '23%', cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.slv}}%<span></div>' },
{ name: $translate.instant('InvoiceSE'), headerCellClass:'toRight', width: '23%', cellTemplate: '<div class="ui-grid-cell-contents"><span style="float:right">{{row.entity.se}}<span></div>' }
{ name: $translate.instant('InvoiceSE'), headerCellClass:'right', width: '23%', cellTemplate: '<div class="ui-grid-cell-contents"><span style="float:right">{{row.entity.se}}<span></div>' }
]
};
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-output-invoice/vat-preview-output-invoice.ctrl.js
View file @ 96dbe8ac
......@@ -527,10 +527,10 @@
];
$scope.subGridOptionsColumnDefs = [
{
name: $translate.instant('ImportErrorPopUpNoCol'), width: '5%',
cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.seqNo}}</span></div>'
},
// {
// name: $translate.instant('ImportErrorPopUpNoCol'), width: '5%',
// cellTemplate: '<div class="ui-grid-cell-contents"><span>{{row.entity.seqNo}}</span></div>'
// },
{
name: $translate.instant('ProductName'),
cellTemplate: '<div class="ui-grid-cell-contents" title="{{row.entity.spmc}}"><span>{{row.entity.spmc}}</span></div>'
......@@ -549,7 +549,7 @@
},
{
name: $translate.instant('TaxRate'), headerCellClass: 'right',
cellTemplate: '<div class="ui-grid-cell-contents right" title="{{row.entity.slv}}"><span>{{slv + "%"}}</span></div>'
cellTemplate: '<div class="ui-grid-cell-contents right" title="{{row.entity.slv}}"><span>{{row.entity.slv * 100 + "%"}}</span></div>'
},
{
name: $translate.instant('TaxAmount'), headerCellClass: 'right',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment