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

入库单优化费用汇总逻辑

This commit is contained in:
xuhaihui 2025-11-13 13:47:09 +08:00
parent 221a1440c2
commit ca9f944303
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/MaterialInbPurchaseApplyPlugin.java
View File

@ -866,8 +866,9 @@ public class MaterialInbPurchaseApplyPlugin extends AbstractBillPlugIn implement
private void mergeExpenseSummaryEntriesByExpenseItemAndRate(DynamicObjectCollection expenseSummaryCollection) { private void mergeExpenseSummaryEntriesByExpenseItemAndRate(DynamicObjectCollection expenseSummaryCollection) {
// 获取是否合并结算的设置 // 获取是否合并结算的设置
Boolean combinedSettlement = (Boolean) this.getModel().getValue("zcgj_combinedsettlemen");//物资及运费同时结算 Boolean combinedSettlement = (Boolean) this.getModel().getValue("zcgj_combinedsettlemen");//物资及运费同时结算
Boolean zcgj_notraninvoice = (Boolean) this.getModel().getValue("zcgj_notraninvoice");//无运费发票
if (combinedSettlement != null && combinedSettlement) { if (combinedSettlement != null && combinedSettlement && !zcgj_notraninvoice) {
// 如果zcgj_combinedsettlemen为true，允许运费行和非运费行合并 // 如果zcgj_combinedsettlemen为true，允许运费行和非运费行合并
mergeAllEntriesByExpenseItemAndRate(expenseSummaryCollection); mergeAllEntriesByExpenseItemAndRate(expenseSummaryCollection);
} else { } else {