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

fix: 整机发运明细表，数量改为从出口报关获取

Browse Source
This commit is contained in:
zzs 2025-03-19 10:19:30 +08:00
parent 4347bf1215
commit 9980d97af7
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,8 +115,9 @@ public class CompleteShipDetailReportPlugin extends AbstractReportListDataPlugin
dataSet = dataSet.where(sb.toString());
dataSet = dataSet.select(String.join(",", RptUtil.getDataSetFiledAlias(dataSet)) + "," +
"CASE WHEN yem_dnbillno IS NOT NULL AND yem_dnbillno != '' THEN '是' ELSE '否' END yem_isshiped");
"CASE WHEN yem_dnbillno IS NOT NULL AND yem_dnbillno != '' THEN '是' ELSE '否' END yem_isshiped," +
"CASE WHEN yem_qty_dx IS NOT NULL AND yem_qty_dx >= 0 THEN yem_qty_dx ELSE yem_qty_or END yem_qty");
dataSet = dataSet.distinct();
return dataSet;
}
@ -167,7 +168,7 @@ public class CompleteShipDetailReportPlugin extends AbstractReportListDataPlugin
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_or");//数量-台数
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");//单台配件赠送金额-折扣、赠配件费用
@ -645,6 +646,7 @@ public class CompleteShipDetailReportPlugin extends AbstractReportListDataPlugin
// selectfields.add("yem_es_materialinfo.yem_coreentryid main_detail_id_declaredocx_fk");
selectfields.add("yem_es_materialinfo.yem_sgnenumber main_detail_id_declaredocx_fk");
selectfields.add("TO_CHAR(yem_invoicedate, 'yyyy-MM-dd') yem_invoicedate");//开票日期
selectfields.add("yem_es_materialinfo.yem_qty yem_qty_dx");//数量-台数
DataSet yemEsDeclaredocx = ORM.create().queryDataSet(algoKey, "yem_es_declaredocx", String.join(",", selectfields), qFilter.toArray());
yemEsDeclaredocx = yemEsDeclaredocx.distinct();