zhangzhiguo
/
zhongcaiguoji
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zhangzhiguo:41784dc32879be70a60e05b16df4f5530d510ba2
Branches Tags
zhangzhiguo:main
zhangzhiguo:dev
..
compare: zhangzhiguo:b6f019de22ae17101864573a3f7a7515a21e56c5
Branches Tags
zhangzhiguo:dev
zhangzhiguo:main

No commits in common. "41784dc32879be70a60e05b16df4f5530d510ba2" and "b6f019de22ae17101864573a3f7a7515a21e56c5" have entirely different histories.
41784dc328 ... b6f019de22

1 changed files with 2 additions and 2 deletions
Show Stats Expand all files Collapse all files

4
code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/EntCostSplitBillPlugin.java
View File

@ -101,8 +101,8 @@ public class EntCostSplitBillPlugin extends AbstractBillPlugIn {
// 存在成本中心时，按照成本中心+成本项+二级分类去重 // 存在成本中心时，按照成本中心+成本项+二级分类去重
uniqueKey = "COSTCENTER_" + costCompanyName + "_" + (costType != null ? costType.toString() : "") + "_" + (secType != null ? secType.toString() : ""); uniqueKey = "COSTCENTER_" + costCompanyName + "_" + (costType != null ? costType.toString() : "") + "_" + (secType != null ? secType.toString() : "");
} else { } else {
// 如果既没有工序也没有成本中心，则按照成本项+二级分类去重 // 如果既没有工序也没有成本中心，则不进行汇总，使用唯一ID
uniqueKey = "NONE_" + (costType != null ? costType.toString() : "") + "_" + (secType != null ? secType.toString() : ""); uniqueKey = "NONE_" + rptAssistBalanceGx.getString("id");
} }
DynamicObject existingEntry = summaryMap.get(uniqueKey); DynamicObject existingEntry = summaryMap.get(uniqueKey);