入库单优化费用汇总逻辑

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

@@ -866,8 +866,9 @@ public class MaterialInbPurchaseApplyPlugin extends AbstractBillPlugIn implement
     private void mergeExpenseSummaryEntriesByExpenseItemAndRate(DynamicObjectCollection expenseSummaryCollection) {
         // 获取是否合并结算的设置
         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，允许运费行和非运费行合并
             mergeAllEntriesByExpenseItemAndRate(expenseSummaryCollection);
         } else {