From 6f0964037184f973d6540ad4d28a8984ef641b13 Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Mon, 23 Jun 2025 15:41:48 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E8=B0=83=E6=95=B4=E5=8F=91=E8=B4=A7?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/sale/deliver/SaDeliverMapper.xml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/deliver/SaDeliverMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/deliver/SaDeliverMapper.xml
index a8b1b4c3..60f5ff69 100644
--- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/deliver/SaDeliverMapper.xml
+++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/deliver/SaDeliverMapper.xml
@@ -397,11 +397,6 @@
     <update id="deliverBatch" parameterType="com.hzs.common.domain.sale.deliver.SaDeliver">
         MERGE INTO SA_DELIVER sd
         using (
-        select PK_ID,
-        LOGISTICS_COMPANY,
-        DELIVER_STATUS,
-        replace(wm_concat(LOGISTICS_CODE), ',', '/') LOGISTICS_CODE
-        from (
         <foreach collection="deliverList" item="item" separator="union">
             select
             #{item.pkId} PK_ID,
@@ -410,8 +405,6 @@
             #{item.deliverStatus} DELIVER_STATUS
             from dual
         </foreach>
-        )
-        group by PK_ID, LOGISTICS_COMPANY, LOGISTICS_CODE, DELIVER_STATUS
         ) tmp
         ON (tmp.PK_ID = sd.pk_id and sd.PK_COUNTRY = #{pkCountry})
         WHEN MATCHED THEN