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

Revert "feat:报表国贸订单明细增加字段取消数量、有效数量"

Browse Source 
This reverts commit 337ea83280.
This commit is contained in:
zzs 2025-02-14 14:11:33 +08:00
parent 98becfed61
commit d04ce21a31
1 changed files with 1 additions and 2 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

@ -109,7 +109,7 @@ public class ITCOrderDetailsReportPlugin extends AbstractReportListDataPlugin {
DataSet where = resDataSet.where(sb.toString()); DataSet where = resDataSet.where(sb.toString());
DataSet select = where.select(String.join(",", RptUtil.getDataSetFiledAlias(where)) + DataSet select = where.select(String.join(",", RptUtil.getDataSetFiledAlias(where)) +
", TO_CHAR(forderdate, 'yyyy-MM-dd') yem_orderdate, yem_reqqty - yem_cancel_num yem_effective_num"); ", TO_CHAR(forderdate, 'yyyy-MM-dd') yem_orderdate");
resDataSet = fillWithCMMPQty(select); resDataSet = fillWithCMMPQty(select);
return resDataSet.distinct(); return resDataSet.distinct();
@ -224,7 +224,6 @@ public class ITCOrderDetailsReportPlugin extends AbstractReportListDataPlugin {
detail.add("yem_es_materialinfo.yem_sourceentryid plan_detail_source_id"); detail.add("yem_es_materialinfo.yem_sourceentryid plan_detail_source_id");
// detail.add("yem_es_materialinfo.yem_ifreformg yem_ifreform");//是否改制 // detail.add("yem_es_materialinfo.yem_ifreformg yem_ifreform");//是否改制
detail.add("yem_es_materialinfo.yem_remarks yem_remark");//备注 detail.add("yem_es_materialinfo.yem_remarks yem_remark");//备注
detail.add("yem_es_materialinfo.yem_cancel_num yem_cancel_num");//取消数量
detail.add("yem_nameplatelogo.id yem_nameplatelogo");//铭牌标识 detail.add("yem_nameplatelogo.id yem_nameplatelogo");//铭牌标识
detail.add("yem_nameplatetype yem_nameplatetype");//铭牌类型 detail.add("yem_nameplatetype yem_nameplatetype");//铭牌类型