南起nc推送;
This commit is contained in:
+4
-3
@@ -71,6 +71,7 @@ import java.io.IOException;
|
|||||||
import java.io.StringReader;
|
import java.io.StringReader;
|
||||||
import java.io.StringWriter;
|
import java.io.StringWriter;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
|
import java.math.RoundingMode;
|
||||||
import java.sql.NClob;
|
import java.sql.NClob;
|
||||||
import java.text.ParseException;
|
import java.text.ParseException;
|
||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
@@ -495,11 +496,11 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
|||||||
// item.setPk_currtype("CNY");
|
// item.setPk_currtype("CNY");
|
||||||
item.setPk_currtype(tmsOrder.getSettlementCurrency());
|
item.setPk_currtype(tmsOrder.getSettlementCurrency());
|
||||||
item.setPurchaseorder(tmsOrder.getGoodsNumber());
|
item.setPurchaseorder(tmsOrder.getGoodsNumber());
|
||||||
item.setTaxrate("0");
|
item.setTaxrate(String.valueOf(tmsOrder.getTaxRate()));
|
||||||
item.setQuantity_de("0");
|
item.setQuantity_de("0");
|
||||||
item.setMoney_de(String.valueOf(tmsOrder.getDeliveryFreight()));
|
item.setMoney_de(String.valueOf(tmsOrder.getDeliveryFreight()));
|
||||||
item.setMoney_bal(String.valueOf(tmsOrder.getDeliveryFreight()));
|
item.setMoney_bal(String.valueOf(tmsOrder.getDeliveryFreight()));
|
||||||
BigDecimal tax_de=tmsOrder.getDeliveryFreight().divide(tmsOrder.getTaxRate().divide(BigDecimal.valueOf(100)).add(BigDecimal.ONE)).multiply(tmsOrder.getTaxRate().divide(BigDecimal.valueOf(100))).setScale(2,BigDecimal.ROUND_HALF_UP);
|
BigDecimal tax_de=tmsOrder.getDeliveryFreight().divide(tmsOrder.getTaxRate().divide(BigDecimal.valueOf(100)).add(BigDecimal.ONE), 10, RoundingMode.HALF_UP).multiply(tmsOrder.getTaxRate().divide(BigDecimal.valueOf(100))).setScale(2,BigDecimal.ROUND_HALF_UP);
|
||||||
BigDecimal notax_de=tmsOrder.getDeliveryFreight().subtract(tax_de);
|
BigDecimal notax_de=tmsOrder.getDeliveryFreight().subtract(tax_de);
|
||||||
item.setNotax_de(String.valueOf(notax_de));
|
item.setNotax_de(String.valueOf(notax_de));
|
||||||
item.setLocal_tax_de(String.valueOf(tax_de));
|
item.setLocal_tax_de(String.valueOf(tax_de));
|
||||||
@@ -723,7 +724,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
|||||||
// item.setPk_currtype("CNY");
|
// item.setPk_currtype("CNY");
|
||||||
item.setPk_currtype(settlementCurrencyNcCode);
|
item.setPk_currtype(settlementCurrencyNcCode);
|
||||||
item.setPurchaseorder("");
|
item.setPurchaseorder("");
|
||||||
item.setTaxrate("0");
|
item.setTaxrate(String.valueOf(item1.getTaxRate()));
|
||||||
item.setQuantity_de("0");
|
item.setQuantity_de("0");
|
||||||
item.setMoney_de(String.valueOf(item1.getInvoiceValue()));
|
item.setMoney_de(String.valueOf(item1.getInvoiceValue()));
|
||||||
item.setMoney_bal(String.valueOf(item1.getInvoiceValue()));
|
item.setMoney_bal(String.valueOf(item1.getInvoiceValue()));
|
||||||
|
|||||||
Reference in New Issue
Block a user