luminghui
/
sdny-jxpt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branches 'sgrzexport' and 'test' of http://192.168.12.182/invoice/pt into test

Browse Source 
 Conflicts:
	dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpdrrzServiceImpl.java
release
yishiqihuasheng 2 years ago
parent 2252f1cd3d a0dec2d8fe
commit 84982f339a
2 changed files with 28 additions and 14 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpdrrzServiceImpl.java
  2. 40
      dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java

2
dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpdrrzServiceImpl.java
Unescape View File

@ -146,7 +146,7 @@ public class BaseFpdrrzServiceImpl extends MpBaseServiceImpl<BaseFpdrrzDao, Base
QueryWrapper<BaseTDxRecordInvoice> queryRecord = new QueryWrapper<>(); QueryWrapper<BaseTDxRecordInvoice> queryRecord = new QueryWrapper<>();
queryRecord.eq("uuid", uuid); queryRecord.eq("uuid", uuid);
BaseTDxRecordInvoice rdxRecordInvoice = baseTDxRecordInvoiceDao.selectOne(queryRecord); BaseTDxRecordInvoice rdxRecordInvoice = baseTDxRecordInvoiceDao.selectOne(queryRecord);
if (rdxRecordInvoice.getDkTaxAmount() != null && StringHelper.isNotBlank(rdxRecordInvoice.getDkTaxAmount().toPlainString())){ if (rdxRecordInvoice.getDkTaxAmount() != null && StringUtils.isNotBlank(rdxRecordInvoice.getDkTaxAmount().toPlainString())){
rzlb.setDkse(rdxRecordInvoice.getDkTaxAmount().toPlainString()); rzlb.setDkse(rdxRecordInvoice.getDkTaxAmount().toPlainString());
} }
if (rdxRecordInvoice != null) { if (rdxRecordInvoice != null) {

40
dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java
Unescape View File

@ -832,22 +832,32 @@ public class SDNYMainProcessController extends AbstractController {
sapInvoiceDetail.setZTAX(snInvoiceDetail.getTaxRate()); sapInvoiceDetail.setZTAX(snInvoiceDetail.getTaxRate());
if ("0".equals(snInvoiceDetail.getTaxRate())) { if ("0".equals(snInvoiceDetail.getTaxRate())) {
sapInvoiceDetail.setZTAX("0.00"); sapInvoiceDetail.setZTAX("0.00");
// sapInvoiceDetail.setZSM(sapInvoiceDetail.getZTAX()); sapInvoiceDetail.setZSM(sapInvoiceDetail.getZTAX());
} }
if (snInvoiceDetail.getTaxRate().contains(".")) { if (snInvoiceDetail.getTaxRate().contains(".")) {
String getTaxRate = snInvoiceDetail.getTaxRate(); String getTaxRate = snInvoiceDetail.getTaxRate();
if (snInvoiceDetail.getTaxRate().length() > 4) { // if (snInvoiceDetail.getTaxRate().length() > 4) {
getTaxRate = getTaxRate.substring(0, 4); // getTaxRate = getTaxRate.substring(0, 4);
} // }
BigDecimal tax = new BigDecimal(getTaxRate); BigDecimal tax = new BigDecimal(getTaxRate);
sapInvoiceDetail.setZSM(getZSM(tax.toString())); sapInvoiceDetail.setZSM(getZSM(tax.toString()));
BigDecimal tax1 = tax.multiply(new BigDecimal("100")); BigDecimal tax1 = tax.multiply(new BigDecimal("100"));
sapInvoiceDetail.setZTAX(tax1.toString()); sapInvoiceDetail.setZTAX(tax1.toString());
if (tax1.toPlainString().indexOf(".")>=3) {
sapInvoiceDetail.setZTAX(snInvoiceDetail.getTaxRate());
}else if (tax1.toPlainString().length()-tax1.toPlainString().indexOf(".")>3){
String substring = tax1.toPlainString().substring(0, tax1.toPlainString().indexOf(".") + 3);
sapInvoiceDetail.setZTAX(substring);
}
} }
if (snInvoiceDetail.getTaxRate().contains("%") && !snInvoiceDetail.getTaxRate().contains(".")) { if (snInvoiceDetail.getTaxRate().contains("%") && !snInvoiceDetail.getTaxRate().contains(".")) {
String replace = snInvoiceDetail.getTaxRate().replace("%", ".00"); String replace = snInvoiceDetail.getTaxRate().replace("%", ".00");
String replaceZsm = snInvoiceDetail.getTaxRate().replace("%","");
sapInvoiceDetail.setZSM(getZSM(replaceZsm));
sapInvoiceDetail.setZTAX(replace); sapInvoiceDetail.setZTAX(replace);
} }
} }
// if (invoiceLineList.size() == 1 && snInvoice.getTaxRate() == null) { // if (invoiceLineList.size() == 1 && snInvoice.getTaxRate() == null) {
// info.setZTAX(sapInvoiceDetail.getZTAX()); // info.setZTAX(sapInvoiceDetail.getZTAX());
@ -873,15 +883,16 @@ public class SDNYMainProcessController extends AbstractController {
} }
} }
sapInvoiceDetail.setZSL(snInvoiceDetail.getQuantity()); sapInvoiceDetail.setZSL(snInvoiceDetail.getQuantity());
String zsmTax = snInvoiceDetail.getTaxRate();
if (zsmTax != null && zsmTax != "" && zsmTax.length() > 4) { // String zsmTax = snInvoiceDetail.getTaxRate();
zsmTax = zsmTax.substring(0, 4); // if (zsmTax != null && zsmTax != "" && zsmTax.length() > 4) {
} // zsmTax = zsmTax.substring(0, 4);
if (zsmTax != null && zsmTax.contains("%") && !zsmTax.contains(".")) { // }
zsmTax = (new BigDecimal(zsmTax.replace("%", ""))).divide(new BigDecimal("100")).toString(); // if (zsmTax != null && zsmTax.contains("%") && !zsmTax.contains(".")) {
} // zsmTax = (new BigDecimal(zsmTax.replace("%", ""))).divide(new BigDecimal("100")).toString();
// sapInvoiceDetail.setZSM(getZSM(snInvoiceDetail.getTaxRate())); // }
sapInvoiceDetail.setZSM(getZSM(zsmTax)); //// sapInvoiceDetail.setZSM(getZSM(snInvoiceDetail.getTaxRate()));
// sapInvoiceDetail.setZSM(getZSM(zsmTax));
sapInvoiceDetail.setZGGXH(snInvoiceDetail.getSpecificationModel()); sapInvoiceDetail.setZGGXH(snInvoiceDetail.getSpecificationModel());
if (snInvoice.getInvoiceCode() != null) { if (snInvoice.getInvoiceCode() != null) {
sapInvoiceDetail.setZTID(snInvoice.getInvoiceCode() + snInvoice.getInvoiceNumber() + snFplx); sapInvoiceDetail.setZTID(snInvoice.getInvoiceCode() + snInvoice.getInvoiceNumber() + snFplx);
@ -1188,6 +1199,9 @@ public class SDNYMainProcessController extends AbstractController {
case "1.5": case "1.5":
sm = "JA"; sm = "JA";
break; break;
case "0.015":
sm = "JA";
break;
case "1": case "1":
sm = "J9"; sm = "J9";
break; break;

Write Preview
Loading…
Cancel
Save