violet/ensign
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:

Browse Source 
1.业务分类为整机、提成分类为整机且是否赠品为否
This commit is contained in:
ljw 2024-11-13 16:33:38 +08:00
parent 2dd73412c4
commit cad042604a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/yem/rf/salescommission/ITCOrderDetailsReportPlugin.java
View File

@ -82,7 +82,7 @@ public class ITCOrderDetailsReportPlugin extends AbstractReportListDataPlugin {
long producttype = filter.getLong("yem_bd_producttype");//产品分类
StringBuilder sb = new StringBuilder();
sb.append("yem_businesssort = 'Z' AND dn_status != 'C'");
sb.append("yem_businesssort = 'Z' AND dn_status != 'C' AND yem_ifgift = false");
if (YEM.isNotEmpty(fconstractno)) {
sb.append(" AND yem_constractno like '").append("%").append(fconstractno).append("%").append("'");
}
@ -147,6 +147,7 @@ public class ITCOrderDetailsReportPlugin extends AbstractReportListDataPlugin {
selectfields.add("yem_es_materialinfo.yem_orderallocation yem_tconfiguration");//明细.订单配置要求
selectfields.add("yem_es_materialinfo.yem_es_salesorder_z.yem_vehicleno yem_vehicleno");//明细.整机生产信息.整机编号
selectfields.add("yem_es_materialinfo.yem_businesssort yem_businesssort");
selectfields.add("yem_es_materialinfo.yem_ifgift yem_ifgift");
selectfields.add("createtime");
selectfields.add("yem_bd_products");//产品分类
selectfields.add("yem_bd_products yem_products");//产品分类