md

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

@@ -392,10 +392,12 @@ public class EmisTmsCostFeeServiceImpl extends EmisBaseService implements IEmisT
         // （3）快递类型货（派送费）：目的国家（柬埔寨、缅甸、孟加拉、越南、老挝）末端派送费 首重1Kg 2美金 15元，续重1kg 0.2美金/1.5元；
         // 派送
         // 先删除派送费
+        // 去除自清自提
         emisTmsCostFeeSplitMapper.deleteByBillCodeAndFeeType(mainBillCode,"1003");
         if(
                 "1".equals(mainWaybill.getCarryType()) // 快递
                         && "1".equals(mainWaybill.getDispatchMethod()) // 派送
+                        && !"2".equals(mainWaybill.getCustomsClear()) // 自清自提-不计算
                         && (
                         "0855".equals(mainWaybill.getReceiveCountry()) // 柬埔寨
                                 || "0095".equals(mainWaybill.getReceiveCountry()) // 缅甸
@@ -503,6 +505,11 @@ public class EmisTmsCostFeeServiceImpl extends EmisBaseService implements IEmisT
                 }
                 existsMap.put(uniqKey,1);
 
+                // 判断是否忽略自清自提
+                if("2".equals(mainWaybill.getCustomsClear())&&"1".equals(quotePriceItem.getBlIgnoreZt())){
+                    continue;
+                }
+
                 EmisTmsCostFeeSplit splitItem = new EmisTmsCostFeeSplit();
 
                 splitItem.setBillCode(billCode);
@@ -582,11 +589,14 @@ public class EmisTmsCostFeeServiceImpl extends EmisBaseService implements IEmisT
         // 计算提货费
         List<EmisTmsCostQuotePrice> fixedQuotePrice1004List=emisTmsCostQuotePriceMapper.matchBatchFixedQuotePriceByBillCode(billCode,"1004",-1);
         if(!CollectionUtils.isEmpty(fixedQuotePrice1004List)){
-
             // 检查重复
             Map existsMap = new HashMap();
             for (EmisTmsCostQuotePrice quotePriceItem : fixedQuotePrice1004List) {
 
+
+                if()
+
+
                 // 如果网点重复就忽略
                 String uniqKey = quotePriceItem.getStartSiteCode() + "-"+quotePriceItem.getNextSiteCode();
                 if(existsMap.containsKey(uniqKey)){

emis-biz/src/main/resources/mapper/EmisTmsCostQuotePriceMapper.xml

@@ -91,6 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a.start_date,
             a.end_date,
             a.calculate_expression,
+            a.bl_ignore_zt,
 
             b.batch_no,
             b.car_no,