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 15:15:15 +08:00
parent 4801a0c93c
commit 33ec5c134e
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -146,6 +146,7 @@ public class ITCOrderDetailsReportPlugin extends AbstractReportListDataPlugin {
selectfields.add("yem_es_materialinfo.yem_businesssort yem_businesssort");
selectfields.add("createtime");
selectfields.add("yem_bd_products yem_products");//产品分类
selectfields.add("yem_es_materialinfo.yem_es_salesorder_z.yem_currentstate yem_currentstate");//当前状态
return ORM.create().queryDataSet(algoKey, "yem_es_salesorder", String.join(",", selectfields), qFilter.toArray())
.orderBy(new String[]{"createtime DESC"});
@ -166,7 +167,26 @@ public class ITCOrderDetailsReportPlugin extends AbstractReportListDataPlugin {
selectfields.add("yem_shippingplan_entry.yem_plandetail_entry.id order_plan_detail_id");//跟单任务明细子分录ID
selectfields.add("yem_shippingplan_entry.yem_plandetail_entry.yem_srcentryid order_detail_id_plan_fk");
return ORM.create().queryDataSet(algoKey, "yem_es_salesorder", String.join(",", selectfields), qFilter.toArray());
DataSet dataSet = ORM.create().queryDataSet(algoKey, "yem_es_salesorder", String.join(",", selectfields), qFilter.toArray());
DataSet proReqBill = queryOrderProReqBill(param);
dataSet = dataSet.leftJoin(proReqBill)
.on("order_plan_id", "order_req_main_detail_fk")
.select(RptUtil.getDataSetFiledAlias(dataSet), RptUtil.getDataSetFiledAlias(proReqBill))
.finish();
return dataSet;
}
private DataSet queryOrderProReqBill(ReportQueryParam param) {
QFilter qFilter = getBaseQFilter();
List<String> selectfields = new ArrayList<>();
selectfields.add("TO_CHAR(yem_es_materialinfo.yem_yieldetacdate, 'yyyy-MM-dd') yem_prodfeedbackdate");//预计完成时间
selectfields.add("yem_es_materialinfo.yem_sourceentryid order_req_main_detail_fk");
return ORM.create().queryDataSet(algoKey, "yem_orderproreqbill", String.join(",", selectfields), qFilter.toArray());
}
/**
@ -218,7 +238,7 @@ public class ITCOrderDetailsReportPlugin extends AbstractReportListDataPlugin {
List<String> selectfields = new ArrayList<>();
selectfields.add("yem_es_salesorder_r.yem_entrtyid plan_proc_detail_fk");
selectfields.add("yem_es_salesorder_r.yem_stockway yem_ifreform");
selectfields.add("TO_CHAR(yem_es_salesorder_r.yem_yieldetacdate, 'yyyy-MM-dd') yem_prodfeedbackdate");//预计完成时间
// selectfields.add("TO_CHAR(yem_es_salesorder_r.yem_yieldetacdate, 'yyyy-MM-dd') yem_prodfeedbackdate");//预计完成时间
selectfields.add("TO_CHAR(yem_es_salesorder_r.yem_yieldfactacdate, 'yyyy-MM-dd') yem_plancompdate");//实际完成时间
return ORM.create().queryDataSet(algoKey, "yem_tracktaskconsole", String.join(",", selectfields), null);
}
@ -350,8 +370,7 @@ public class ITCOrderDetailsReportPlugin extends AbstractReportListDataPlugin {
for (DynamicObject dynamicObject : collection) {
String vehicleno = dynamicObject.getString("yem_vehicleno");
if (YEM.isNotEmpty(vehicleno)) {
BigDecimal inventoryqty = dynamicObject.getBigDecimal("yem_inventoryqty");
dynamicObject.set("yem_reqqty", inventoryqty);
dynamicObject.set("yem_reqqty", new BigDecimal("1"));
}
}