Browse Source

出入库表体补充未税单价和未税金额

hu 11 tháng trước cách đây
mục cha
commit
a7f9938ecb

+ 6 - 1
src/custom/restcontroller/webmanage/sale/stockbill/stockbillitems.java

@@ -14,6 +14,7 @@ import restcontroller.R;
 import restcontroller.webmanage.sale.order.Order;
 import restcontroller.webmanage.sale.order.OrderItems;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 
 public class stockbillitems extends Controller {
@@ -120,8 +121,10 @@ public class stockbillitems extends Controller {
                 insertSQL.setValue("itemno", iteminfo.getStringValue("itemno"));
                 insertSQL.setValue("itemname", iteminfo.getStringValue("itemname"));
                 insertSQL.setValue("model", iteminfo.getStringValue("model"));
-                insertSQL.setValue("price", iteminfo.getStringValue("price"));
+                insertSQL.setValue("price", iteminfo.getBigDecimal("price"));
                 insertSQL.setValue("amount", iteminfo.getBigDecimal("qty").multiply(iteminfo.getBigDecimal("price")));
+                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)));
                 i++;
                 sqlList.add(insertSQL.getSQL());
             } else {
@@ -146,6 +149,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").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"));
                         sqlList.add(updateSQL.getSQL());