From c699016b99eebf2bd5f215da64ba2dd8b1b62b80 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 18 Jun 2024 17:15:42 +0800
Subject: [PATCH] md

---
 .../java/com/xdadan/erp/web/emis/EmisWaybillController.java  | 4 ++--
 .../java/com/xdadan/erp/emis/service/EmisBaseService.java    | 2 --
 .../xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java | 5 ++++-
 emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml     | 3 +--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
index 211a39e76..20c8aa147 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
@@ -334,7 +334,7 @@ public class EmisWaybillController extends EmisBaseController
      * 查询运单列表列表
      */
     @PreAuthorize("@ss.hasPermi('emis:emisWaybill:list')")
-    @RequestMapping("/list")
+    @GetMapping("/list")
     public TableDataInfo list(EmisWaybill emisWaybill)
     {
         // 非总部只能查看自己的或者与自己相关的订单
@@ -367,7 +367,7 @@ public class EmisWaybillController extends EmisBaseController
      * 查询签收运单列表列表
      */
     @PreAuthorize("@ss.hasPermi('emis:emisWaybill:list')")
-    @RequestMapping("/querySignlist")
+    @GetMapping("/querySignlist")
     public TableDataInfo querySignlist(EmisWaybill emisWaybill)
     {
         // 非总部只能查看自己的或者与自己相关的订单
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index 6d92798f0..f87c090f1 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -1758,8 +1758,6 @@ public class EmisBaseService {
          queryEmisQuotePrice.setSendAreaSiteCode(sendSiteCode);
          queryEmisQuotePrice.setDispAreaSiteCode(destSiteCode);
 
-
-
          Map existsMap = new HashMap();
          List<EmisQuotePrice> listQuoteValid = new ArrayList<>();
 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
index bf3110f23..0b3825bf4 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
@@ -1027,7 +1027,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         List<EmisQuotePrice> emisQuotePriceList=getValidQuotePriceList(emisWaybill.getTransLineType(),emisWaybill.getProductType(),
                 emisWaybill.getSendSiteCode(),emisWaybill.getDispatchUnderlingSiteCode(),
                 emisWaybill.getCalcFeeType(),emisWaybill.getCustomerCode(),emisWaybill.getCustNo()
-
         );
 
 
@@ -1168,6 +1167,10 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         emisWaybill.setFeeitemList(feeList);
         emisWaybill.setFreight(BigDecimal.valueOf(totalFee));
 
+        if(emisWaybill.getFreight().compareTo(BigDecimal.ZERO)==0){
+            throw new EmisBizError(EmisBizErrorType.CALC_QUOTE_ERROR, "报价未配置");
+        }
+
     }
 
     /**
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 9876bc4bb..0cb0fab7e 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -407,7 +407,7 @@
             <if test="receiveCompany != null  and receiveCompany != ''"> and receive_company like concat('%', #{receiveCompany}, '%')</if>
             <if test="receiveMobile != null  and receiveMobile != ''"> and receive_mobile like concat('%', #{receiveMobile}, '%')</if>
             <if test="receiveTel != null  and receiveTel != ''"> and receive_tel like concat('%', #{receiveTel}, '%')</if>
-            <if test="receiveCountry != null  and receiveCountry != ''"> and receive_country=#{receiveCountry}</if>
+            <if test="receiveCountry != null  and receiveCountry  != ''"> and receive_country=#{receiveCountry}</if>
             <if test="receiveProvince != null  and receiveProvince != ''"> and receive_province=#{receiveProvince}</if>
             <if test="receiveCity != null  and receiveCity != ''"> and receive_city=#{receiveCity}</if>
             <if test="receiveCounty != null  and receiveCounty != ''"> and receive_county=#{receiveCounty}</if>
@@ -593,7 +593,6 @@
                 and a.trans_line_type in(
                     select line_code from emis_trans_line etl where  etl.trans_type=1
                 )
-                and a.bl_is_question = '0'
             </if>