特殊订单新增明细bug修复

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

@@ -195,14 +195,16 @@ public class OrderItems extends Controller {
 //                }
             }
             if(type.equals("特殊订单")){
-                if(item.getBigDecimalValue("price").compareTo(BigDecimal.ZERO)>0 && item.getBigDecimalValue("amount").compareTo(BigDecimal.ZERO)<=0){
-                    sqlFactory.addParameter("price", item.getBigDecimalValue("price"));
-                    //折前金额（元）
-                    sqlFactory.addParameter("amount", price.multiply(qty));
-                }else if(item.getBigDecimalValue("price").compareTo(BigDecimal.ZERO)<=0 && item.getBigDecimalValue("amount").compareTo(BigDecimal.ZERO)>0){
-                    sqlFactory.addParameter("price",item.getBigDecimalValue("amount").divide(qty,4));
-                    //折前金额（元）
-                    sqlFactory.addParameter("amount", item.getBigDecimalValue("amount"));
+                if (sa_orderitemsid <= 0) {
+                    if(item.getBigDecimalValue("price").compareTo(BigDecimal.ZERO)>0 && item.getBigDecimalValue("amount").compareTo(BigDecimal.ZERO)<=0){
+                        sqlFactory.addParameter("price", item.getBigDecimalValue("price"));
+                        //折前金额（元）
+                        sqlFactory.addParameter("amount", price.multiply(qty));
+                    }else if(item.getBigDecimalValue("price").compareTo(BigDecimal.ZERO)<=0 && item.getBigDecimalValue("amount").compareTo(BigDecimal.ZERO)>0){
+                        sqlFactory.addParameter("price",item.getBigDecimalValue("amount").divide(qty,4));
+                        //折前金额（元）
+                        sqlFactory.addParameter("amount", item.getBigDecimalValue("amount"));
+                    }
                 }
             }else {
                 sqlFactory.addParameter("price", price);
@@ -491,6 +493,9 @@ public class OrderItems extends Controller {
             case "特殊订单":
                 sqlFactory = new SQLFactory(this, "查询可添加商品列表_特殊订单", pageSize, pageNumber, pageSorting);
                 sqlFactory.addParameter("tradefield", tradefield);
+                if(sys_enterpriseid>0){
+                    where.append(" and t1.isonsale ='1' ");
+                }
                 break;
             default:
                 StringBuffer where2 = new StringBuffer(" 1=1 ");