|
|
@@ -123,8 +123,8 @@ public class stockbillitems extends Controller {
|
|
|
insertSQL.setValue("model", iteminfo.getStringValue("model"));
|
|
|
insertSQL.setValue("price", iteminfo.getBigDecimal("price"));
|
|
|
insertSQL.setValue("amount", iteminfo.getBigDecimal("qty").multiply(iteminfo.getBigDecimal("price")));
|
|
|
- insertSQL.setValue("untaxedprice", iteminfo.getBigDecimal("price").multiply(new BigDecimal(1.13)));
|
|
|
- insertSQL.setValue("untaxedamount", iteminfo.getBigDecimal("qty").multiply(iteminfo.getBigDecimal("price").multiply(new BigDecimal(1.13))));
|
|
|
+ insertSQL.setValue("untaxedprice", iteminfo.getBigDecimal("price").divide(new BigDecimal(1.13),2, BigDecimal.ROUND_HALF_UP));
|
|
|
+ insertSQL.setValue("untaxedamount", iteminfo.getBigDecimal("qty").multiply(iteminfo.getBigDecimal("price").divide(new BigDecimal(1.13),2, BigDecimal.ROUND_HALF_UP)));
|
|
|
insertSQL.setValue("skucontrol", iteminfo.getBoolean("skucontrol"));
|
|
|
i++;
|
|
|
sqlList.add(insertSQL.getSQL());
|
|
|
@@ -150,8 +150,8 @@ public class stockbillitems extends Controller {
|
|
|
updateSQL.setValue("model", iteminfo.getString("model"));
|
|
|
updateSQL.setValue("price", iteminfo.getString("price"));
|
|
|
updateSQL.setValue("amount", iteminfo.getBigDecimal("qty").multiply(iteminfo.getBigDecimal("price")));
|
|
|
- updateSQL.setValue("untaxedprice", iteminfo.getBigDecimal("price").multiply(new BigDecimal(1.13)));
|
|
|
- updateSQL.setValue("untaxedamount", iteminfo.getBigDecimal("qty").multiply(iteminfo.getBigDecimal("price").multiply(new BigDecimal(1.13))));
|
|
|
+ updateSQL.setValue("untaxedprice", iteminfo.getBigDecimal("price").divide(new BigDecimal(1.13),2, BigDecimal.ROUND_HALF_UP));
|
|
|
+ updateSQL.setValue("untaxedamount", iteminfo.getBigDecimal("qty").multiply(iteminfo.getBigDecimal("price").divide(new BigDecimal(1.13),2, BigDecimal.ROUND_HALF_UP)));
|
|
|
updateSQL.setValue("batchno", iteminfo.getString("batchno"));
|
|
|
updateSQL.setValue("stockid", iteminfo.getString("stockid"));
|
|
|
updateSQL.setValue("skucontrol", iteminfo.getBoolean("skucontrol"));
|