From a129e3653b57415d0dbb4b4bf275647e61c38c12 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Tue, 16 Dec 2025 09:58:04 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20TMS=E7=B3=BB=E7=BB=9F=20-=20?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86=20-=20=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=20-=20=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96-=E5=BA=95=E9=83=A8=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE=E6=80=BB=E6=95=B0=E5=92=8C?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E7=9C=8B=E6=95=B0=E6=8D=AE=20?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=AF=8F=E9=A1=B520=E6=9D=A1=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=20=20=20TMS=E7=B3=BB=E7=BB=9F/APP=20-=20=E8=BF=90?=
 =?UTF-8?q?=E5=8D=95=E5=BD=95=E5=85=A5/=E8=BF=90=E5=8D=95=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9/=E7=BD=91=E7=82=B9=E8=B4=B9=E7=94=A8=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7-=E8=B4=A7=E7=89=A9=E5=90=8D=E7=A7=B0=20=E4=B8=8D?=
 =?UTF-8?q?=E5=85=81=E8=AE=B8=20=E5=8F=AA=E5=A1=AB=E5=86=99=E2=80=9D?=
 =?UTF-8?q?=E7=A9=BA=E6=A0=BC=E3=80=81=E6=A0=87=E7=82=B9=E7=AC=A6=E5=8F=B7?=
 =?UTF-8?q?=E3=80=81=E7=89=B9=E6=AE=8A=E7=AC=A6=E5=8F=B7=E2=80=9C=E6=9D=A5?=
 =?UTF-8?q?=E4=BB=A3=E6=9B=BF=20=E8=B4=A7=E7=89=A9=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/web/emis/EmisWaybillController.java   |   3 +-
 .../web/emis/annotation/OrderLightCount.java  |  14 +
 .../emis/aspect/OrderLightCountAspect.java    |  81 +++++
 .../erp/emis/domain/EmisWaybillOther.java     |   1 +
 .../erp/emis/mapper/EmisWaybillMapper.java    |   5 +
 .../emis/mapper/EmisWaybillOtherMapper.java   |   1 +
 .../erp/emis/service/IEmisWaybillService.java |   1 +
 .../service/impl/EmisWaybillServiceImpl.java  |  14 +-
 .../resources/mapper/EmisWaybillMapper.xml    | 283 ++++++++++++++++++
 9 files changed, 401 insertions(+), 2 deletions(-)
 create mode 100644 emis-biz-web/src/main/java/com/xdadan/erp/web/emis/annotation/OrderLightCount.java
 create mode 100644 emis-biz-web/src/main/java/com/xdadan/erp/web/emis/aspect/OrderLightCountAspect.java

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 b1aaf6326..c86d69f84 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
@@ -47,6 +47,7 @@ import com.xdadan.erp.system.domain.SysFileInfo;
 import com.xdadan.erp.system.service.ISysFileInfoService;
 import com.xdadan.erp.system.service.ISysUserService;
 import com.xdadan.erp.web.emis.annotation.WaybillLightCount;
+import com.xdadan.erp.web.emis.annotation.OrderLightCount;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -580,7 +581,7 @@ public class EmisWaybillController extends EmisBaseController
      */
     @PreAuthorize("@ss.hasPermi('emis:emisWaybill:list')")
     @GetMapping("/listOrder")
