Merge branch 'develop' into develop2

src/custom/restcontroller/webmanage/sale/dispatch/dispatch.java

@@ -530,7 +530,7 @@ public class dispatch extends Controller {
         if (siteid.equalsIgnoreCase("lsa")) {
             Rows erp_urlrows = dbConnect.runSqlQuery("SELECT erp_url from sys_site_parameter  WHERE siteid='" + siteid + "'");
             if (erp_urlrows.isNotEmpty()) {
-                String url = rows.get(0).getString("erp_url");
+                String url = erp_urlrows.get(0).getString("erp_url");
                 if(!StringUtils.isBlank(url)){
                     JSONObject object = new JSONObject();
                     object.put("classname", "getIcinvbal");
@@ -630,7 +630,7 @@ public class dispatch extends Controller {
         if (siteid.equalsIgnoreCase("lsa")) {
             Rows erp_urlrows = dbConnect.runSqlQuery("SELECT erp_url from sys_site_parameter  WHERE siteid='" + siteid + "'");
             if (erp_urlrows.isNotEmpty()) {
-                String url = rows.get(0).getString("erp_url");
+                String url = erp_urlrows.get(0).getString("erp_url");
                 if(!StringUtils.isBlank(url)){
                     JSONObject objectfeek = new JSONObject();
                     objectfeek.put("classname", "getIcinvbal");

src/custom/restcontroller/webmanage/sale/order/Order.java

@@ -2794,8 +2794,8 @@ public class Order extends Controller {
         for (Row row : rows) {
             Rows rows2 = rowsMap.getOrDefault(row.getString("sa_dispatchid"), new Rows());
             if (rows2.isNotEmpty()) {
-                row.putIfAbsent("sumamount", rows2.get(0).getBigDecimal("sumamount").setScale(2));
-                row.putIfAbsent("sumqty", rows2.get(0).getBigDecimal("sumqty").setScale(2));
+                row.putIfAbsent("sumamount", rows2.get(0).getBigDecimal("sumamount").setScale(2,BigDecimal.ROUND_HALF_UP));
+                row.putIfAbsent("sumqty", rows2.get(0).getBigDecimal("sumqty").setScale(2, BigDecimal.ROUND_HALF_UP));
             }
             row.putIfAbsent("sumamount", 0);
             row.putIfAbsent("sumqty", 0);