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

change:国贸订单明细（生产线）

Browse Source
This commit is contained in:
zzs01@yunemao.com 2024-09-05 14:59:01 +08:00
parent 1997d31018
commit 4801a0c93c
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,6 +80,7 @@ public class ITCOrderDetailsReportPlugin extends AbstractReportListDataPlugin {
long fcustomer = filter.getLong("yem_fcustomer");//客户 long fcustomer = filter.getLong("yem_fcustomer");//客户
Date forderdateStart = filter.getDate("yem_forderdate_start"); Date forderdateStart = filter.getDate("yem_forderdate_start");
Date forderdateEnd = filter.getDate("yem_forderdate_end"); Date forderdateEnd = filter.getDate("yem_forderdate_end");
long producttype = filter.getLong("yem_bd_producttype");//产品分类
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append("yem_businesssort = 'Z' AND dn_status != 'C'"); sb.append("yem_businesssort = 'Z' AND dn_status != 'C'");
@ -101,6 +102,11 @@ public class ITCOrderDetailsReportPlugin extends AbstractReportListDataPlugin {
if (YEM.isNotEmpty(forderdateEnd)) { if (YEM.isNotEmpty(forderdateEnd)) {
sb.append(" AND forderdate <= ").append(String.format("TO_DATE('%s','yyyy-MM-dd')", formatDate(forderdateEnd))); sb.append(" AND forderdate <= ").append(String.format("TO_DATE('%s','yyyy-MM-dd')", formatDate(forderdateEnd)));
} }
if (producttype > 0) {
sb.append(" AND yem_products = ").append(producttype);
}
resDataSet = resDataSet.addField("0.0", "yem_inventoryqty"); resDataSet = resDataSet.addField("0.0", "yem_inventoryqty");
DataSet where = resDataSet.where(sb.toString()); DataSet where = resDataSet.where(sb.toString());
@ -139,7 +145,7 @@ public class ITCOrderDetailsReportPlugin extends AbstractReportListDataPlugin {
selectfields.add("yem_es_materialinfo.yem_es_salesorder_z.yem_vehicleno yem_vehicleno");//明细.整机生产信息.整机编号 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_businesssort yem_businesssort");
selectfields.add("createtime"); selectfields.add("createtime");
selectfields.add("yem_bd_products");//产品分类 selectfields.add("yem_bd_products yem_products");//产品分类
return ORM.create().queryDataSet(algoKey, "yem_es_salesorder", String.join(",", selectfields), qFilter.toArray()) return ORM.create().queryDataSet(algoKey, "yem_es_salesorder", String.join(",", selectfields), qFilter.toArray())
.orderBy(new String[]{"createtime DESC"}); .orderBy(new String[]{"createtime DESC"});