diff --git a/ruoyi-sip/src/main/resources/mapper/sip/OmsPurchaseOrderMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/OmsPurchaseOrderMapper.xml index becd2a5e..c018c8a3 100644 --- a/ruoyi-sip/src/main/resources/mapper/sip/OmsPurchaseOrderMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/sip/OmsPurchaseOrderMapper.xml @@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" , t1.purchaser_mobile, t1.purchaser_email, t1.warehouse_id, t1.pay_method, t1.owner_id, t1.owner_name, t1.remark, t1.total_amount,t1.flow_type , t1.status, t1.approve_status, t1.approve_time, t1.approve_node, t1.confirm_status, t1.create_time, t1.update_time, t1.del_flag,t1.version , t1.file_id - ,t2.vendor_name,t2.vendor_user,t2.vendor_code,t2.vendor_phone,t2.vendor_email,t3.warehouse_name + ,t2.vendor_address as vendor_name,t2.vendor_user,t2.vendor_code,t2.vendor_phone,t2.vendor_email,t3.warehouse_name from oms_purchase_order t1 left join oms_vendor_info t2 on t1.vendor_id = t2.vendor_id left join oms_warehouse_info t3 on t1.warehouse_id = t3.id @@ -88,7 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and t1.confirm_status = #{confirmStatus} and t1.approve_status = #{approveStatus} and t1.flow_type = #{flowType} - and t2.vendor_name = #{vendorName} + and t2.vendor_address = #{vendorName} and t1.owner_name = #{ownerName} and t1.id in (select purchase_id from oms_purchase_order_item where product_code =#{productCode}) and t1.id in