From ae35382f8200fd6557a0db953116157fd67c0814 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Mon, 27 May 2024 17:34:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=B7=A5=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=80=E7=BA=A7=E5=93=81=E3=80=81=E4=BA=8C=E7=BA=A7?=
 =?UTF-8?q?=E5=93=81=E5=8E=BB=E9=87=8D=EF=BC=9B=E6=96=B0=E5=A2=9E=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4=E8=BF=90=E5=8D=95=E5=8F=B7=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml | 4 ++--
 .../service/impl/AftersalesWorkOrderServiceImpl.java          | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml
index 03b8258ad..a73c52e03 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml
@@ -60,8 +60,8 @@
         laap.waybill_number,
         lawo.order_code,
         lawo.train_number,
-        GROUP_CONCAT(laap.`first` separator ',') as `first`,
-        GROUP_CONCAT(laap.secondary separator ',') as secondary,
+        GROUP_CONCAT(DISTINCT laap.`first` separator ',') as `first`,
+        GROUP_CONCAT(DISTINCT laap.secondary separator ',') as secondary,
         group_concat( DISTINCT laap.brand_name SEPARATOR ',' ) AS brandName,
         lawo.vehicle_route,
         lawo.deliver_goods_time,
diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
index f20513b9f..f4a120336 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
@@ -328,6 +328,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 			aftersalesWorkOrder.setCreateTime(new Date());
 			aftersalesWorkOrder.setCreateDept(Long.valueOf(user.getDeptId()));
 			aftersalesWorkOrder.setIsDeleted(0);
+			aftersalesWorkOrder.setWaybillNumber(aftersalesWorkOrder.getWaybillNumber());
 			aftersalesWorkOrder.setStatus(1);
 			if (ObjectUtils.isNull(aftersalesWorkOrder.getWorkOrderNumber())) {
 				aftersalesWorkOrder.setWorkOrderNumber(getWorkOrderNumber(myCurrentWarehouse.getWarehouseCode(), aftersalesWorkOrder.getWorkOrderType()));