From c4a65e2eb02272b46a600bc3c72aa6fad66da036 Mon Sep 17 00:00:00 2001 From: bawei <95887577@qq.com> Date: Sat, 2 Sep 2023 11:32:21 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/poundlist/PoundlistMapper.xml | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml index e83ab12e..541b1997 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml @@ -59,20 +59,19 @@ WHERE a.delete_mark = 0 and SELECT a.*,b.ticketno vehicleName,c.supplier_name supplierName,d.supplier_nm customerName,e.item_name materialName,f.contract_name salesName,g.contract_name purchaseName,h.F_RealName businessName, i.name naturalName,g.contract_no purchaseContractNo,f.contract_no salesContractNo, j.id purchaseorderItem0Id,k.id salesorderItem0Id,k.rate saleRate,jp.is_payment isPayment from jg_poundlist a - LEFT JOIN jg_vehicle b on a.vehicle_id = b.id - LEFT JOIN jg_supplier c on a.supplier_id = c.id - LEFT JOIN jg_customer d on a.customer_id = d.id - LEFT JOIN jg_material e on a.material_id = e.id - LEFT JOIN jg_contract f on a.sales_id = f.id - LEFT JOIN jg_contract g on a.purchase_id = g.id + LEFT JOIN jg_vehicle b on a.vehicle_id = b.id and b.delete_mark = 0 + LEFT JOIN jg_supplier c on a.supplier_id = c.id and c.delete_mark = 0 + LEFT JOIN jg_customer d on a.customer_id = d.id and d.delete_mark = 0 + LEFT JOIN jg_material e on a.material_id = e.id and e.delete_mark = 0 + LEFT JOIN jg_contract f on a.sales_id = f.id and f.delete_mark = 0 + LEFT JOIN jg_contract g on a.purchase_id = g.id and g.delete_mark = 0 LEFT JOIN base_user h on a.business_id = h.f_id - LEFT JOIN jg_natural i on a.natural_id = i.id - LEFT JOIN jg_purchaseorder_item0 j on a.id = j.poundlist_id - LEFT JOIN jg_salesorder_item0 k on a.id = k.poundlist_id - LEFT JOIN jg_purchaseorder jp ON a.purchaseorder_id=jp.id - LEFT JOIN jg_salesorder js ON a.salesorder_id=js.id + LEFT JOIN jg_natural i on a.natural_id = i.id and i.delete_mark = 0 + LEFT JOIN jg_purchaseorder_item0 j on a.id = j.poundlist_id and j.delete_mark = 0 + LEFT JOIN jg_salesorder_item0 k on a.id = k.poundlist_id and k.delete_mark = 0 + LEFT JOIN jg_purchaseorder jp ON a.purchaseorder_id=jp.id and jp.delete_mark = 0 + LEFT JOIN jg_salesorder js ON a.salesorder_id=js.id and js.delete_mark = 0 ${ew.customSqlSegment} and a.delete_mark = 0 - and b.delete_mark = 0 and c.delete_mark = 0 and d.delete_mark = 0 and e.delete_mark = 0 and f.delete_mark = 0 and g.delete_mark = 0 and i.delete_mark = 0 and j.delete_mark = 0 and k.delete_mark = 0 and jp.delete_mark = 0 and js.delete_mark = 0 AND (b.ticketno LIKE CONCAT('%',#{poundlistPagination.keyword},'%') OR c.supplier_name LIKE CONCAT('%',#{poundlistPagination.keyword},'%') OR d.supplier_nm LIKE CONCAT('%',#{poundlistPagination.keyword},'%'))