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 e5792f35f..c55d33933 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
@@ -2344,7 +2344,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         // 子单号做扣减
         if ("1".equals(emisWaybillSave.getBlGenSubbill())) {
             Integer subBillCount = emisElectronicSitePagService.getTotalAvailablePagCount(emisWaybillSave.getSendSiteCode(), "T7080", "1002");
-            if (subBillCount <= 0) {
+            if ( subBillCount==null || (subBillCount!=null && subBillCount <= 0) ) {
                 throw new EmisBizError(EmisBizErrorType.FAIL, "子单数量不足");
             }
         }
diff --git a/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml b/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml
index 8f11e577d..7b0537ac3 100644
--- a/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml
@@ -310,8 +310,8 @@
         <if test="searchValue != null  and searchValue != ''">
          and site_name like concat('%', #{searchValue}, '%')
         </if>
-        <if test="transTypeId != null  and transTypeId != ''">
-            and FIND_IN_SET(`trans_type_id`,#{transTypeId})
+        <if test="params.transTypeId != null  and params.transTypeId != ''">
+            and FIND_IN_SET(`trans_type_id`,#{params.transTypeId})
         </if>
 
     </select>
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 8726bfe00..120908daf 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -490,6 +490,281 @@
         </if>
     </select>
 
+    <select id="selectWaitGotOrderList" parameterType="EmisWaybill" resultMap="EmisWaybillResult">
+        <include refid="selectEmisWaybillVo"/>
+        <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(`order_sn`,#{orderSn}) or order_sn like concat('%', #{orderSn}, '%') ) </if>
+            <if test="billCode != null  and billCode != ''"> and ( FIND_IN_SET(`bill_code`,#{billCode}) or bill_code like concat('%', #{billCode}, '%') )  </if>
+
+            <if test="orderStatus != null  and orderStatus != ''"> and order_status=#{orderStatus}</if>
+            <if test="waybillStatus != null  and waybillStatus != ''"> and waybill_status=#{waybillStatus}</if>
+            <if test="orderDate != null "> and order_date = #{orderDate}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="customerCode != null  and customerCode != ''"> and customer_code=#{customerCode}</if>
+            <if test="customerName != null  and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
+            <if test="openId != null  and openId != ''"> and open_id like concat('%', #{openId}, '%')</if>
+            <if test="receiveName != null  and receiveName != ''"> and receive_name like concat('%', #{receiveName}, '%')</if>
+            <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="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>
+            <if test="receiveTown != null  and receiveTown != ''"> and receive_town=#{receiveTown}</if>
+            <if test="receiveAddress != null  and receiveAddress != ''"> and receive_address like concat('%', #{receiveAddress}, '%')</if>
+            <if test="receivePostcode != null  and receivePostcode != ''"> and receive_postcode like concat('%', #{receivePostcode}, '%')</if>
+            <if test="receivePcd != null  and receivePcd != ''"> and receive_pcd like concat('%', #{receivePcd}, '%')</if>
+            <if test="sendName != null  and sendName != ''"> and send_name like concat('%', #{sendName}, '%')</if>
+            <if test="sendCompany != null  and sendCompany != ''"> and send_company like concat('%', #{sendCompany}, '%')</if>
+            <if test="sendMobile != null  and sendMobile != ''"> and send_mobile like concat('%', #{sendMobile}, '%')</if>
+            <if test="sendTel != null  and sendTel != ''"> and send_tel like concat('%', #{sendTel}, '%')</if>
+            <if test="sendCountry != null  and sendCountry != ''"> and send_country=#{sendCountry}</if>
+            <if test="sendProvince != null  and sendProvince != ''"> and send_province=#{sendProvince}</if>
+            <if test="sendCity != null  and sendCity != ''"> and send_city=#{sendCity}</if>
+            <if test="sendCounty != null  and sendCounty != ''"> and send_county=#{sendCounty}</if>
+            <if test="sendTown != null  and sendTown != ''"> and send_town=#{sendTown}</if>
+            <if test="sendAddress != null  and sendAddress != ''"> and send_address like concat('%', #{sendAddress}, '%')</if>
+            <if test="sendPostcode != null  and sendPostcode != ''"> and send_postcode like concat('%', #{sendPostcode}, '%')</if>
+            <if test="paymentType != null  and paymentType != ''"> and payment_type=#{paymentType}</if>
+            <if test="calcFeeType != null  and calcFeeType != ''"> and calc_fee_type=#{calcFeeType}</if>
+            <if test="custNo != null  and custNo != ''"> and cust_no like concat('%', #{custNo}, '%')</if>
+            <if test="custName != null  and custName != ''"> and cust_name like concat('%', #{custName}, '%')</if>
+            <if test="transLineType != null  and transLineType != ''"> and trans_line_type=#{transLineType}</if>
+            <if test="productType != null  and productType != ''"> and product_type=#{productType}</if>
+            <if test="timeType != null  and timeType != ''"> and time_type like concat('%', #{timeType}, '%')</if>
+            <if test="meterType != null  and meterType != ''"> and meter_type like concat('%', #{meterType}, '%')</if>
+            <if test="carryType != null  and carryType != ''"> and carry_type like concat('%', #{carryType}, '%')</if>
+            <if test="customsClear != null  and customsClear != ''"> and customs_clear=#{customsClear}</if>
+            <if test="customsEclaration != null  and customsEclaration != ''"> and customs_eclaration=#{customsEclaration}</if>
+            <if test="estimateDate != null "> and estimate_date = #{estimateDate}</if>
+            <if test="packType != null  and packType != ''"> and FIND_IN_SET(#{packType},pack_type)</if>
+            <if test="dispatchMethod != null  and dispatchMethod != ''"> and dispatch_method=#{dispatchMethod}</if>
+            <if test="pickupMethod != null  and pickupMethod != ''"> and pickup_method= #{pickupMethod}</if>
+            <if test="pickStartDate != null "> and pick_start_date = #{pickStartDate}</if>
+            <if test="pickFinishDate != null "> and pick_finish_date = #{pickFinishDate}</if>
+            <if test="pickFailReason != null  and pickFailReason != ''"> and pick_fail_reason like concat('%', #{pickFailReason}, '%')</if>
+            <if test="intoWarehouseCode != null  and intoWarehouseCode != ''"> and into_warehouse_code like concat('%', #{intoWarehouseCode}, '%')</if>
+            <if test="intoWarehouseName != null  and intoWarehouseName != ''"> and into_warehouse_name like concat('%', #{intoWarehouseName}, '%')</if>
+            <if test="intoWarehouseAddress != null  and intoWarehouseAddress != ''"> and into_warehouse_address like concat('%', #{intoWarehouseAddress}, '%')</if>
+            <if test="intoWarehouseContact != null  and intoWarehouseContact != ''"> and into_warehouse_contact like concat('%', #{intoWarehouseContact}, '%')</if>
+            <if test="intoWarehousePhone != null  and intoWarehousePhone != ''"> and into_warehouse_phone like concat('%', #{intoWarehousePhone}, '%')</if>
+            <if test="intoWarehouseBillCode != null  and intoWarehouseBillCode != ''"> and into_warehouse_bill_code like concat('%', #{intoWarehouseBillCode}, '%')</if>
+            <if test="warehouseInNo != null  and warehouseInNo != ''"> and warehouse_in_no like concat('%', #{warehouseInNo}, '%')</if>
+            <if test="customerDeliveryBeginTime != null  and customerDeliveryBeginTime != ''"> and customer_delivery_begin_time like concat('%', #{customerDeliveryBeginTime}, '%')</if>
+            <if test="customerDeliveryEndTime != null  and customerDeliveryEndTime != ''"> and customer_delivery_end_time like concat('%', #{customerDeliveryEndTime}, '%')</if>
+            <if test="goodsInfo != null  and goodsInfo != ''"> and goods_info like concat('%', #{goodsInfo}, '%')</if>
+            <if test="blPrepareInFreight != null  and blPrepareInFreight != ''"> and bl_prepare_in_freight=#{blPrepareInFreight}</if>
+            <if test="prepareInEstFee != null "> and prepare_in_est_fee = #{prepareInEstFee}</if>
+            <if test="prepareInRealFee != null "> and prepare_in_real_fee = #{prepareInRealFee}</if>
+            <if test="prepareInExpress != null  and prepareInExpress != ''"> and prepare_in_express like concat('%', #{prepareInExpress}, '%')</if>
+            <if test="prepareInBillCode != null  and prepareInBillCode != ''"> and prepare_in_bill_code like concat('%', #{prepareInBillCode}, '%')</if>
+            <if test="prepareInRemark != null  and prepareInRemark != ''"> and prepare_in_remark like concat('%', #{prepareInRemark}, '%')</if>
+            <if test="prepareInSupplier != null  and prepareInSupplier != ''"> and prepare_in_supplier like concat('%', #{prepareInSupplier}, '%')</if>
+            <if test="totalWeight != null "> and total_weight = #{totalWeight}</if>
+            <if test="totalVolume != null "> and total_volume = #{totalVolume}</if>
+            <if test="parcelQty != null "> and parcel_qty = #{parcelQty}</if>
+            <if test="billWeight != null "> and bill_weight = #{billWeight}</if>
+            <if test="volumeWeight != null "> and volume_weight = #{volumeWeight}</if>
+            <if test="currency != null  and currency != ''"> and currency= #{currency}</if>
+            <if test="settlementWeight != null "> and settlement_weight = #{settlementWeight}</if>
+            <if test="scanWeight != null "> and scan_weight = #{scanWeight}</if>
+            <if test="feeWeight != null "> and fee_weight = #{feeWeight}</if>
+            <if test="freight != null "> and freight = #{freight}</if>
+            <if test="realPaymentType != null  and realPaymentType != ''"> and real_payment_type=#{realPaymentType}</if>
+            <if test="realFee != null "> and real_fee = #{realFee}</if>
+            <if test="blSpecialQuote != null  and blSpecialQuote != ''"> and bl_special_quote=#{blSpecialQuote}</if>
+            <if test="blOverLong != null  and blOverLong != ''"> and bl_over_long=#{blOverLong}</if>
+            <if test="blBill != null  and blBill != ''"> and bl_bill=#{blBill}</if>
+            <if test="blBillText != null  and blBillText != ''"> and bl_bill_text like concat('%', #{blBillText}, '%')</if>
+            <if test="blOverWeight != null  and blOverWeight != ''"> and bl_over_weight like concat('%', #{blOverWeight}, '%')</if>
+            <if test="overWeightNumber != null  and overWeightNumber != ''"> and over_weight_number like concat('%', #{overWeightNumber}, '%')</if>
+            <if test="feeRemark != null  and feeRemark != ''"> and fee_remark like concat('%', #{feeRemark}, '%')</if>
+            <if test="thirdCode != null  and thirdCode != ''"> and third_code like concat('%', #{thirdCode}, '%')</if>
+            <if test="realValue != null  and realValue != ''"> and real_value like concat('%', #{realValue}, '%')</if>
+            <if test="blInsure != null  and blInsure != ''"> and bl_insure= #{blInsure}</if>
+            <if test="insureValue != null  and insureValue != ''"> and insure_value like concat('%', #{insureValue}, '%')</if>
+            <if test="insureValueCurrency != null  and insureValueCurrency != ''"> and insure_value_currency like concat('%', #{insureValueCurrency}, '%')</if>
+            <if test="insureFeeCurrency != null  and insureFeeCurrency != ''"> and insure_fee_currency like concat('%', #{insureFeeCurrency}, '%')</if>
+            <if test="insureFee != null "> and insure_fee = #{insureFee}</if>
+            <if test="insureRemark != null  and insureRemark != ''"> and insure_remark like concat('%', #{insureRemark}, '%')</if>
+            <if test="insureSiteCode != null  and insureSiteCode != ''"> and insure_site_code=#{insureSiteCode}</if>
+            <if test="blPrint != null  and blPrint != ''"> and bl_print=#{blPrint}</if>
+            <if test="printManCode != null  and printManCode != ''"> and print_man_code like concat('%', #{printManCode}, '%')</if>
+            <if test="printSite != null  and printSite != ''"> and print_site=#{printSite},</if>
+            <if test="printDate != null  and printDate != ''"> and print_date like concat('%', #{printDate}, '%')</if>
+            <if test="blDispFd != null  and blDispFd != ''"> and bl_disp_fd=#{blDispFd}</if>
+            <if test="transferCode != null  and transferCode != ''"> and transfer_code like concat('%', #{transferCode}, '%')</if>
+            <if test="transferBillcode != null  and transferBillcode != ''"> and transfer_billcode like concat('%', #{transferBillcode}, '%')</if>
+            <if test="dispFdDate != null "> and disp_fd_date = #{dispFdDate}</if>
+            <if test="dispFdReason != null  and dispFdReason != ''"> and disp_fd_reason like concat('%', #{dispFdReason}, '%')</if>
+            <if test="currentSiteCode != null  and currentSiteCode != ''"> and current_site_code=#{currentSiteCode}</if>
+            <if test="nextSiteCode != null  and nextSiteCode != ''"> and next_site_code= #{nextSiteCode}</if>
+            <if test="lastSiteCode != null  and lastSiteCode != ''"> and last_site_code=#{lastSiteCode}</if>
+            <if test="registerSiteCode != null  and registerSiteCode != ''"> and register_site_code=#{registerSiteCode}</if>
+            <if test="registerDate != null "> and register_date = #{registerDate}</if>
+            <if test="registerManCode != null  and registerManCode != ''"> and register_man_code= #{registerManCode}</if>
+            <if test="takePieceEmployeeCode != null  and takePieceEmployeeCode != ''"> and take_piece_employee_code=#{takePieceEmployeeCode}</if>
+            <if test="sendDate != null "> and send_date = #{sendDate}</if>
+            <if test="dispatchManCode != null  and dispatchManCode != ''"> and dispatch_man_code=#{dispatchManCode}</if>
+            <if test="dispatchSiteCode != null  and dispatchSiteCode != ''"> and dispatch_site_code=#{dispatchSiteCode}</if>
+            <if test="produceBillDate != null "> and produce_bill_date = #{produceBillDate}</if>
+            <if test="produceBillSiteCode != null  and produceBillSiteCode != ''"> and produce_bill_site_code=#{produceBillSiteCode}</if>
+            <if test="produceBillManCode != null  and produceBillManCode != ''"> and produce_bill_man_code=#{produceBillManCode}</if>
+            <if test="destinationCode != null  and destinationCode != ''"> and destination_code =#{destinationCode}</if>
+            <if test="destinationProvince != null  and destinationProvince != ''"> and destination_province=#{destinationProvince}</if>
+            <if test="destinationCity != null  and destinationCity != ''"> and destination_city=#{destinationCity}</if>
+            <if test="destinationCounty != null  and destinationCounty != ''"> and destination_county=#{destinationCounty}</if>
+            <if test="dispatchUnderlingSiteCode != null  and dispatchUnderlingSiteCode != ''"> and dispatch_underling_site_code=#{dispatchUnderlingSiteCode}</if>
+            <if test="destinationCenterCode != null  and destinationCenterCode != ''"> and destination_center_code=#{destinationCenterCode}</if>
+            <if test="marketManCode != null  and marketManCode != ''"> and market_man_code = #{marketManCode}</if>
+
+            <if test="operateEmployeeCode != null  and operateEmployeeCode != ''"> and operate_employee_code=#{operateEmployeeCode}</if>
+            <if test="blIsQuestion != null  and blIsQuestion != ''"> and bl_is_question=#{blIsQuestion}</if>
+            <if test="problemType != null  and problemType != ''"> and problem_type=#{problemType}</if>
+            <if test="problemCause != null  and problemCause != ''"> and problem_cause like concat('%', #{problemCause}, '%')</if>
+            <if test="problemDelayDays != null "> and problem_delay_days = #{problemDelayDays}</if>
+            <if test="blMessage != null  and blMessage != ''"> and bl_message=#{blMessage}</if>
+            <if test="blAcceptMessage != null  and blAcceptMessage != ''"> and bl_accept_message=#{blAcceptMessage}</if>
+            <if test="blGenSubbill != null  and blGenSubbill != ''"> and bl_gen_subbill=#{blGenSubbill}</if>
+            <if test="signMan != null  and signMan != ''"> and sign_man like concat('%', #{signMan}, '%')</if>
+            <if test="signManCode != null  and signManCode != ''"> and sign_man_code=#{signManCode}</if>
+            <if test="signSiteCode != null  and signSiteCode != ''"> and sign_site_code=#{signSiteCode}</if>
+            <if test="paymentStatus != null  and paymentStatus != ''"> and payment_status =#{paymentStatus}</if>
+            <if test="paymentDate != null "> and payment_date = #{paymentDate}</if>
+            <if test="paymentRemark != null  and paymentRemark != ''"> and payment_remark like concat('%', #{paymentRemark}, '%')</if>
+            <if test="orderRemark != null  and orderRemark != ''"> and order_remark like concat('%', #{orderRemark}, '%')</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.waybillStatType != null and params.waybillStatType == 1">
+                and a.waybill_status='0' and a.order_status='0'
+            </if>
+
+            <if test="params.waybillStatType != null and params.waybillStatType == 2">
+                and a.waybill_status!='0' and a.order_status='1'
+            </if>
+
+            <if test="params.waybillStatType != null and params.waybillStatType == 3">
+                and a.waybill_status!='0'
+            </if>
+
+            <if test="params.waybillStatType != null and params.waybillStatType == 4">
+
+            </if>
+
+            <if test="params.problemQueryType != null and params.problemQueryType == 1 and params.problemQueryIds != null and params.problemQueryIds !=''">
+                and a.bill_code in (
+                select bill_code from emis_waybill_problem_info ewpi where ewpi.del_flag='0' and ewpi.`problem_type` is not null 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 a.bill_code not in (
+                select bill_code from emis_waybill_problem_info ewpi where  ewpi.del_flag='0' and  FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} )
+                )
+            </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="payee != null  and payee != ''">
+                or a.payee=#{payee}
+            </if>
+
+            <if test="salesmen != null  and salesmen != '' " >
+                or a.salesmen=#{salesmen}
+            </if>
+
+            <if test="sendSiteCode != null  and sendSiteCode != ''">
+                and a.send_site_code=#{sendSiteCode}
+            </if>
+
+            <if test="blSign != null  and blSign == 1">
+                and a.bl_sign='1'
+            </if>
+
+            <if test="blSign != null  and blSign == 0">
+                and a.bl_sign!='1'
+            </if>
+
+            <if test="params.beginDate != null and params.beginDate != ''">
+                and a.send_date <![CDATA[ >= ]]>  #{params.beginDate}
+            </if>
+            <if test="params.endDate != null and params.endDate != ''">
+                and a.send_date <![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 in (
+                SELECT t1.site_code FROM (
+                SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
+                #{params.privSiteCode} ) pd
+                WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
+                UNION
+                SELECT #{params.privSiteCode} FROM dual
+                )
+
+                <!--
+                    or a.salesmen=#{params.privEmpName}
+                    or a.payee=#{params.privEmpName}
+                    or a.operate_employee_code=#{params.privEmpCode}
+                    or a.take_piece_employee_code=#{params.privEmpCode}
+                 -->
+
+                )
+            </if>
+
+        </where>
+
+
+
+        <if test="params.orderSnSortList != null and params.orderSnSortList.size >0  ">
+            ORDER BY FIELD
+            <foreach collection="params.orderSnSortList" item="item" open="(order_sn," separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="params.billCodeSortList != null and params.billCodeSortList.size >0  ">
+            ORDER BY FIELD
+            <foreach collection="params.billCodeSortList" item="item" open="(bill_code," separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="params.billCodeSortList == null ">
+            ORDER BY  a.send_date desc
+        </if>
+    </select>
+
+
     <select id="selectOrderList" parameterType="EmisWaybill" resultMap="EmisWaybillResult">
         <include refid="selectEmisWaybillVo"/>
         <where>
@@ -723,61 +998,17 @@
                 and a.create_time <![CDATA[ <= ]]>  #{params.endCreateTime}
             </if>
 
-            <if test="params.expireNotSign != null and params.expireNotSign == 1">
-                and a.estimate_date <![CDATA[ < ]]>  now() and bl_sign!='1'
-            </if>
-
-            <if test="params.printFlag != null ">
-                and a.bl_print=#{params.printFlag}
-            </if>
-
-            <if test="params.isNeedPack != null and params.isNeedPack == 1">
-                and not EXISTS ( select 1 from emis_tms_pack_dtl etp  where etp.del_flag='0' and etp.main_bill_code=a.bill_code )
-                and a.trans_line_type in(
-                  select line_code from emis_trans_line etl where  etl.trans_type=1
-                )
-                and bl_sign!='1' and waybill_status!='40'
-
-                 <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
-                        and (a.send_site_code=#{params.privSiteCode} or a.current_site_code=#{params.privSiteCode})
-                 </if>
-            </if>
-
-
-            <if test="params.isNeedBatch != null and params.isNeedBatch == 1">
-                and a.bill_code not in( select etb.bill_code from emis_tms_site_batch_dtl etb   where etb.del_flag='0'  )
-                and bl_sign!='1' and waybill_status!='40'
-            </if>
 
             <if test="salesmen == null and params.privSiteCode != null and params.privSiteCode != '88888'">
                 and (
-                a.send_site_code in (
-                SELECT t1.site_code FROM (
-                SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
-                #{params.privSiteCode} ) pd
-                WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
-                UNION
-                SELECT #{params.privSiteCode} FROM dual
-                )
-                or
-                a.dispatch_site_code in (
-                SELECT t1.site_code FROM (
-                SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
-                #{params.privSiteCode} ) pd
-                WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
-                UNION
-                SELECT #{params.privSiteCode} FROM dual
-                )
-                or
-                a.sign_site_code in (
-                SELECT t1.site_code FROM (
-                SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
-                #{params.privSiteCode} ) pd
-                WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
-                UNION
-                SELECT #{params.privSiteCode} FROM dual
-                )
-                or EXISTS (select 1 from emis_tms_scan_record  etsr where a.bill_code=etsr.main_bill_code and etsr.scan_site_code=#{params.privSiteCode})
+                    a.send_site_code in (
+                        SELECT t1.site_code FROM (
+                        SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
+                        #{params.privSiteCode} ) pd
+                        WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
+                        UNION
+                        SELECT #{params.privSiteCode} FROM dual
+                    )
 
                 <!--
                     or a.salesmen=#{params.privEmpName}