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 11:51:35 +08:00
parent d428ff953e
commit 08a2952879
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/yem/rf/salescommission/CompleteShipDetailReportPlugin.java
View File

@ -87,6 +87,7 @@ public class CompleteShipDetailReportPlugin extends AbstractReportListDataPlugin
String forderno = filter.getString("yem_forderno");
long fcustom = filter.getLong("yem_fcustom");
long fresourceno = filter.getLong("yem_fresourceno");
long producttype = filter.getLong("yem_bd_producttype");
QFilter qFilter = getBaseQFilter(new String[]{"B", "C"});
qFilter.and("yem_signconfirmstatus", "=", "A");//回签确认状态
if (YEM.isNotEmpty(forderno)) {
@ -103,6 +104,9 @@ public class CompleteShipDetailReportPlugin extends AbstractReportListDataPlugin
qFilter.and("yem_es_materialinfo.yem_resourcenog.id", "=", fresourceno);
}
if (producttype > 0) {
qFilter.and("yem_bd_products.id", "=", producttype);
}
ArrayList<String> selectfields = Lists.newArrayList();
selectfields.add("yem_es_materialinfo.id main_detail_id");
selectfields.add("id main_id");
@ -110,9 +114,10 @@ public class CompleteShipDetailReportPlugin extends AbstractReportListDataPlugin
selectfields.add("yem_customer yem_custom");
selectfields.add("yem_currency yem_currency");
selectfields.add("yem_es_materialinfo.yem_productmodel.yem_products.id yem_product");//产品机型
selectfields.add("yem_bd_products yem_products");//产品分类
selectfields.add("yem_priceitem yem_priceitem");//价格条款-交货方式
selectfields.add("yem_es_materialinfo.yem_sapricepriceclause yem_price");//销售单价（价格条款）-单价
selectfields.add("yem_es_materialinfo.yem_qty yem_qty");//数量-台数
// selectfields.add("yem_es_materialinfo.yem_qty yem_qty");//数量-台数
selectfields.add("yem_es_materialinfo.yem_resourcenog yem_resourceno");//资源号-订货号
selectfields.add("yem_es_materialinfo.yem_sastandardprice yem_fobpriceqd");//销售FOB标配青岛价-标准结算价格
selectfields.add("yem_es_materialinfo.yem_singlepartgiftmat yem_singlegiftpartamt");//单台配件赠送金额-折扣、赠配件费用
@ -154,7 +159,7 @@ public class CompleteShipDetailReportPlugin extends AbstractReportListDataPlugin
selectfields.add("createtime order_createtime");
DataSet dataSet = ORM.create().queryDataSet(algoKey, "yem_es_salesorder", String.join(",", selectfields), qFilter.copy().and("yem_es_materialinfo.yem_businesssort", "=", "Z").toArray()).orderBy(new String[]{"order_createtime"});
dataSet = dataSet.addField("1.0", "yem_qty");
DataSet aggVehicleNo = aggSalesOrderVehicleNo(qFilter);
dataSet = dataSet.leftJoin(aggVehicleNo)
.on("main_detail_id", "main_detail_id_vno_fk")