From 8cb41093fc8e0b5b52f0bbae44bb0bcb8c0be9e0 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Tue, 24 Sep 2024 14:54:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E8=B4=A7=E6=B8=85=E5=8D=95=E5=AF=BC?=
=?UTF-8?q?=E5=87=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../DistributionStockupPackageListDetailExcel.java | 7 +++++++
.../mapper/DistributionStockupMapper.xml | 13 ++++++-------
.../impl/DistributionStockupServiceImpl.java | 2 --
.../impl/DistrilbutionBillLadingServiceImpl.java | 3 ---
4 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockupPackageListDetailExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockupPackageListDetailExcel.java
index c438e5723..c46ac2f1a 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockupPackageListDetailExcel.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockupPackageListDetailExcel.java
@@ -41,6 +41,13 @@ public class DistributionStockupPackageListDetailExcel {
@ExcelProperty("订单自编号")
private String orderCode;
+ /**
+ * 服务号
+ */
+ @ColumnWidth(50)
+ @ExcelProperty("服务号")
+ private String serviceNumber;
+
@ColumnWidth(20)
@ExcelProperty("产品名称")
private String productName;
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
index 98115554b..d56868f08 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
@@ -1285,29 +1285,28 @@
SELECT
lds.stockup_code stockupCode,
ldr.consignee consignee,
- ldsa.brand brand,
- ldsa.order_code orderCode,
+ ldsa.service_number serviceNumber,
+ GROUP_CONCAT(DISTINCT ldsa.order_code)orderCode,
+ GROUP_CONCAT(DISTINCT ldsa.brand)brand,
ldrs.reservation_num reservationNum,
lds.remarks remarks,
ldrs.is_zero isZero,
0 AS isInventory,
- GROUP_CONCAT(DISTINCT ldpl.material_name) AS productName,
- GROUP_CONCAT(DISTINCT ldpl.order_package_code) AS orderPackageCode
+ GROUP_CONCAT((SELECT GROUP_CONCAT(ldpl.material_name) FROM logpm_distribution_reservation_package AS ldrp LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldpl.id = ldrp.parce_list_id WHERE ldrp.reservation_id = ldr.id AND ldrp.stock_article_id = ldsa.id AND ldrp.packet_bar_status != 2 )) productName,
+ GROUP_CONCAT((SELECT GROUP_CONCAT(packet_bar_code) FROM logpm_distribution_reservation_package WHERE reservation_id = ldr.id AND stock_article_id = ldsa.id AND packet_bar_status != 2 )) order_package_code
FROM
logpm_distribution_stockup AS lds
LEFT JOIN logpm_distribution_stockup_info AS ldsi ON lds.id = ldsi.stockup_id
LEFT JOIN logpm_distribution_reservation AS ldr ON ldsi.reservation_id = ldr.id
LEFT JOIN logpm_distribution_reservation_stockarticle AS ldrs ON ldrs.reservation_id = ldr.id
LEFT JOIN logpm_distribution_stock_article AS ldsa ON ldrs.stock_article_id = ldsa.id
- LEFT JOIN logpm_distribution_reservation_package AS ldrp ON ldrp.stock_article_id = ldrs.stock_article_id AND ldrp.reservation_id = ldr.id
- LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldrp.parce_list_id = ldpl.id
WHERE
ldrs.reservation_num is not null
and lds.id IN
#{id}
- GROUP BY ldrs.id
+ GROUP BY ldsa.service_number