异常工单列表一级品、二级品去重；新增维护运单号字段

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(DISTINCT laap.`first` separator ',') as `first`,
-        GROUP_CONCAT(laap.secondary separator ',') as secondary,
+        GROUP_CONCAT(DISTINCT laap.secondary separator ',') as secondary,
         group_concat( DISTINCT laap.brand_name SEPARATOR ',' ) AS brandName,
         lawo.vehicle_route,
         lawo.deliver_goods_time,

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()));