diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java index 627ec6b9..e5ab319a 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java @@ -396,7 +396,11 @@ public class SDNYMainProcessController extends AbstractController { if (invoiceLineList != null && invoiceLineList.size() > 0) { for (SNInvoiceDetail snInvoiceDetail : invoiceLineList) { SAPInvoiceDetail sapInvoiceDetail = new SAPInvoiceDetail(); + + //设置id + sapInvoiceDetail.setZHID(UUID.randomUUID().toString().replace("-","")); // sapInvoiceDetail.setZZWDJ(""); + sapInvoiceDetail.setIMG_ID(imageId); sapInvoiceDetail.setZCPH(snInvoiceDetail.getLicensePlateNum()); // sapInvoiceDetail.setZCJSJ(); @@ -425,9 +429,9 @@ public class SDNYMainProcessController extends AbstractController { sapInvoiceDetail.setZTAX(tax1.toString()); } } - if (invoiceLineList.size() == 1 && snInvoice.getTaxRate() == null) { - info.setZTAX(sapInvoiceDetail.getZTAX()); - } +// if (invoiceLineList.size() == 1 && snInvoice.getTaxRate() == null) { +// info.setZTAX(sapInvoiceDetail.getZTAX()); +// } // sapInvoiceDetail.setZHBH(""); sapInvoiceDetail.setZDJ(snInvoiceDetail.getUnitPrice()); // sapInvoiceDetail.setZHID(""); @@ -437,7 +441,7 @@ public class SDNYMainProcessController extends AbstractController { sapInvoiceDetail.setZDW(snInvoiceDetail.getUnit()); sapInvoiceDetail.setZGSJBM(snInvoiceDetail.getCommodityCode()); sapInvoiceDetail.setZSE(snInvoiceDetail.getTax()); - sapInvoiceDetail.setZSL(snInvoiceDetail.getTaxRate()); + sapInvoiceDetail.setZSL(snInvoiceDetail.getQuantity()); sapInvoiceDetail.setZSM(getZSM(snInvoiceDetail.getTaxRate())); sapInvoiceDetail.setZGGXH(snInvoiceDetail.getSpecificationModel()); if (snInvoice.getInvoiceCode() != null) { @@ -453,6 +457,11 @@ public class SDNYMainProcessController extends AbstractController { //获取税率 String taxRate = snInvoice.getTaxRate(); + if (taxRate != null && !taxRate.contains("%")){ + BigDecimal bigDecimal = new BigDecimal(taxRate); + BigDecimal multiply = bigDecimal.multiply(new BigDecimal("100")); + info.setZTAX(multiply.toString()); + } if (taxRate != null && taxRate.contains("%")) { String replace = taxRate.replace("%", ""); BigDecimal bigDecimal = new BigDecimal(replace);