|
|
@@ -14,6 +14,7 @@ import org.apache.commons.lang.StringUtils;
|
|
|
import restcontroller.R;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
+import java.math.RoundingMode;
|
|
|
import java.util.ArrayList;
|
|
|
|
|
|
@API(title = "销售出库U8上传")
|
|
|
@@ -698,12 +699,12 @@ public class u8 extends Controller {
|
|
|
BigDecimal taxprice = BigDecimal.ZERO;
|
|
|
BigDecimal price = BigDecimal.ZERO;
|
|
|
if (changetype.equals("百分比")) {
|
|
|
- taxprice = row.getBigDecimal("saleprice").multiply(BigDecimal.valueOf(100).add(changevalue)).divide(BigDecimal.valueOf(100)).setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
- price = taxprice.multiply(BigDecimal.valueOf(100)).divide(BigDecimal.valueOf(100).add(row.getBigDecimal("taxrate"))).setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
+ taxprice = row.getBigDecimal("saleprice").multiply(BigDecimal.valueOf(100).add(changevalue)).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP);
|
|
|
+ price = taxprice.multiply(BigDecimal.valueOf(100)).divide(BigDecimal.valueOf(100).add(row.getBigDecimal("taxrate")), 6, RoundingMode.HALF_UP);
|
|
|
|
|
|
} else if (changetype.equals("金额")) {
|
|
|
taxprice = row.getBigDecimal("saleprice").add(changevalue);
|
|
|
- price = taxprice.multiply(BigDecimal.valueOf(100)).divide(BigDecimal.valueOf(100).add(row.getBigDecimal("taxrate"))).setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
+ price = taxprice.multiply(BigDecimal.valueOf(100)).divide(BigDecimal.valueOf(100).add(row.getBigDecimal("taxrate")), 6, RoundingMode.HALF_UP);
|
|
|
|
|
|
}
|
|
|
sqllist.add("update u8itemprice set price=" + price + ",taxprice=" + taxprice + " where u8itempriceid=" + row.getLong("u8itempriceid"));
|