备货清单导出修改

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;

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
         <foreach collection="ids" item="id" open="(" close=")" separator=",">
             #{id}
         </foreach>
-        GROUP BY ldrs.id
+        GROUP BY ldsa.service_number
     </select>
     <select id="exportStockUptInventoryDetail"
             resultType="com.logpm.distribution.excel.DistributionStockupPackageListDetailExcel">

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java

@@ -3636,8 +3636,6 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 	@Override
 	public List<DistributionStockupPackageListDetailExcel> exportStockUptDetail(List<Long> list) {
 		List<DistributionStockupPackageListDetailExcel> detail = new ArrayList<>();
-
-
 		List<DistributionStockupPackageListDetailExcel> stockupPackageListDetailExcels = baseMapper.exportStockUptOrderDetail(list);
 		if (Func.isNotEmpty(stockupPackageListDetailExcels)) {
 			for (DistributionStockupPackageListDetailExcel stockupPackageListDetailExcel : stockupPackageListDetailExcels) {

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java

@@ -683,7 +683,6 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				zeroPackageMap = zeroPackageList.stream().collect(Collectors.groupingBy(DistributionParcelListDTO::getStockArticleId));
 			}
 			this.saveDistrilbutionBillLading(distrilbutionBillLading);
-			List<DistrilbutionBillPackageEntity> packageEntityList = new ArrayList<>();
 			if (StringUtils.isNotBlank(distrilbutionBillLading.getStockArticleId())) {
 				String[] split = distrilbutionBillLading.getStockArticleId().split(",");
 				for (String s : split) {
@@ -884,7 +883,6 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 					throw new CustomerException("请填写正确的库存品数量");
 				}
 				//没有
-				List<DistributionDeliveryDetailsEntity> detailsEntities = new ArrayList<>();
 				Boolean finalLas = las;
 				distrilbutionBillLading.getStockDTOList().forEach(i -> {
 					DistributionDeliveryDetailsEntity details = new DistributionDeliveryDetailsEntity();
@@ -928,7 +926,6 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				.eq(DistributionDeliveryChargeEntity::getBillLading, distrilbutionBillLading.getId())
 				.set(DistributionDeliveryChargeEntity::getIsDeleted, 1)
 			);
-			List<DistributionDeliveryChargeEntity> listEntity = new ArrayList<>();
 			distrilbutionBillLading.getFei().forEach((k, v) -> {
 				DistributionDeliveryChargeEntity distributionDeliveryCharge = new DistributionDeliveryChargeEntity();
 				distributionDeliveryCharge.setBillLading(distrilbutionBillLading.getId());