hu 1 год назад
Родитель
Сommit
d0382f16a5
1 измененных файлов с 1 добавлено и 1 удалено
  1. 1 1
      src/custom/restcontroller/webmanage/sale/order/OrderItems.java

+ 1 - 1
src/custom/restcontroller/webmanage/sale/order/OrderItems.java

@@ -915,7 +915,7 @@ public class OrderItems extends Controller {
                 "enterprisename");
         querySQL.addJoinTable(JOINTYPE.left, "plm_itemclass", "t8", "t8.itemclassid = t3.marketingcategory and t8.siteid = t3.siteid",
                 "itemclassname");
-        querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise_tradefield", "t9", "t9.sys_enterpriseid = t5.sys_enterpriseid and t9.siteid = t5.siteid",
+        querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise_tradefield", "t9", "t9.sys_enterpriseid = t5.sys_enterpriseid and t9.tradefield=t5.tradefield and t9.siteid = t5.siteid",
                 "sys_enterprise_tradefieldid");
         querySQL.addJoinTable(JOINTYPE.left, "sa_salearea", "t10", "t10.sa_saleareaid = t9.sa_saleareaid and t10.siteid = t9.siteid",
                 "areaname");