md

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

@@ -636,6 +636,17 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
                 continue;
             }
 
+            // 判断是否要计算报关费 只有一般贸易报关需要收取报关费
+            // 2002-报关费 3-一般报关
+            if(  !( "3".equals(emisWaybill.getCustomsEclaration()) && "2002".equals(quoteItem.getFeeType()) )  ){
+                continue;
+            }
+
+            // 2003-清关费 3-一般贸易清关
+            if(  !( "3".equals(emisWaybill.getCustomsClear()) && "2003".equals(quoteItem.getFeeType()) )  ){
+                continue;
+            }
+
             EmisWaybillFeeitem feeItem = new EmisWaybillFeeitem();
             // 重量计费 , 一口价
             if("1".equals(calcFeeType) || "3".equals(calcFeeType)){
@@ -756,16 +767,10 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         if(StringUtils.isAnyEmpty(emisWaybill.getTransLineType(),
                 emisWaybill.getSendSiteCode(),
                 emisWaybill.getDispatchUnderlingSiteCode(),
-                emisWaybill.getCalcFeeType()
+                emisWaybill.getCalcFeeType(),
+                emisWaybill.getCustomsClear(),
+                emisWaybill.getCustomsEclaration()
         )
-        ){
-            throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1, "参数不完整");
-        }
-
-        if(StringUtils.isAnyEmpty(emisWaybill.getTransLineType(),
-                emisWaybill.getSendSiteCode(),
-                emisWaybill.getDispatchUnderlingSiteCode(),
-                emisWaybill.getCalcFeeType())
                 ||  emisWaybill.getBillWeight()==null
                 || emisWaybill.getTotalVolume()==null
 

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

@@ -532,7 +532,6 @@
                 and create_time <![CDATA[ <= ]]>  #{params.endCreateTime}
             </if>
 
-
             <if test="params.printFlag != null and params.printFlag != ''">
                 and bl_print=#{params.printFlag}
             </if>