bug修复

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

@@ -1134,7 +1134,11 @@ public class Order extends Controller {
         insertSQL.setValue("sa_agentsid", orderRow.getLong("sa_agentsid"));
         insertSQL.setValue("shoppingtype", orderRow.getString("shoppingtype"));
         insertSQL.setValue("sa_saleareaid", orderRow.getLong("sa_saleareaid"));
-        insertSQL.setValue("deliverydate", orderRow.getString("deliverydate", "null"));
+        String deliverydate = orderRow.getString("deliverydate");
+        if (StringUtils.isBlank(deliverydate)) {
+            deliverydate = "null";
+        }
+        insertSQL.setValue("deliverydate", deliverydate);
         insertSQL.setValue("saler_hrid", orderRow.getLong("saler_hrid"));
         insertSQL.setValue("billdate", getDateTime_Str());
         insertSQL.setValue("sys_enterpriseid", orderRow.getLong("sys_enterpriseid"));
@@ -1158,7 +1162,7 @@ public class Order extends Controller {
             insertSQL.setValue("sa_orderid", sa_orderid_copy);
             insertSQL.setValue("itemid", itemid);
             insertSQL.setValue("qty", qty);
-            insertSQL.setValue("rowno",itemRow.getLong("rowno"));
+            insertSQL.setValue("rowno", itemRow.getLong("rowno"));
             insertSQL.setValue("price", itemRow.getBigDecimal("price"));
             insertSQL.setValue("amount", itemRow.getBigDecimal("amount"));
             insertSQL.setValue("marketprice", itemRow.getBigDecimal("marketprice"));