From ed6093d8edbf8070384fd3cd3936cb98fb1a403d Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Wed, 3 Dec 2025 15:26:57 +0800 Subject: [PATCH] =?UTF-8?q?2025-12-03=20pda=E5=8A=9F=E8=83=BD=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E6=9F=A5=E8=AF=A2=E5=8E=BB=E6=8E=89=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inboundNotification/InboundNotificationHeadMapper.xml | 6 +++--- .../resources/mapper/otherInbound/OtherInboundMapper.xml | 6 +++--- .../resources/mapper/otherOutbound/OtherOutboundMapper.xml | 6 +++--- .../mapper/productionInbound/ProductionInboundMapper.xml | 6 +++--- .../mapper/productionPicking/ProductionPickingMapper.xml | 6 +++--- .../mapper/purchaseReturn/PurchaseReturnMapper.xml | 6 +++--- .../resources/mapper/salesOutbound/SalesOutboundMapper.xml | 6 +++--- src/main/resources/mapper/salesReturn/SalesReturnMapper.xml | 6 +++--- src/main/resources/mapper/wms/WmsPrintMapper.xml | 4 ++-- 9 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/main/resources/mapper/inboundNotification/InboundNotificationHeadMapper.xml b/src/main/resources/mapper/inboundNotification/InboundNotificationHeadMapper.xml index 9884556..960dc80 100644 --- a/src/main/resources/mapper/inboundNotification/InboundNotificationHeadMapper.xml +++ b/src/main/resources/mapper/inboundNotification/InboundNotificationHeadMapper.xml @@ -26,9 +26,9 @@ OR h.related_order_no LIKE CONCAT('%', #{searchCode}, '%') ) - - AND CONVERT(DATE, h.required_inbound_date) = CONVERT(DATE, GETDATE()) - + + + GROUP BY h.site,h.bu_no,h.order_no,h.required_inbound_date ,D.required_qty ORDER BY h.required_inbound_date DESC diff --git a/src/main/resources/mapper/otherInbound/OtherInboundMapper.xml b/src/main/resources/mapper/otherInbound/OtherInboundMapper.xml index cbffe32..cd501ef 100644 --- a/src/main/resources/mapper/otherInbound/OtherInboundMapper.xml +++ b/src/main/resources/mapper/otherInbound/OtherInboundMapper.xml @@ -26,9 +26,9 @@ OR h.related_order_no LIKE CONCAT('%', #{searchCode}, '%') ) - - AND CONVERT(DATE, h.required_inbound_date) = CONVERT(DATE, GETDATE()) - + + + GROUP BY h.site,h.bu_no,h.order_no,h.required_inbound_date ORDER BY h.required_inbound_date DESC diff --git a/src/main/resources/mapper/otherOutbound/OtherOutboundMapper.xml b/src/main/resources/mapper/otherOutbound/OtherOutboundMapper.xml index a0f071d..5d9fe76 100644 --- a/src/main/resources/mapper/otherOutbound/OtherOutboundMapper.xml +++ b/src/main/resources/mapper/otherOutbound/OtherOutboundMapper.xml @@ -28,9 +28,9 @@ OR h.related_order_no LIKE CONCAT('%', #{searchCode}, '%') ) - - AND CONVERT(DATE, h.required_outbound_date) = CONVERT(DATE, GETDATE()) - + + + GROUP BY h.site, h.order_no, h.bu_no ,h.required_outbound_date ORDER BY h.required_outbound_date DESC diff --git a/src/main/resources/mapper/productionInbound/ProductionInboundMapper.xml b/src/main/resources/mapper/productionInbound/ProductionInboundMapper.xml index 8af5853..ff17d93 100644 --- a/src/main/resources/mapper/productionInbound/ProductionInboundMapper.xml +++ b/src/main/resources/mapper/productionInbound/ProductionInboundMapper.xml @@ -28,9 +28,9 @@ OR d.part_no LIKE CONCAT('%', #{searchCode}, '%') ) - - AND CONVERT(DATE, h.required_inbound_date) = CONVERT(DATE, GETDATE()) - + + + GROUP BY h.site,h.bu_no, h.order_no, h.required_inbound_date ORDER BY h.required_inbound_date DESC diff --git a/src/main/resources/mapper/productionPicking/ProductionPickingMapper.xml b/src/main/resources/mapper/productionPicking/ProductionPickingMapper.xml index 30421bb..851b523 100644 --- a/src/main/resources/mapper/productionPicking/ProductionPickingMapper.xml +++ b/src/main/resources/mapper/productionPicking/ProductionPickingMapper.xml @@ -26,9 +26,9 @@ AND (b.NotifyNo LIKE CONCAT('%', #{searchCode}, '%') ) - - AND CONVERT(DATE, b.NotifyDate) = CONVERT(DATE, GETDATE()) - + + + GROUP BY b.site, b.NotifyNo, b.bu ,b.NotifyDate ORDER BY b.NotifyDate DESC diff --git a/src/main/resources/mapper/purchaseReturn/PurchaseReturnMapper.xml b/src/main/resources/mapper/purchaseReturn/PurchaseReturnMapper.xml index 0ca655a..cba4184 100644 --- a/src/main/resources/mapper/purchaseReturn/PurchaseReturnMapper.xml +++ b/src/main/resources/mapper/purchaseReturn/PurchaseReturnMapper.xml @@ -31,9 +31,9 @@ OR h.related_order_no LIKE CONCAT('%', #{searchCode}, '%') ) - - AND CONVERT(DATE, h.required_outbound_date) = CONVERT(DATE, GETDATE()) - + + + GROUP BY h.site, h.order_no, h.bu_no,h.customer_id,C.CustomerName,required_outbound_date ORDER BY h.required_outbound_date DESC diff --git a/src/main/resources/mapper/salesOutbound/SalesOutboundMapper.xml b/src/main/resources/mapper/salesOutbound/SalesOutboundMapper.xml index 926c670..4240483 100644 --- a/src/main/resources/mapper/salesOutbound/SalesOutboundMapper.xml +++ b/src/main/resources/mapper/salesOutbound/SalesOutboundMapper.xml @@ -30,9 +30,9 @@ OR h.related_order_no LIKE CONCAT('%', #{searchCode}, '%') ) - - AND CONVERT(DATE, h.required_outbound_date) = CONVERT(DATE, GETDATE()) - + + + GROUP BY h.site, h.order_no, h.bu_no, h.required_outbound_date, d.related_order_no, d.related_order_line_no, d.actual_out_qty ORDER BY h.required_outbound_date DESC diff --git a/src/main/resources/mapper/salesReturn/SalesReturnMapper.xml b/src/main/resources/mapper/salesReturn/SalesReturnMapper.xml index eabae0c..ad01c3d 100644 --- a/src/main/resources/mapper/salesReturn/SalesReturnMapper.xml +++ b/src/main/resources/mapper/salesReturn/SalesReturnMapper.xml @@ -29,9 +29,9 @@ OR d.part_no LIKE CONCAT('%', #{searchCode}, '%') ) - - AND CONVERT(DATE, h.required_inbound_date) = CONVERT(DATE, GETDATE()) - + + + GROUP BY h.bu_no, h.order_no, diff --git a/src/main/resources/mapper/wms/WmsPrintMapper.xml b/src/main/resources/mapper/wms/WmsPrintMapper.xml index d373c95..114ec5c 100644 --- a/src/main/resources/mapper/wms/WmsPrintMapper.xml +++ b/src/main/resources/mapper/wms/WmsPrintMapper.xml @@ -27,8 +27,8 @@ b.inspector_no from inbound_notification_head a inner join inbound_notification_detail D on a.site = D.site and a.bu_no = D.bu_no and a.order_no = D.order_no AND A.order_type ='采购入库' - left join qc_iqc_record b on D.site = b.site and D.bu_no = b.bu_no and D.inspection_no = b.inspection_no - inner join Supplier c on a.site = c.Site and a.Supplier_ID = c.supplierID + inner join qc_iqc_record b on D.site = b.site and D.bu_no = b.bu_no and D.inspection_no = b.inspection_no + left join Supplier c on a.site = c.Site and a.Supplier_ID = c.supplierID and A.site=#{query.site,jdbcType=VARCHAR}