-    @WaybillLightCount
+    @OrderLightCount
     public TableDataInfo listOrder(EmisWaybill emisWaybill)
     {
         // 非总部只能查看自己的或者与自己相关的订单
diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/annotation/OrderLightCount.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/annotation/OrderLightCount.java
new file mode 100644
index 000000000..9d56e9d54
--- /dev/null
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/annotation/OrderLightCount.java
@@ -0,0 +1,14 @@
+package com.xdadan.erp.web.emis.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 订单查询轻量 count 注解
+ * - 在控制器方法上使用，统一采用轻量 count 查询
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface OrderLightCount {
+}
+
diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/aspect/OrderLightCountAspect.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/aspect/OrderLightCountAspect.java
new file mode 100644
index 000000000..15e4e56cf
--- /dev/null
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/aspect/OrderLightCountAspect.java
@@ -0,0 +1,81 @@
+package com.xdadan.erp.web.emis.aspect;
+
+import com.github.pagehelper.PageHelper;
+import com.xdadan.erp.common.core.page.PageDomain;
+import com.xdadan.erp.common.core.page.TableDataInfo;
+import com.xdadan.erp.common.core.page.TableSupport;
+import com.xdadan.erp.emis.domain.EmisWaybill;
+import com.xdadan.erp.emis.service.IEmisWaybillService;
+import com.xdadan.erp.web.emis.annotation.OrderLightCount;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.springframework.stereotype.Component;
+
+/**
+ * 订单查询轻量 count 切面
+ * - 统一关闭 PageHelper 自动 count
+ * - 使用轻量 count SQL 计算总数
+ */
+@Aspect
+@Component
+@Slf4j
+@RequiredArgsConstructor
+public class OrderLightCountAspect {
+
+    private final IEmisWaybillService emisWaybillService;
+
+    @Pointcut("@annotation(com.xdadan.erp.web.emis.annotation.OrderLightCount)")
+    public void lightCountPointcut() {}
+
+    @Around("lightCountPointcut()")
+    public Object around(ProceedingJoinPoint joinPoint) throws Throwable {
+        // 统一分页：禁用自动 count，保留 orderBy
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        String orderBy = pageDomain.getOrderBy();
+        if (pageNum != null && pageSize != null) {
+            PageHelper.startPage(pageNum, pageSize, false);
+            if (StringUtils.isNotEmpty(orderBy)) {
+                PageHelper.orderBy(orderBy);
+            }
+        }
+
+        Object result = joinPoint.proceed();
+
+        if (!(result instanceof TableDataInfo)) {
+            return result;
+        }
+
+        EmisWaybill param = null;
+        for (Object arg : joinPoint.getArgs()) {
+            if (arg instanceof EmisWaybill) {
+                param = (EmisWaybill) arg;
+                break;
+            }
+        }
+
+        if (param == null) {
+            return result;
+        }
+
+        long total = 0L;
+        try {
+            total = emisWaybillService.countOrderList(param);
+        } catch (Exception ex) {
+            log.warn("Order light count failed, fallback to current total. param={}", param.getBillCode(), ex);
+        }
+
+        TableDataInfo table = (TableDataInfo) result;
+        if (total > 0) {
+            table.setTotal(total);
+        }
+        return table;
+    }
+}
+
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillOther.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillOther.java
index 891f0c016..7ff78ac66 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillOther.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillOther.java
@@ -51,3 +51,4 @@ public class EmisWaybillOther extends BaseEntity {
 
 
 
+
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java
index b83b67fa9..37651a741 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java
@@ -146,6 +146,11 @@ public interface EmisWaybillMapper extends BaseMapper<EmisWaybill>
      */
     public long countWaybillList(EmisWaybill emisWaybill);
 
+    /**
+     * 订单列表轻量计数
+     */
+    public long countOrderList(EmisWaybill emisWaybill);
+
 
 
 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillOtherMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillOtherMapper.java
index 4f27c0854..425e4d341 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillOtherMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillOtherMapper.java
@@ -80,3 +80,4 @@ public interface EmisWaybillOtherMapper extends BaseMapper<EmisWaybillOther> {
 
 
 
+
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java
index bc9c499dd..94cc188ed 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java
@@ -252,6 +252,7 @@ public interface IEmisWaybillService extends IDataAuditService
 
     public List<EmisWaybill> selectPrintWaybillList(EmisWaybill emisWaybill);
     public long countWaybillList(EmisWaybill emisWaybill);
+    public long countOrderList(EmisWaybill emisWaybill);
 
     public void genWarehouseInTplFileByOms(HttpServletResponse response, String orderSn,String fileType) throws EmisBizError ;
     public void genWarehouseInTplFile(HttpServletResponse response, String orderSn,String fileType) throws EmisBizError ;
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 e295c2bba..481db30f5 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
@@ -71,7 +71,8 @@ package com.xdadan.erp.emis.service.impl;
  import java.util.concurrent.ExecutorService;
  import java.util.concurrent.Executors;
  import java.util.concurrent.Future;
- import java.util.stream.Collectors;
+import java.util.stream.Collectors;
+import java.util.regex.Pattern;
 
  /**
  * 运单列表Service业务层处理
@@ -2359,6 +2360,12 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
      */
     private void calcWayBillCommonInfo(EmisWaybill emisWaybillSave,EmisWaybill oldWaybil,boolean isNew) throws EmisBizError {
 
+        // 校验货物信息，不能只包含空格或符号
+        String goodsInfo = emisWaybillSave.getGoodsInfo();
+        if (StringUtils.isBlank(goodsInfo) || !Pattern.compile("[\\p{L}\\p{N}]").matcher(goodsInfo).find()) {
+            throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1, "货物信息不能只包含空格、标点或特殊符号");
+        }
+
         String orderSn = WaybillHelper.genOrderSn();
 
         // 订单号
@@ -4562,6 +4569,11 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         return emisWaybillMapper.countWaybillList(emisWaybill);
     }
 
+    @Override
+    public long countOrderList(EmisWaybill emisWaybill){
+        return emisWaybillMapper.countOrderList(emisWaybill);
+    }
+
     @Override
     public void genWarehouseInTplFileByOms(HttpServletResponse response, String orderSn,String fileType) throws EmisBizError {
 
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 038b5675a..506615ac4 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -1201,6 +1201,289 @@
         </if>
     </select>
 
+    <select id="countOrderList" parameterType="EmisWaybill" resultType="long">
+        select count(1)
+        from emis_waybill a
+        <where>
+            a.del_flag='0' and a.order_type='0'
+
+            <if test="id != null "> and a.id = #{id}</if>
+            <if test="orderSn != null  and orderSn != ''"> and ( FIND_IN_SET(a.`order_sn`,#{orderSn}) or a.order_sn like concat('%', #{orderSn}, '%') ) </if>
+
+            <if test="billCode != null  and billCode != '' and ( params.billCodeSortList == null or (params.billCodeSortList != null and params.billCodeSortList.size() == 1 ) )">
+                and ( a.`bill_code`=#{billCode} or a.bill_code like concat('%',#{billCode}) )
+            </if>
+            <if test="params.billCodeSortList != null and params.billCodeSortList.size() > 1  ">
+                and a.bill_code in
+                <foreach collection="params.billCodeSortList" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+
+
+            <if test="orderType != null  and orderType != ''"> and a.order_type=#{orderType}</if>
+            <if test="custOrderId != null  and custOrderId != ''"> and a.cust_order_id=#{custOrderId}</if>
+            <if test="billCodeSub != null  and billCodeSub != ''"> and a.bill_code_sub like concat('%', #{billCodeSub}, '%')</if>
+            <if test="orderStatus != null  and orderStatus != ''"> and a.order_status=#{orderStatus}</if>
+            <if test="waybillStatus != null  and waybillStatus != ''"> and a.waybill_status=#{waybillStatus}</if>
+            <if test="orderType != null  and orderType != ''"> and a.order_type=#{orderType}</if>
+            <if test="orderDate != null "> and a.order_date = #{orderDate}</if>
+            <if test="userId != null "> and a.user_id = #{userId}</if>
+            <if test="customerCode != null  and customerCode != ''"> and a.customer_code=#{customerCode}</if>
+            <if test="customerName != null  and customerName != ''"> and a.customer_name like concat('%', #{customerName}, '%')</if>
+            <if test="openId != null  and openId != ''"> and a.open_id like concat('%', #{openId}, '%')</if>
+            <if test="receiveName != null  and receiveName != ''"> and a.receive_name like concat('%', #{receiveName}, '%')</if>
+            <if test="receiveCompany != null  and receiveCompany != ''"> and a.receive_company like concat('%', #{receiveCompany}, '%')</if>
+            <if test="receiveMobile != null  and receiveMobile != ''"> and a.receive_mobile like concat('%', #{receiveMobile}, '%')</if>
+            <if test="receiveTel != null  and receiveTel != ''"> and a.receive_tel like concat('%', #{receiveTel}, '%')</if>
+            <if test="receiveCountry != null  and receiveCountry  != ''"> and a.receive_country=#{receiveCountry}</if>
+            <if test="receiveProvince != null  and receiveProvince != ''"> and a.receive_province=#{receiveProvince}</if>
+            <if test="receiveCity != null  and receiveCity != ''"> and a.receive_city=#{receiveCity}</if>
+            <if test="receiveCounty != null  and receiveCounty != ''"> and a.receive_county=#{receiveCounty}</if>
+            <if test="receiveTown != null  and receiveTown != ''"> and a.receive_town=#{receiveTown}</if>
+            <if test="receiveAddress != null  and receiveAddress != ''"> and a.receive_address like concat('%', #{receiveAddress}, '%')</if>
+            <if test="receivePostcode != null  and receivePostcode != ''"> and a.receive_postcode like concat('%', #{receivePostcode}, '%')</if>
+            <if test="receivePcd != null  and receivePcd != ''"> and a.receive_pcd like concat('%', #{receivePcd}, '%')</if>
+            <if test="sendName != null  and sendName != ''"> and a.send_name like concat('%', #{sendName}, '%')</if>
+            <if test="sendCompany != null  and sendCompany != ''"> and a.send_company like concat('%', #{sendCompany}, '%')</if>
+            <if test="sendMobile != null  and sendMobile != ''"> and a.send_mobile like concat('%', #{sendMobile}, '%')</if>
+            <if test="sendTel != null  and sendTel != ''"> and a.send_tel like concat('%', #{sendTel}, '%')</if>
+            <if test="sendCountry != null  and sendCountry != ''"> and a.send_country=#{sendCountry}</if>
+            <if test="sendProvince != null  and sendProvince != ''"> and a.send_province=#{sendProvince}</if>
+            <if test="sendCity != null  and sendCity != ''"> and a.send_city=#{sendCity}</if>
+            <if test="sendCounty != null  and sendCounty != ''"> and a.send_county=#{sendCounty}</if>
+            <if test="sendTown != null  and sendTown != ''"> and a.send_town=#{sendTown}</if>
+            <if test="sendAddress != null  and sendAddress != ''"> and a.send_address like concat('%', #{sendAddress}, '%')</if>
+            <if test="sendPostcode != null  and sendPostcode != ''"> and a.send_postcode like concat('%', #{sendPostcode}, '%')</if>
+            <if test="enterpriseName != null  and enterpriseName != ''"> and a.enterprise_name like concat('%', #{enterpriseName}, '%')</if>
+            <if test="enterpriseTaxId != null  and enterpriseTaxId != ''"> and a.enterprise_tax_id like concat('%', #{enterpriseTaxId}, '%')</if>
+            <if test="paymentType != null  and paymentType != ''"> and a.payment_type=#{paymentType}</if>
+            <if test="calcFeeType != null  and calcFeeType != ''"> and a.calc_fee_type=#{calcFeeType}</if>
+            <if test="custNo != null  and custNo != ''"> and a.cust_no like concat('%', #{custNo}, '%')</if>
+            <if test="custName != null  and custName != ''"> and a.cust_name like concat('%', #{custName}, '%')</if>
+            <include refid="salesSupportFilter"/>
+            <if test="transLineType != null  and transLineType != ''"> and a.trans_line_type=#{transLineType}</if>
+            <if test="productType != null  and productType != ''"> and a.product_type=#{productType}</if>
+            <if test="timeType != null  and timeType != ''"> and a.time_type like concat('%', #{timeType}, '%')</if>
+            <if test="meterType != null  and meterType != ''"> and a.meter_type like concat('%', #{meterType}, '%')</if>
+            <if test="carryType != null  and carryType != ''"> and a.carry_type like concat('%', #{carryType}, '%')</if>
+            <if test="customsClear != null  and customsClear != ''"> and a.customs_clear=#{customsClear}</if>
+            <if test="customsEclaration != null  and customsEclaration != ''"> and a.customs_eclaration=#{customsEclaration}</if>
+            <if test="estimateDate != null "> and a.estimate_date = #{estimateDate}</if>
+            <if test="packType != null  and packType != ''"> and FIND_IN_SET(#{packType},a.pack_type)</if>
+            <if test="dispatchMethod != null  and dispatchMethod != ''"> and a.dispatch_method=#{dispatchMethod}</if>
+            <if test="pickupMethod != null  and pickupMethod != ''"> and a.pickup_method= #{pickupMethod}</if>
+            <if test="pickStartDate != null "> and a.pick_start_date = #{pickStartDate}</if>
+            <if test="pickFinishDate != null "> and a.pick_finish_date = #{pickFinishDate}</if>
+            <if test="pickFailReason != null  and pickFailReason != ''"> and a.pick_fail_reason like concat('%', #{pickFailReason}, '%')</if>
+            <if test="intoWarehouseCode != null  and intoWarehouseCode != ''"> and a.into_warehouse_code like concat('%', #{intoWarehouseCode}, '%')</if>
+            <if test="intoWarehouseName != null  and intoWarehouseName != ''"> and a.into_warehouse_name like concat('%', #{intoWarehouseName}, '%')</if>
+            <if test="intoWarehouseAddress != null  and intoWarehouseAddress != ''"> and a.into_warehouse_address like concat('%', #{intoWarehouseAddress}, '%')</if>
+            <if test="intoWarehouseContact != null  and intoWarehouseContact != ''"> and a.into_warehouse_contact like concat('%', #{intoWarehouseContact}, '%')</if>
+            <if test="intoWarehousePhone != null  and intoWarehousePhone != ''"> and a.into_warehouse_phone like concat('%', #{intoWarehousePhone}, '%')</if>
+            <if test="intoWarehouseBillCode != null  and intoWarehouseBillCode != ''"> and a.into_warehouse_bill_code like concat('%', #{intoWarehouseBillCode}, '%')</if>
+            <if test="warehouseInNo != null  and warehouseInNo != ''"> and a.warehouse_in_no like concat('%', #{warehouseInNo}, '%')</if>
+            <if test="customerDeliveryBeginTime != null  and customerDeliveryBeginTime != ''"> and a.customer_delivery_begin_time like concat('%', #{customerDeliveryBeginTime}, '%')</if>
+            <if test="customerDeliveryEndTime != null  and customerDeliveryEndTime != ''"> and a.customer_delivery_end_time like concat('%', #{customerDeliveryEndTime}, '%')</if>
+            <if test="goodsInfo != null  and goodsInfo != ''"> and a.goods_info like concat('%', #{goodsInfo}, '%')</if>
+            <if test="blPrepareInFreight != null  and blPrepareInFreight != ''"> and a.bl_prepare_in_freight=#{blPrepareInFreight}</if>
+            <if test="prepareInEstFee != null "> and a.prepare_in_est_fee = #{prepareInEstFee}</if>
+            <if test="prepareInRealFee != null "> and a.prepare_in_real_fee = #{prepareInRealFee}</if>
+            <if test="prepareInExpress != null  and prepareInExpress != ''"> and a.prepare_in_express like concat('%', #{prepareInExpress}, '%')</if>
+            <if test="prepareInBillCode != null  and prepareInBillCode != ''"> and a.prepare_in_bill_code like concat('%', #{prepareInBillCode}, '%')</if>
+            <if test="prepareInRemark != null  and prepareInRemark != ''"> and a.prepare_in_remark like concat('%', #{prepareInRemark}, '%')</if>
+            <if test="prepareInSupplier != null  and prepareInSupplier != ''"> and a.prepare_in_supplier like concat('%', #{prepareInSupplier}, '%')</if>
+            <if test="totalWeight != null "> and a.total_weight = #{totalWeight}</if>
+            <if test="totalVolume != null "> and a.total_volume = #{totalVolume}</if>
+            <if test="parcelQty != null "> and a.parcel_qty = #{parcelQty}</if>
+            <if test="billWeight != null "> and a.bill_weight = #{billWeight}</if>
+            <if test="volumeWeight != null "> and a.volume_weight = #{volumeWeight}</if>
+            <if test="currency != null  and currency != ''"> and a.currency= #{currency}</if>
+            <if test="settlementWeight != null "> and a.settlement_weight = #{settlementWeight}</if>
+            <if test="scanWeight != null "> and a.scan_weight = #{scanWeight}</if>
+            <if test="feeWeight != null "> and a.fee_weight = #{feeWeight}</if>
+            <if test="freight != null "> and a.freight = #{freight}</if>
+            <if test="realPaymentType != null  and realPaymentType != ''"> and a.real_payment_type=#{realPaymentType}</if>
+            <if test="realFee != null "> and a.real_fee = #{realFee}</if>
+            <if test="blSpecialQuote != null  and blSpecialQuote != ''"> and a.bl_special_quote=#{blSpecialQuote}</if>
+            <if test="blOverLong != null  and blOverLong != ''"> and a.bl_over_long=#{blOverLong}</if>
+            <if test="blBill != null  and blBill != ''"> and a.bl_bill=#{blBill}</if>
+            <if test="blBillText != null  and blBillText != ''"> and a.bl_bill_text like concat('%', #{blBillText}, '%')</if>
+            <if test="blOverWeight != null  and blOverWeight != ''"> and a.bl_over_weight like concat('%', #{blOverWeight}, '%')</if>
+            <if test="overWeightNumber != null  and overWeightNumber != ''"> and a.over_weight_number like concat('%', #{overWeightNumber}, '%')</if>
+            <if test="feeRemark != null  and feeRemark != ''"> and a.fee_remark like concat('%', #{feeRemark}, '%')</if>
+            <if test="thirdCode != null  and thirdCode != ''"> and a.third_code like concat('%', #{thirdCode}, '%')</if>
+            <if test="realValue != null  and realValue != ''"> and a.real_value like concat('%', #{realValue}, '%')</if>
+            <if test="blInsure != null  and blInsure != ''"> and a.bl_insure= #{blInsure}</if>
+            <if test="insureValue != null  and insureValue != ''"> and a.insure_value like concat('%', #{insureValue}, '%')</if>
+            <if test="insureValueCurrency != null  and insureValueCurrency != ''"> and a.insure_value_currency like concat('%', #{insureValueCurrency}, '%')</if>
+            <if test="insureFeeCurrency != null  and insureFeeCurrency != ''"> and a.insure_fee_currency like concat('%', #{insureFeeCurrency}, '%')</if>
+            <if test="insureFee != null "> and a.insure_fee = #{insureFee}</if>
+            <if test="insureRemark != null  and insureRemark != ''"> and a.insure_remark like concat('%', #{insureRemark}, '%')</if>
+            <if test="insureSiteCode != null  and insureSiteCode != ''"> and a.insure_site_code=#{insureSiteCode}</if>
+            <if test="blPrint != null  and blPrint != ''"> and a.bl_print=#{blPrint}</if>
+            <if test="printManCode != null  and printManCode != ''"> and a.print_man_code like concat('%', #{printManCode}, '%')</if>
+            <if test="printSite != null  and printSite != ''"> and a.print_site=#{printSite},</if>
+            <if test="printDate != null  and printDate != ''"> and a.print_date like concat('%', #{printDate}, '%')</if>
+            <if test="blDispFd != null  and blDispFd != ''"> and a.bl_disp_fd=#{blDispFd}</if>
+            <if test="transferCode != null  and transferCode != ''"> and a.transfer_code like concat('%', #{transferCode}, '%')</if>
+            <if test="transferBillcode != null  and transferBillcode != ''"> and a.transfer_billcode like concat('%', #{transferBillcode}, '%')</if>
+            <if test="dispFdDate != null "> and a.disp_fd_date = #{dispFdDate}</if>
+            <if test="dispFdReason != null  and dispFdReason != ''"> and a.disp_fd_reason like concat('%', #{dispFdReason}, '%')</if>
+            <if test="currentSiteCode != null  and currentSiteCode != ''"> and a.current_site_code=#{currentSiteCode}</if>
+            <if test="nextSiteCode != null  and nextSiteCode != ''"> and a.next_site_code= #{nextSiteCode}</if>
+            <if test="lastSiteCode != null  and lastSiteCode != ''"> and a.last_site_code=#{lastSiteCode}</if>
+            <if test="registerSiteCode != null  and registerSiteCode != ''"> and a.register_site_code=#{registerSiteCode}</if>
+            <if test="registerDate != null "> and a.register_date = #{registerDate}</if>
+            <if test="registerManCode != null  and registerManCode != ''"> and a.register_man_code= #{registerManCode}</if>
+            <if test="takePieceEmployeeCode != null  and takePieceEmployeeCode != ''"> and a.take_piece_employee_code=#{takePieceEmployeeCode}</if>
+            <if test="sendDate != null "> and a.send_date = #{sendDate}</if>
+            <if test="dispatchManCode != null  and dispatchManCode != ''"> and a.dispatch_man_code=#{dispatchManCode}</if>
+            <if test="dispatchSiteCode != null  and dispatchSiteCode != ''"> and a.dispatch_site_code=#{dispatchSiteCode}</if>
+            <if test="produceBillDate != null "> and a.produce_bill_date = #{produceBillDate}</if>
+            <if test="produceBillSiteCode != null  and produceBillSiteCode != ''"> and a.produce_bill_site_code=#{produceBillSiteCode}</if>
+            <if test="produceBillManCode != null  and produceBillManCode != ''"> and a.produce_bill_man_code=#{produceBillManCode}</if>
+            <if test="destinationCode != null  and destinationCode != ''"> and a.destination_code =#{destinationCode}</if>
+            <if test="destinationProvince != null  and destinationProvince != ''"> and a.destination_province=#{destinationProvince}</if>
+            <if test="destinationCity != null  and destinationCity != ''"> and a.destination_city=#{destinationCity}</if>
+            <if test="destinationCounty != null  and destinationCounty != ''"> and a.destination_county=#{destinationCounty}</if>
+            <if test="dispatchUnderlingSiteCode != null  and dispatchUnderlingSiteCode != ''"> and a.dispatch_underling_site_code=#{dispatchUnderlingSiteCode}</if>
+            <if test="destinationCenterCode != null  and destinationCenterCode != ''"> and a.destination_center_code=#{destinationCenterCode}</if>
+            <if test="marketManCode != null  and marketManCode != ''"> and a.market_man_code = #{marketManCode}</if>
+
+            <if test="operateEmployeeCode != null  and operateEmployeeCode != ''"> and a.operate_employee_code=#{operateEmployeeCode}</if>
+            <if test="blIsQuestion != null  and blIsQuestion != ''"> and a.bl_is_question=#{blIsQuestion}</if>
+            <if test="problemType != null  and problemType != ''"> and a.problem_type=#{problemType}</if>
+            <if test="problemCause != null  and problemCause != ''"> and a.problem_cause like concat('%', #{problemCause}, '%')</if>
+            <if test="problemDelayDays != null "> and a.problem_delay_days = #{problemDelayDays}</if>
+            <if test="blMessage != null  and blMessage != ''"> and a.bl_message=#{blMessage}</if>
+            <if test="blAcceptMessage != null  and blAcceptMessage != ''"> and a.bl_accept_message=#{blAcceptMessage}</if>
+            <if test="blGenSubbill != null  and blGenSubbill != ''"> and a.bl_gen_subbill=#{blGenSubbill}</if>
+            <if test="signMan != null  and signMan != ''"> and a.sign_man like concat('%', #{signMan}, '%')</if>
+            <if test="signManCode != null  and signManCode != ''"> and a.sign_man_code=#{signManCode}</if>
+            <if test="signSiteCode != null  and signSiteCode != ''"> and a.sign_site_code=#{signSiteCode}</if>
+            <if test="paymentStatus != null  and paymentStatus != ''"> and a.payment_status =#{paymentStatus}</if>
+            <if test="paymentDate != null "> and a.payment_date = #{paymentDate}</if>
+            <if test="paymentRemark != null  and paymentRemark != ''"> and a.payment_remark like concat('%', #{paymentRemark}, '%')</if>
+            <if test="orderRemark != null  and orderRemark != ''"> and a.order_remark like concat('%', #{orderRemark}, '%')</if>
+
+            <if test="dataFrom != null and dataFrom != ''">and a.data_from = #{dataFrom} </if>
+
+            <if test="remark != null  and remark != ''"> and a.remark like concat('%', #{remark}, '%')</if>
+            <if test="createBy != null  and createBy != ''"> and a.create_by= #{createBy}</if>
+            <if test="updateBy != null  and updateBy != ''"> and a.update_by=#{updateBy}</if>
+            <if test="createSite != null  and createSite != ''"> and a.create_site=#{createSite}</if>
+            <if test="updateSite != null  and updateSite != ''"> and a.update_site=#{updateSite}</if>
+
+            <if test="params.problemQueryType != null and params.problemQueryType == 1 and params.problemQueryIds != null and params.problemQueryIds !=''">
+                and exists (
+                select 1 from emis_waybill_problem_info ewpi where  a.bill_code=ewpi.bill_code and ewpi.del_flag='0' and FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} )
+                )
+            </if>
+
+            <if test="params.problemQueryType != null and params.problemQueryType == 2 and params.problemQueryIds != null and params.problemQueryIds !=''">
+                and  not exists (
+                select 1 from emis_waybill_problem_info ewpi where a.bill_code=ewpi.bill_code and  ewpi.del_flag='0' and  FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} )
+                )
+            </if>
+
+
+            <if test="params.waybillStatType != null and params.waybillStatType == 1">
+                and a.order_type='0'
+                and a.waybill_status='0'
+                and a.order_status in('0','3')
+                and (
+                a.take_piece_employee_code=#{params.privEmpCode}
+                or (a.pickup_method in('1','3') and a.operate_employee_code is null  )
+                or (a.operate_employee_code=#{params.privEmpCode} )
+                )
+            </if>
+
+            <if test="params.waybillStatType != null and params.waybillStatType == 2">
+                and a.waybill_status!='0' and a.order_status!='2'
+                and (
+                a.operate_employee_code=#{params.privEmpCode}
+                or a.take_piece_employee_code=#{params.privEmpCode}
+                or a.register_man_code=#{params.privEmpCode}
+                )
+            </if>
+
+            <if test="params.waybillStatType != null and params.waybillStatType == 3">
+                and a.order_status='2'
+                and (
+                a.operate_employee_code=#{params.privEmpCode}
+                or a.take_piece_employee_code=#{params.privEmpCode}
+                )
+            </if>
+
+            <!-- 转单 -->
+            <if test="params.waybillStatType != null and params.waybillStatType == 4">
+                and a.order_status in('0','3') and exists (
+                select 1 from  emis_waybill_change_to ewcto where a.bill_code=ewcto.bill_code and ewcto.change_from=#{params.privEmpCode}
+                )
+            </if>
+
+            <if test="params.beginOrderDate != null and params.beginOrderDate != ''">
+                and a.order_date <![CDATA[ >= ]]>  #{params.beginOrderDate}
+            </if>
+            <if test="params.endOrderDate != null and params.endOrderDate != ''">
+                and a.order_date <![CDATA[ <= ]]>  #{params.endOrderDate}
+            </if>
+
+            <if test="params.beginPickStartDate != null and params.beginPickStartDate != ''">
+                and a.pick_start_date <![CDATA[ >= ]]>  #{params.beginPickStartDate}
+            </if>
+            <if test="params.endPickStartDate != null and params.endPickStartDate != ''">
+                and a.pick_start_date <![CDATA[ <= ]]>  #{params.endPickStartDate}
+            </if>
+
+            <if test="payee != null  and payee != ''">
+                and a.payee=#{payee}
+            </if>
+
+            <if test="salesmen != null  and salesmen != '' " >
+                and a.salesmen=#{salesmen}
+            </if>
+
+            <if test="sendSiteCode != null  and sendSiteCode != ''">
+                and a.send_site_code=#{sendSiteCode}
+            </if>
+
+            <if test="blSign != null  and blSign != ''">
+                and a.bl_sign=#{blSign}
+            </if>
+
+            <if test="params.beginDate != null and params.beginDate != ''">
+                and a.create_time <![CDATA[ >= ]]>  #{params.beginDate}
+            </if>
+            <if test="params.endDate != null and params.endDate != ''">
+                and a.create_time <![CDATA[ <= ]]>  #{params.endDate}
+            </if>
+
+            <if test="params.beginSendDate != null and params.beginSendDate != ''">
+                and a.send_date <![CDATA[ >= ]]>  #{params.beginSendDate}
+            </if>
+            <if test="params.endSendDate != null and params.endSendDate != ''">
+                and a.send_date <![CDATA[ <= ]]>  #{params.endSendDate}
+            </if>
+
+            <if test="params.beginCreateTime != null and params.beginCreateTime != ''">
+                and a.create_time <![CDATA[ >= ]]>  #{params.beginCreateTime}
+            </if>
+            <if test="params.endCreateTime != null and params.endCreateTime != ''">
+                and a.create_time <![CDATA[ <= ]]>  #{params.endCreateTime}
+            </if>
+
+
+            <if test="salesmen == null and params.privSiteCode != null and params.privSiteCode != '88888'">
+                and (
+                a.send_site_code=#{params.privSiteCode} or a.start_site_code=#{params.privSiteCode}
+                )
+            </if>
+
+        </where>
+    </select>
+
     <select id="selectEmisWaybillList" parameterType="EmisWaybill" resultMap="EmisWaybillResult">
         <include refid="selectEmisWaybillVo"/>
         <where>