md

emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java

@@ -1250,14 +1250,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
 
                         log.info("计算后费用:"+feeItem.getFee());
 
-
-
                         totalFee=totalFee+fee;
-
                         feeItem.setBlAutoGen("1");
 
-                        feeList.add(feeItem);
-
                         // 计算完成后就结束
 
                         break;
@@ -1307,12 +1302,16 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
                         feeItem.setRemark(feeItem.getCalcExp());
                         feeItem.setBlAutoGen("1");
 
+
+
                         break;
                     }
                 }
             }
 
             if(feeItem.getFee().compareTo(BigDecimal.ZERO)!=0) {
+                // 记录类型，用于判断是否重复
+                feeTypeMap.put(feeItem.getFeeCode(),1)
                 feeList.add(feeItem);
             }