From 4c2231bf97814a0929003c9f13fffefff23a6d64 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Tue, 5 Mar 2024 16:59:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E8=B4=A7=E6=89=98=E7=9B=98=E7=A0=81?=
 =?UTF-8?q?=E5=80=BC=E6=8D=A2=E6=89=98=E7=9B=98=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/DistributionDeliveryAllocationDTO.java             | 7 +++++++
 .../distribution/mapper/DistributionParcelListMapper.xml   | 3 ++-
 .../distribution/mapper/DistributionStockupMapper.xml      | 5 +++--
 .../service/impl/DistributionReservationServiceImpl.java   | 1 +
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionDeliveryAllocationDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionDeliveryAllocationDTO.java
index 664a19c5b..92f561f35 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionDeliveryAllocationDTO.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionDeliveryAllocationDTO.java
@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 
@@ -85,5 +86,11 @@ public class DistributionDeliveryAllocationDTO {
 	@ApiModelProperty(value = "任务时间")
 	private String remarks;
 
+	/**
+	 * 费用
+	 */
+	@ApiModelProperty(value = "费用")
+	private BigDecimal price;
+
 
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
index 39e593696..2bcae3292 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
@@ -511,12 +511,13 @@
         select DISTINCT ldsi.stockup_id , ldpl.id id,ldpl.order_package_code orderPackageCode,lds.type
         stockupStatus,ldpl.firsts,ldpl.second,ldpl.third_product thirdProduct,
         ldpl.material_name materialName,lds.create_time stockupDate,lds.stockup_area stockupArea,ldpl.goods_allocation
-        goodsAllocation,lwtg.tray_code pallet
+        goodsAllocation,lwt.pallet_name pallet
         from logpm_distribution_stockup_info ldsi
         LEFT JOIN logpm_distribution_reservation_package ldrp on ldrp.reservation_id = ldsi.reservation_id
         LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.id = ldrp.parce_list_id
         LEFT JOIN logpm_distribution_stock lds on ldpl.id = lds.parcel_list_id and lds.stockup_id = ldsi.stockup_id
         LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id and lwtg.association_type = '3'
+        LEFT JOIN logpm_warehouse_tray lwt on lwtg.tray_id = lwt.id
         <where>
             ldsi.stockup_id =#{id} and ldpl.order_package_code is not null
         </where>
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 afd4162d3..04df06d0f 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
@@ -236,7 +236,7 @@
         fixTime,lds.assign_time assignTime,
         lds.type_service typeService,lds.outbound_date outboundDate,lds.stockup_code stockupCode,
         COALESCE(GROUP_CONCAT(DISTINCT lwug.position_code SEPARATOR ','), '') stockipAllocation,
-        COALESCE(GROUP_CONCAT(DISTINCT lwtg.tray_code SEPARATOR ','), '') pallet,
+        COALESCE(GROUP_CONCAT(DISTINCT lwt.pallet_name SEPARATOR ','), '') pallet,
         COALESCE ( group_concat( DISTINCT ldr.consignee SEPARATOR ',' ), '' ) AS consignee
         from logpm_distribution_stockup lds
         LEFT JOIN logpm_distribution_stockup_info ldsi on ldsi.stockup_id =lds.id
@@ -244,12 +244,13 @@
         LEFT JOIN logpm_distribution_reservation_package ldrp on ldrp.reservation_id = ldsi.reservation_id
         LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldrp.parce_list_id
         LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldrp.parce_list_id
+        LEFT JOIN logpm_warehouse_tray lwt on lwtg.tray_id = lwt.id
         <where>
             lds.is_deleted = 0
             <!-- lds.tenant_id = #{param.tenantId} -->
             <if test="param.typeService != null and param.typeService != '' ">and lds.type_service =  #{param.typeService}
             </if>
-            <if test="param.consignee != null and param.consignee != '' ">and
+            <if test="param.consignee != null and param.consignee != '' "> and
             ldr.consignee = #{param.consignee}
             </if>
             <if test="param.stockupDate != null  ">and TO_DAYS(lds.stockup_date)=TO_DAYS( #{param.stockupDate})</if>
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
index 88ab85ef5..c2eacab9d 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
@@ -2408,6 +2408,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			distributionDeliveryListEntity.setLoadingTeamName(stockup.getLoaderName());
 		}
 		distributionDeliveryListEntity.setWarehouseName(String.join(",", deliveryWarehouseName));
+		distributionDeliveryListEntity.setPrice(allocationDTO.getPrice());
 //		distributionDeliveryListEntity.setOrderCode(String.join(",", orderNumber));
 		distributionDeliveryListEntity.setOrderNumber(orderTotal.get());
 		distributionDeliveryListEntity.setDeliveryNumber(deliveryPackageTotal.get());