|
|
@@ -1839,9 +1839,9 @@ public class Order extends Controller {
|
|
|
insertSQL.setValue("itemid", row.getLong("itemid"));
|
|
|
insertSQL.setValue("sa_orderid", row.getLong("sa_orderid"));
|
|
|
insertSQL.setValue("qty", row.getLong("undeliqty"));
|
|
|
- insertSQL.setValue("discountrate", row.getBigDecimal("discountrate"));
|
|
|
+ insertSQL.setValue("discountrate", 1);
|
|
|
insertSQL.setValue("sa_dispatch_itemsid", 0);
|
|
|
- insertSQL.setValue("defaultprice", row.getBigDecimal("defaultprice"));
|
|
|
+ insertSQL.setValue("defaultprice", row.getBigDecimal("price"));
|
|
|
insertSQL.setValue("remarks", row.getString("remarks"));
|
|
|
insertSQL.setValue("itemno", row.getString("itemno"));
|
|
|
insertSQL.setValue("itemname", row.getString("itemname"));
|
|
|
@@ -2119,7 +2119,7 @@ public class Order extends Controller {
|
|
|
insertSQL.setValue("qty", row.getLong("undeliqty"));
|
|
|
insertSQL.setValue("discountrate", 1);
|
|
|
insertSQL.setValue("sa_dispatch_itemsid", 0);
|
|
|
- insertSQL.setValue("defaultprice", row.getBigDecimal("defaultprice"));
|
|
|
+ insertSQL.setValue("defaultprice", row.getBigDecimal("price"));
|
|
|
insertSQL.setValue("remarks", row.getString("remarksdetail"));
|
|
|
insertSQL.setValue("itemno", row.getString("itemno"));
|
|
|
insertSQL.setValue("itemname", row.getString("itemname"));
|