diff --git a/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java index 5a0bccfcb..b0d93950f 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java @@ -73,6 +73,7 @@ public class BusinessDocumentOrderApplicationService { private GwLogMapper gwLogMapper; @Autowired private BusinessDeliveryDetailsLinkMapper businessDeliveryDetailsLinkMapper; + @Resource private ExecuteOrderMapper executeOrderMapper; /** diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDeliveryDetailsLink/entity/BusinessDeliveryDetailsLink.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDeliveryDetailsLink/entity/BusinessDeliveryDetailsLink.java index aa4930124..c39d8c911 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDeliveryDetailsLink/entity/BusinessDeliveryDetailsLink.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDeliveryDetailsLink/entity/BusinessDeliveryDetailsLink.java @@ -1,5 +1,7 @@ package com.mhd.oms.domain.businessDeliveryDetailsLink.entity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.mhd.common.core.web.domain.BaseEntity; @@ -20,6 +22,7 @@ import java.util.Date; @TableName("business_delivery_details_link") public class BusinessDeliveryDetailsLink extends BaseVOEntity { @ApiModelProperty(value = "主键") + @TableId(type = IdType.AUTO) private Long id; @ApiModelProperty(value = "创建时间") diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java index 174899e17..01341320c 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java @@ -274,8 +274,7 @@ public class BusinessDocumentOrderImpl extends ServiceImpl 0; - - // 如果有明细，为每个明细生成一个子单 + if (hasDetails) { for (BusinessDeliveryDetailsLinkDTO businessDeliveryDetailsLinkDTO : businessDeliveryDetailsLinkDTOList) { // BusinessDocumentOrder subOrder = new BusinessDocumentOrder(); @@ -374,6 +373,7 @@ public class BusinessDocumentOrderDomainService { BusinessDeliveryDetailsLink businessDeliveryDetailsLink = new BusinessDeliveryDetailsLink(); BeanUtils.copyProperties(businessDeliveryDetailsLinkDTO, businessDeliveryDetailsLink); businessDeliveryDetailsLink.setOrderId(tmsOrder.getId()); + businessDeliveryDetailsLink.setId(null); // businessDeliveryDetailsLink.setSubOrderId(subOrder.getId()); businessDeliveryDetailsLinkMapper.insert(businessDeliveryDetailsLink); } diff --git a/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml b/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml index f5bc9ba68..beb27b0fc 100644 --- a/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml +++ b/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml @@ -186,519 +186,518 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select * from business_document_order + SELECT bdo.*, + NVL(tms_count.total, 0) AS tms_order_status_count + FROM business_document_order bdo + LEFT JOIN ( + SELECT child.MAIN_ORDER_NUM, COUNT(1) AS total + FROM business_document_order child + INNER JOIN NGWL_TEST_WLHY.TMS_ORDER t + ON t.EXECUTE_ORDER_NUMBER = child.goods_number + AND t.SPLICING_ORDER_TYPE = 2 + INNER JOIN NGWL_TEST_WLHY.TMS_TRANSPORT_NOTE tr + ON tr.ORDER_ID = t.ID + AND tr.WAYBILL_STATUS IN (8,9,10,11) + GROUP BY child.MAIN_ORDER_NUM + ) tms_count ON tms_count.MAIN_ORDER_NUM = bdo.goods_number +-- SELECT bdo.*, +-- NVL(tms_count.total, 0) AS tms_order_status_count +-- FROM business_document_order bdo +-- LEFT JOIN ( +-- SELECT child.MAIN_ORDER_NUM, COUNT(1) AS total +-- FROM business_document_order child +-- INNER JOIN NGWL_TEST_WLHY.TMS_ORDER t +-- ON t.EXECUTE_ORDER_NUMBER = child.goods_number +-- AND t.ORDER_STATUS IN (7, 8) +-- AND t.SPLICING_ORDER_TYPE = 2 +-- GROUP BY child.MAIN_ORDER_NUM +-- ) tms_count ON tms_count.MAIN_ORDER_NUM = bdo.goods_number - AND SPLICING_ORDER_TYPE in (0, 2, 4) - - and ID = #{id} - - - - - - - - - and ORDER_SOURCE = #{orderSource} - - - AND IN_ORDER_NUMBER LIKE CONCAT('%', #{inOrderNumber}, '%') - + bdo.SPLICING_ORDER_TYPE in (0, 2, 4) - - and CREATE_COMPANY_ID = #{createCompanyId} - - - and CREATE_TIME >= #{createStartTime} - - - and CREATE_TIME <= #{createEndTime} + 1 - 1/86400 - - - - - - - AND GOODS_NUMBER LIKE CONCAT('%', #{goodsNumber}, '%') + + and bdo.ID = #{id} + + + and bdo.ORDER_SOURCE = #{orderSource} + + + AND bdo.IN_ORDER_NUMBER LIKE CONCAT('%', #{inOrderNumber}, '%') - - and LOADING_AREA_ID = #{loadingAreaId} - - - and LOADING_NAME like concat('%', #{loadingName}, '%') - - - and LOADING_ADDRESS = #{loadingAddress} - - - and LOADING_LONGITUDE = #{loadingLongitude} - - - and LOADING_LATITUDE = #{loadingLatitude} - - - and LOADING_UNIT = #{loadingUnit} - - - and FREIGHTER_NAME like concat('%', #{freighterName}, '%') - - - and LOADING_PHONE = #{loadingPhone} - - - and LOADING_DATE = #{loadingDate} - - - and UNLOAD_AREA_ID = #{unloadAreaId} - - - and UNLOAD_NAME like concat('%', #{unloadName}, '%') - - - and UNLOAD_ADDRESS = #{unloadAddress} - - - and UNLOAD_LONGITUDE = #{unloadLongitude} - - - and UNLOAD_LATITUDE = #{unloadLatitude} - - - and DISCHARGER_NAME like concat('%', #{dischargerName}, '%') - - - and UNLOAD_PHONE = #{unloadPhone} - - - and UNLOADING_DATA = #{unloadingData} - - - and GOODS_TYPE_ID = #{goodsTypeId} - - - and GOODS_TYPE = #{goodsType} - - - and GOODS_NAME_ID = #{goodsNameId} - - - and GOODS_NAME like concat('%', #{goodsName}, '%') - - - and WEIGHT_MIN = #{weightMin} - - - and WEIGHT_MAX = #{weightMax} - - - and GOODS_UNTIS_ID = #{goodsUntisId} - - - and GOODS_UNTIS = #{goodsUntis} - - - and TRANSPORTATION_MODE_ID = #{transportationModeId} - - - and TRANSPORTATION_NAME like concat('%', #{transportationName}, '%') - - - and CAR_TYPE = #{carType} - - - and CAR_TYPE_NAME like concat('%', #{carTypeName}, '%') - - - and SERVICE_REQUIRE_ID = #{serviceRequireId} - - - and SERVICE_REQUIRE = #{serviceRequire} - - - and REMARKS = #{remarks} - - - and WAYBILL_FROM = #{waybillFrom} - - - and IS_SOURCE = #{isSource} - - - and SOURCE_CLOSE_TIME = #{sourceCloseTime} - - - and EXECUTOR_ID = #{executorId} - - - and IS_DELETE = #{isDelete} - - - and LINE_TITLE_LEFT = #{lineTitleLeft} - - - and LINE_TITLE_RIGHT = #{lineTitleRight} - - - and SYS_ORG_CODE = #{sysOrgCode} - - - and IS_COMMON = #{isCommon} - - - and GOODS_TYPE_MAJOR = #{goodsTypeMajor} - - - and AUDIT_STATUS = #{auditStatus} - - - and WAYBILL_MODE = #{waybillMode} - - - and LATEST_BIDDING_TIME = #{latestBiddingTime} - - - and DELIVERY_FREIGHT = #{deliveryFreight} - - - and COLLECTED_FREIGHT = #{collectedFreight} - - - and UNCOLLECTED_FREIGHT = #{uncollectedFreight} - - - and COLLECT_LESS_FREIGHT = #{collectLessFreight} - - - and AUDIT_BY = #{auditBy} - - - and AUDIT_TIME = #{auditTime} - - - and BUSINESS_TYPE = #{businessType} - - - and TRANSPORTATION_UNIT_PRICE = #{transportationUnitPrice} - - - and RADIO_VALUE = #{radioValue} - - - and CREATER_NAME like concat('%', #{createrName}, '%') - - - and CREATER_PHONE = #{createrPhone} - - - and IS_ELECTRIC_FENCE = #{isElectricFence} - - - and WXA_QRCODE = #{wxaQrcode} - - - and APPOINT_SHIPPER_ID = #{appointShipperId} - - - and CREATE_USER_ID = #{createUserId} - - - AND APPOINT_SHIPPER LIKE CONCAT('%', #{appointShipper}, '%') - - - and IS_STATUS = #{isStatus} - - - and SIGNATURE_ADDRESS = #{signatureAddress} - - - and QR_CODE_IMG_URL = #{qrCodeImgUrl} - - - and SHIPPING_NOTE = #{shippingNote} - - - and RECEIVABLE_TYPE = #{receivableType} - - - and THIRD_PARTY_ORDER_NUMBER = #{thirdPartyOrderNumber} - - - and DISPATCH_ORDER_NUMBER = #{dispatchOrderNumber} - - - and APPOINT_DRIVER_ENTERPRISE_ID = #{appointDriverEnterpriseId} - - - and APPOINT_DRIVER_ENTERPRISE = #{appointDriverEnterprise} - - - and CANCEL_ORDER_REMARK = #{cancelOrderRemark} - - - and ORDER_DRIVER_ID = #{orderDriverId} - - - and GOODS_QUANTITY = #{goodsQuantity} - - - and GOODS_QUANTITY_UNIT_ID = #{goodsQuantityUnitId} - - - and GOODS_QUANTITY_UNIT = #{goodsQuantityUnit} - - - and BIDDING_UNIT = #{biddingUnit} - - - and ORDER_STATUS = #{orderStatus} - - - and SPLICING_ORDER_TYPE = #{splicingOrderType} - - - and SPLICING_STATUS = #{splicingStatus} - - - and MAIN_ORDER_ID = #{mainOrderId} - - - and MAIN_ORDER_NUM = #{mainOrderNum} - - - and MERGE_ORDER_ID = #{mergeOrderId} - - - and MERGE_ORDER_NUM = #{mergeOrderNum} - - - and PAYER_TYPE = #{payerType} - - - and MACHINE_NUMBER = #{machineNumber} - - - and STOCK_FLAG = #{stockFlag} - - - and INFO_FEE = #{infoFee} - - - and INFO_FEE_PAYEE_TYPE = #{infoFeePayeeType} - - - and INFO_FEE_PAYEE = #{infoFeePayee} - - - and INFO_FEE_STATUS = #{infoFeeStatus} - - - and INFO_FEE_DOCUMENT_NUMBER = #{infoFeeDocumentNumber} - - - and ORDER_SHIPPING_TYPE = #{orderShippingType} - - - and RECIPIENT_ID = #{recipientId} - - - and RECIPIENT_NAME like concat('%', #{recipientName}, '%') - - - and SETTLEMENT_STATUS = #{settlementStatus} - - - and SETTLEMENT_TIME = #{settlementTime} - - - and PAYMENT_TIME = #{paymentTime} - - - and RECONCILIATION_INNER_NUMBER = #{reconciliationInnerNumber} - - - and RECEIVE_PAYMENT_NUMBER = #{receivePaymentNumber} - - - and INVOICE_ID = #{invoiceId} - - - and IS_INVOICE = #{isInvoice} - - - and VEHICLE_TYPE_ID = #{vehicleTypeId} - - - and VEHICLE_TYPE_NAME like concat('%', #{vehicleTypeName}, '%') - - - and CARRIER = #{carrier} - - - and CARRIER_NAME like concat('%', #{carrierName}, '%') - - - and SZWL_USER_ID = #{szwlUserId} - - - and FREIGHT_UNIT_PRICE = #{freightUnitPrice} - - - and BIDDING_STATUS = #{biddingStatus} - - - and BIDDING_REMARKS = #{biddingRemarks} - - - and CARGO_INSURANCE_AMOUNT = #{cargoInsuranceAmount} - - - and DESTINATION = #{destination} - - - and FREIGHT_CHARGES = #{freightCharges} - - - and PAYER = #{payer} - - - and SALESMAN_ID = #{salesmanId} - - - and IS_DECLARE = #{isDeclare} - - - and ROUTE = #{route} - - - and CONTAINER_TYPE = #{containerType} - - - and CONTAINER_TYPE_NAME like concat('%', #{containerTypeName}, '%') - - - and CARD_TYPE = #{cardType} - - - and CARD_TYPE_NAME like concat('%', #{cardTypeName}, '%') - - - and EXTERNAL_CONTAINER_NO = #{externalContainerNo} - - - and TRANSIT_PLACE = #{transitPlace} - - - and SHIPPER = #{shipper} - - - and CUSTOMS_SHIPPER = #{customsShipper} - - - and CUSTOMS_SHIPPER_TEL = #{customsShipperTel} - - - and UNLOADING_COMPANY = #{unloadingCompany} - - - and CONTRACT_NO = #{contractNo} - - - and FREIGHT_FEE = #{freightFee} - - - and UNLOADING_FEE = #{unloadingFee} - - - and CUSTOMS_FEE = #{customsFee} - - - and SHORTAGE_FEE = #{shortageFee} - - - and MISCELLANEOUS_FEE = #{miscellaneousFee} - - - and OTHER_FEE = #{otherFee} - - - and DETENTION_FEE = #{detentionFee} - - - and TAX_RATE = #{taxRate} - - - and SETTLEMENT_CURRENCY = #{settlementCurrency} - - - and VOLUME = #{volume} - - - and DETAIL_CONTENT = #{detailContent} - - - and CUSTOMS_ROUTE = #{customsRoute} - - - and CUSTOMS_PORT = #{customsPort} - - - and CUSTOMS_CONTACT = #{customsContact} - - - and CUSTOMS_CONTACT_PHONE = #{customsContactPhone} - - - and CUSTOMS_REMARK = #{customsRemark} - - - and ORG_ID = #{orgId} - - - and GOODS_CATEGORY = #{goodsCategory} - - - - - - - - - - - - - - - - - - and ORGANIZATION_ID = #{organizationId} - - - - - - and DOCUMENT_DATE = #{documentDate} - - - and DOCUMENT_DATE =]]> #{documentDateStart} - - - and DOCUMENT_DATE #{documentDateEnd} - - - and PUSH_TIME =]]> #{pushTimeStart} - - - and PUSH_TIME #{pushTimeEnd} - - - and IE_TYPE = #{ieType} - + + and bdo.CREATE_COMPANY_ID = #{createCompanyId} + + + and bdo.CREATE_TIME >= #{createStartTime} + + + and bdo.CREATE_TIME <= #{createEndTime} + 1 - 1/86400 + + + + AND bdo.GOODS_NUMBER LIKE CONCAT('%', #{goodsNumber}, '%') + + + and bdo.LOADING_AREA_ID = #{loadingAreaId} + + + and bdo.LOADING_NAME like concat('%', #{loadingName}, '%') + + + and bdo.LOADING_ADDRESS = #{loadingAddress} + + + and bdo.LOADING_LONGITUDE = #{loadingLongitude} + + + and bdo.LOADING_LATITUDE = #{loadingLatitude} + + + and bdo.LOADING_UNIT = #{loadingUnit} + + + and bdo.FREIGHTER_NAME like concat('%', #{freighterName}, '%') + + + and bdo.LOADING_PHONE = #{loadingPhone} + + + and bdo.LOADING_DATE = #{loadingDate} + + + and bdo.UNLOAD_AREA_ID = #{unloadAreaId} + + + and bdo.UNLOAD_NAME like concat('%', #{unloadName}, '%') + + + and bdo.UNLOAD_ADDRESS = #{unloadAddress} + + + and bdo.UNLOAD_LONGITUDE = #{unloadLongitude} + + + and bdo.UNLOAD_LATITUDE = #{unloadLatitude} + + + and bdo.DISCHARGER_NAME like concat('%', #{dischargerName}, '%') + + + and bdo.UNLOAD_PHONE = #{unloadPhone} + + + and bdo.UNLOADING_DATA = #{unloadingData} + + + and bdo.GOODS_TYPE_ID = #{goodsTypeId} + + + and bdo.GOODS_TYPE = #{goodsType} + + + and bdo.GOODS_NAME_ID = #{goodsNameId} + + + and bdo.GOODS_NAME like concat('%', #{goodsName}, '%') + + + and bdo.WEIGHT_MIN = #{weightMin} + + + and bdo.WEIGHT_MAX = #{weightMax} + + + and bdo.GOODS_UNTIS_ID = #{goodsUntisId} + + + and bdo.GOODS_UNTIS = #{goodsUntis} + + + and bdo.TRANSPORTATION_MODE_ID = #{transportationModeId} + + + and bdo.TRANSPORTATION_NAME like concat('%', #{transportationName}, '%') + + + and bdo.CAR_TYPE = #{carType} + + + and bdo.CAR_TYPE_NAME like concat('%', #{carTypeName}, '%') + + + and bdo.SERVICE_REQUIRE_ID = #{serviceRequireId} + + + and bdo.SERVICE_REQUIRE = #{serviceRequire} + + + and bdo.REMARKS = #{remarks} + + + and bdo.WAYBILL_FROM = #{waybillFrom} + + + and bdo.IS_SOURCE = #{isSource} + + + and bdo.SOURCE_CLOSE_TIME = #{sourceCloseTime} + + + and bdo.EXECUTOR_ID = #{executorId} + + + and bdo.IS_DELETE = #{isDelete} + + + and bdo.LINE_TITLE_LEFT = #{lineTitleLeft} + + + and bdo.LINE_TITLE_RIGHT = #{lineTitleRight} + + + and bdo.SYS_ORG_CODE = #{sysOrgCode} + + + and bdo.IS_COMMON = #{isCommon} + + + and bdo.GOODS_TYPE_MAJOR = #{goodsTypeMajor} + + + and bdo.AUDIT_STATUS = #{auditStatus} + + + and bdo.WAYBILL_MODE = #{waybillMode} + + + and bdo.LATEST_BIDDING_TIME = #{latestBiddingTime} + + + and bdo.DELIVERY_FREIGHT = #{deliveryFreight} + + + and bdo.COLLECTED_FREIGHT = #{collectedFreight} + + + and bdo.UNCOLLECTED_FREIGHT = #{uncollectedFreight} + + + and bdo.COLLECT_LESS_FREIGHT = #{collectLessFreight} + + + and bdo.AUDIT_BY = #{auditBy} + + + and bdo.AUDIT_TIME = #{auditTime} + + + and bdo.BUSINESS_TYPE = #{businessType} + + + and bdo.TRANSPORTATION_UNIT_PRICE = #{transportationUnitPrice} + + + and bdo.RADIO_VALUE = #{radioValue} + + + and bdo.CREATER_NAME like concat('%', #{createrName}, '%') + + + and bdo.CREATER_PHONE = #{createrPhone} + + + and bdo.IS_ELECTRIC_FENCE = #{isElectricFence} + + + and bdo.WXA_QRCODE = #{wxaQrcode} + + + and bdo.APPOINT_SHIPPER_ID = #{appointShipperId} + + + and bdo.CREATE_USER_ID = #{createUserId} + + + AND bdo.APPOINT_SHIPPER LIKE CONCAT('%', #{appointShipper}, '%') + + + and bdo.IS_STATUS = #{isStatus} + + + and bdo.SIGNATURE_ADDRESS = #{signatureAddress} + + + and bdo.QR_CODE_IMG_URL = #{qrCodeImgUrl} + + + and bdo.SHIPPING_NOTE = #{shippingNote} + + + and bdo.RECEIVABLE_TYPE = #{receivableType} + + + and bdo.THIRD_PARTY_ORDER_NUMBER = #{thirdPartyOrderNumber} + + + and bdo.DISPATCH_ORDER_NUMBER = #{dispatchOrderNumber} + + + and bdo.APPOINT_DRIVER_ENTERPRISE_ID = #{appointDriverEnterpriseId} + + + and bdo.APPOINT_DRIVER_ENTERPRISE = #{appointDriverEnterprise} + + + and bdo.CANCEL_ORDER_REMARK = #{cancelOrderRemark} + + + and bdo.ORDER_DRIVER_ID = #{orderDriverId} + + + and bdo.GOODS_QUANTITY = #{goodsQuantity} + + + and bdo.GOODS_QUANTITY_UNIT_ID = #{goodsQuantityUnitId} + + + and bdo.GOODS_QUANTITY_UNIT = #{goodsQuantityUnit} + + + and bdo.BIDDING_UNIT = #{biddingUnit} + + + and bdo.ORDER_STATUS = #{orderStatus} + + + and bdo.SPLICING_ORDER_TYPE = #{splicingOrderType} + + + and bdo.SPLICING_STATUS = #{splicingStatus} + + + and bdo.MAIN_ORDER_ID = #{mainOrderId} + + + and bdo.MAIN_ORDER_NUM = #{mainOrderNum} + + + and bdo.MERGE_ORDER_ID = #{mergeOrderId} + + + and bdo.MERGE_ORDER_NUM = #{mergeOrderNum} + + + and bdo.PAYER_TYPE = #{payerType} + + + and bdo.MACHINE_NUMBER = #{machineNumber} + + + and bdo.STOCK_FLAG = #{stockFlag} + + + and bdo.INFO_FEE = #{infoFee} + + + and bdo.INFO_FEE_PAYEE_TYPE = #{infoFeePayeeType} + + + and bdo.INFO_FEE_PAYEE = #{infoFeePayee} + + + and bdo.INFO_FEE_STATUS = #{infoFeeStatus} + + + and bdo.INFO_FEE_DOCUMENT_NUMBER = #{infoFeeDocumentNumber} + + + and bdo.ORDER_SHIPPING_TYPE = #{orderShippingType} + + + and bdo.RECIPIENT_ID = #{recipientId} + + + and bdo.RECIPIENT_NAME like concat('%', #{recipientName}, '%') + + + and bdo.SETTLEMENT_STATUS = #{settlementStatus} + + + and bdo.SETTLEMENT_TIME = #{settlementTime} + + + and bdo.PAYMENT_TIME = #{paymentTime} + + + and bdo.RECONCILIATION_INNER_NUMBER = #{reconciliationInnerNumber} + + + and bdo.RECEIVE_PAYMENT_NUMBER = #{receivePaymentNumber} + + + and bdo.INVOICE_ID = #{invoiceId} + + + and bdo.IS_INVOICE = #{isInvoice} + + + and bdo.VEHICLE_TYPE_ID = #{vehicleTypeId} + + + and bdo.VEHICLE_TYPE_NAME like concat('%', #{vehicleTypeName}, '%') + + + and bdo.CARRIER = #{carrier} + + + and bdo.CARRIER_NAME like concat('%', #{carrierName}, '%') + + + and bdo.SZWL_USER_ID = #{szwlUserId} + + + and bdo.FREIGHT_UNIT_PRICE = #{freightUnitPrice} + + + and bdo.BIDDING_STATUS = #{biddingStatus} + + + and bdo.BIDDING_REMARKS = #{biddingRemarks} + + + and bdo.CARGO_INSURANCE_AMOUNT = #{cargoInsuranceAmount} + + + and bdo.DESTINATION = #{destination} + + + and bdo.FREIGHT_CHARGES = #{freightCharges} + + + and bdo.PAYER = #{payer} + + + and bdo.SALESMAN_ID = #{salesmanId} + + + and bdo.IS_DECLARE = #{isDeclare} + + + and bdo.ROUTE = #{route} + + + and bdo.CONTAINER_TYPE = #{containerType} + + + and bdo.CONTAINER_TYPE_NAME like concat('%', #{containerTypeName}, '%') + + + and bdo.CARD_TYPE = #{cardType} + + + and bdo.CARD_TYPE_NAME like concat('%', #{cardTypeName}, '%') + + + and bdo.EXTERNAL_CONTAINER_NO = #{externalContainerNo} + + + and bdo.TRANSIT_PLACE = #{transitPlace} + + + and bdo.SHIPPER = #{shipper} + + + and bdo.CUSTOMS_SHIPPER = #{customsShipper} + + + and bdo.CUSTOMS_SHIPPER_TEL = #{customsShipperTel} + + + and bdo.UNLOADING_COMPANY = #{unloadingCompany} + + + and bdo.CONTRACT_NO = #{contractNo} + + + and bdo.FREIGHT_FEE = #{freightFee} + + + and bdo.UNLOADING_FEE = #{unloadingFee} + + + and bdo.CUSTOMS_FEE = #{customsFee} + + + and bdo.SHORTAGE_FEE = #{shortageFee} + + + and bdo.MISCELLANEOUS_FEE = #{miscellaneousFee} + + + and bdo.OTHER_FEE = #{otherFee} + + + and bdo.DETENTION_FEE = #{detentionFee} + + + and bdo.TAX_RATE = #{taxRate} + + + and bdo.SETTLEMENT_CURRENCY = #{settlementCurrency} + + + and bdo.VOLUME = #{volume} + + + and bdo.DETAIL_CONTENT = #{detailContent} + + + and bdo.CUSTOMS_ROUTE = #{customsRoute} + + + and bdo.CUSTOMS_PORT = #{customsPort} + + + and bdo.CUSTOMS_CONTACT = #{customsContact} + + + and bdo.CUSTOMS_CONTACT_PHONE = #{customsContactPhone} + + + and bdo.CUSTOMS_REMARK = #{customsRemark} + + + and bdo.ORG_ID = #{orgId} + + + and bdo.GOODS_CATEGORY = #{goodsCategory} + + + and bdo.ORGANIZATION_ID = #{organizationId} + + + + and bdo.DOCUMENT_DATE = #{documentDate} + + + and bdo.DOCUMENT_DATE =]]> #{documentDateStart} + + + and bdo.DOCUMENT_DATE #{documentDateEnd} + + + and bdo.PUSH_TIME =]]> #{pushTimeStart} + + + and bdo.PUSH_TIME #{pushTimeEnd} + + + and bdo.IE_TYPE = #{ieType} +