价格调整

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

@@ -127,6 +127,7 @@ public class OrderItems extends Controller {
             //辅助单位数量
             sqlFactory.addParameter("auxqty", qty.divide(conversionrate));
             BigDecimal defaultprice;
+            BigDecimal price;
             //价格
             ItemPrice itemPrice = ItemPrice.getItemPrice(this, sys_enterpriseid, itemid);
             if (!item.containsKey("defaultprice")) {
@@ -138,12 +139,15 @@ public class OrderItems extends Controller {
 //                        defaultprice = itemPrice.getMarketprice();
 //                        break;
                     case "促销订单":
-                        defaultprice = itemPrice.getPromotionPrice(sa_promotionid);
+                        defaultprice = itemPrice.getGraderateprice();
+                        price= itemPrice.getPromotionPrice(sa_promotionid);
                         break;
                     default:
-                        defaultprice = itemPrice.getContractprice();
+                        defaultprice = itemPrice.getGraderateprice();
+                        price= itemPrice.getGraderateprice();
                 }
             } else {
+                price = item.getBigDecimalValue("price");
                 defaultprice = item.getBigDecimalValue("defaultprice");
                 if (!type.equals("特殊订单") && defaultprice.compareTo(rows.get(0).getBigDecimal("defaultprice")) != 0 && defaultprice.compareTo(itemPrice.getContractprice()) < 0) {
                     return getErrReturnObject().setErrMsg("调整价格不可小于协议价").toString();
@@ -156,9 +160,9 @@ public class OrderItems extends Controller {
             sqlFactory.addParameter("defaultamount", defaultprice.multiply(qty));
             //牌价、市场价（元）,标准订单牌价取商品价格，项目订单取合同里的牌价
             sqlFactory.addParameter("marketprice", itemPrice.getMarketprice());
-            sqlFactory.addParameter("price", defaultprice);
+            sqlFactory.addParameter("price", price);
             //折前金额（元）
-            sqlFactory.addParameter("amount", defaultprice.multiply(qty));
+            sqlFactory.addParameter("amount", price.multiply(qty));
 
             sqlList.add(sqlFactory.getSQL());
         }