Browse Source

订单明细重复bug修复

hu 2 years ago
parent
commit
a58fa8bb68

BIN
lib/yos.core-2.2.1-sources.jar → lib/yos.core-2.2.2-sources.jar


BIN
lib/yos.core-2.2.1.jar → lib/yos.core-2.2.2.jar


BIN
out/artifacts/yos/yos.war


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

@@ -913,7 +913,7 @@ public class OrderItems extends Controller {
                 "enterprisename");
                 "enterprisename");
         querySQL.addJoinTable(JOINTYPE.left, "plm_itemclass", "t8", "t8.itemclassid = t3.marketingcategory and t8.siteid = t3.siteid",
         querySQL.addJoinTable(JOINTYPE.left, "plm_itemclass", "t8", "t8.itemclassid = t3.marketingcategory and t8.siteid = t3.siteid",
                 "itemclassname");
                 "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");
                 "sys_enterprise_tradefieldid");
         querySQL.addJoinTable(JOINTYPE.left, "sa_salearea", "t10", "t10.sa_saleareaid = t9.sa_saleareaid and t10.siteid = t9.siteid",
         querySQL.addJoinTable(JOINTYPE.left, "sa_salearea", "t10", "t10.sa_saleareaid = t9.sa_saleareaid and t10.siteid = t9.siteid",
                 "areaname");
                 "areaname");