Преглед на файлове

Merge branch 'develop' into develop2

hu преди 1 година
родител
ревизия
15d2334982
променени са 1 файла, в които са добавени 6 реда и са изтрити 1 реда
  1. 6 1
      src/custom/restcontroller/webmanage/sale/itempriceadjust/SQL/商品调价单商品明细列表情查询.sql

+ 6 - 1
src/custom/restcontroller/webmanage/sale/itempriceadjust/SQL/商品调价单商品明细列表情查询.sql

@@ -17,7 +17,9 @@ SELECT t1.sa_itempriceadjust_itemsid,
        t5.oldprice oldprice4,
        t5.price    price4,
        t6.oldprice oldprice5,
-       t6.price    price5
+       t6.price    price5,
+       t9.oldprice oldprice6,
+       t9.price price6
 FROM sa_itempriceadjust_items t1
          LEFT JOIN sa_itempriceadjust_itemprice t2 ON t1.sa_itempriceadjust_itemsid = t2.sa_itempriceadjust_itemsid
     AND t1.siteid = t2.siteid
@@ -34,6 +36,9 @@ FROM sa_itempriceadjust_items t1
          LEFT JOIN sa_itempriceadjust_itemprice t6 ON t1.sa_itempriceadjust_itemsid = t6.sa_itempriceadjust_itemsid
     AND t1.siteid = t6.siteid
     AND t6.pricegrade = 5
+         LEFT JOIN sa_itempriceadjust_itemprice t9 ON t1.sa_itempriceadjust_itemsid = t9.sa_itempriceadjust_itemsid
+    AND t1.siteid = t9.siteid
+    AND t9.pricegrade = 6
          LEFT JOIN plm_item t7 ON t7.siteid = t1.siteid
     AND t7.itemid = t1.itemid
          left join plm_unit t8 on t7.siteid = t8.siteid and t7.unitid = t8.unitid