From 754badf0c057d8bb34b6e1f3a2b73c304221d94f Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Wed, 16 Aug 2023 17:38:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E9=80=81=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=95=B0=E6=8D=AE=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vo/app/DistributionAppDeliveryListVO.java |  5 ++++
 .../vo/app/DistributionAppParcelListVO.java   |  7 ++++++
 .../mapper/DistributionDeliveryInfoMapper.xml | 12 ++++++----
 .../mapper/DistributionDeliveryListMapper.xml | 21 ++++++++---------
 .../DistributionReservationPackageMapper.xml  | 23 ++++++-------------
 .../mapper/DistributionSignforMapper.xml      |  1 +
 .../DistributionDeliveryInfoServiceImpl.java  |  2 +-
 7 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppDeliveryListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppDeliveryListVO.java
index 2d5eed827..a2db30716 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppDeliveryListVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppDeliveryListVO.java
@@ -68,6 +68,11 @@ public class DistributionAppDeliveryListVO extends DistributionDeliveryListEntit
 	 */
 	@ApiModelProperty(value = "配车状态")
 	private String vehicleStatus_name;
+	/**
+	 * 配车单号
+	 */
+	@ApiModelProperty(value = "配车单号")
+	private String noteNumber;
 
 	/**
 	 * 配送状态
diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppParcelListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppParcelListVO.java
index dc6a56b61..b5fef0cd1 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppParcelListVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppParcelListVO.java
@@ -69,6 +69,13 @@ public class DistributionAppParcelListVO extends DistributionParcelListEntity {
 	@ApiModelProperty(value = "签收状态")
 	private Integer signforState;
 
+	/**
+	 * 签收数量
+	 * 1 未签 2 已签
+	 */
+	@ApiModelProperty(value = "签收数量")
+	private String totalNum;
+
 
 
 
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
index 3ab4357da..d2176e039 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
@@ -272,10 +272,11 @@
           AND lds.delivery_id = #{id}
     </select>
     <select id="selectDistributionAppDeliveryOrderPage" resultType="com.logpm.distribution.vo.app.DistributionAppStockArticleVO">
-        SELECT
+        SELECT DISTINCT
             ldsa.order_code orderCode,
             ldsa.complete_set completeSet,
             ldrs.reservation_num reservationNum,
+            ldsa.id  stockArticleId,
             (SELECT COALESCE(COUNT(*), 0) from logpm_distribution_loadscan ldl WHERE ldl.order_id =ldsa.id and ldl.scan_status !=1 ) loadingNub
         FROM
             logpm_distribution_reservation ldr
@@ -330,10 +331,11 @@
         </where>
     </select>
     <select id="selectDistributionAppDeliveryOrderCompletewPage" resultType="com.logpm.distribution.vo.app.DistributionAppStockArticleVO">
-        SELECT
+        SELECT DISTINCT
             ldsa.order_code AS orderCode,
             ldsa.complete_set AS completeSet,
             ldrs.reservation_num AS reservationNum,
+            ldsa.id  stockArticleId,
             loadingNub
         FROM
             (
@@ -367,10 +369,11 @@
 
     </select>
     <select id="selectDistributionAppDeliveryOrderCompmletePage" resultType="com.logpm.distribution.vo.app.DistributionAppStockArticleVO">
-        SELECT
+        SELECT DISTINCT
             ldsa.order_code AS orderCode,
             ldsa.complete_set AS completeSet,
             ldrs.reservation_num AS reservationNum,
+            ldsa.id  stockArticleId,
             loadingNub
         FROM
             (
@@ -401,10 +404,11 @@
         </where>
     </select>
     <select id="selectDistributionAppDeliveryOrderCompcletePage" resultType="com.logpm.distribution.vo.app.DistributionAppStockArticleVO">
-        SELECT
+        SELECT DISTINCT
         ldsa.order_code AS orderCode,
         ldsa.complete_set AS completeSet,
         ldrs.reservation_num AS reservationNum,
+        ldsa.id  stockArticleId,
         loadingNub
         FROM
         (
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
index dd2d42403..1e39a0a5b 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
@@ -776,21 +776,20 @@
            where ldr.id = #{param.reservationId}
     </select>
     <select id="selectListbypack" resultType="com.logpm.distribution.vo.app.DistributionAppParcelListVO">
-        select
-        DISTINCT ldpl.order_package_code orderPackageCode,
-        ldsa.order_code orderCode,
+        select DISTINCT ldpl.order_package_code orderPackageCode,
+        ldpl.order_code orderCode,
         ldl.scan_status scanStatus
-        FROM
-        logpm_distribution_reservation_package ldrp
-        JOIN logpm_distribution_signfor lds on lds.reservation_id = ldrp.reservation_id
-        join logpm_distribution_reservation_stockarticle ldrs on lds.reservation_id = ldrs.reservation_id
-        join logpm_distribution_stock_article ldsa on ldsa.id = ldrs.stock_article_id
-        join logpm_distribution_parcel_list ldpl on ldrp.parce_list_id = ldpl.id
+        from  logpm_distribution_delivery_list lddl
+        left JOIN logpm_distribution_signfor lds on lds.delivery_id = lddl.id
+        LEFT JOIN logpm_distribution_reservation_package ldrp on lds.reservation_id = ldrp.reservation_id
+        LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.id = ldrp.parce_list_id
         LEFT JOIN logpm_distribution_loadscan ldl on ldl.package_id =ldpl.id
         <where>
-            lds.delivery_id = #{param.id}
+             ldrp.packet_bar_status in (1,3)
+            <if test="param.trainNumber != null and param.trainNumber != '' "> and lddl.train_number = #{param.trainNumber } </if>
+            <if test="param.id != null and param.id != ''">and lds.delivery_id = #{param.id}</if>
             <if test="param.orderCode != null and param.orderCode!=''">
-                and ldsa.order_code like concat('%',#{param.orderCode},'%')
+                and ldpl.order_code like concat('%',#{param.orderCode},'%')
             </if>
             <if test="param.scanStatus != null and param.scanStatus!=''">
                 <choose>
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.xml
index 256e8bea1..c6bfd1279 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.xml
@@ -65,21 +65,14 @@
 
 
     <select id="getOrderPackageListByOrderCode" resultType="com.logpm.distribution.vo.app.DistributionAppParcelListVO">
-       SELECT
+       SELECT DISTINCT
 	ldpl.*,
-IF (
-	(
-		SELECT
-			id
-		FROM
-			logpm_distribution_loadscan
-		WHERE
-			package_id = #{id}
+IF ( (
+		SELECT id
+		FROM logpm_distribution_loadscan
+		WHERE package_id = #{id}
 		AND scan_status != 1
-	) != NULL,
-	"1",
-	"2"
-) AS scanStatus
+	) != NULL, "1", "2" ) AS scanStatus
 FROM
 	logpm_distribution_reservation_package ldrp
 INNER JOIN logpm_distribution_parcel_list ldpl ON ldrp.parce_list_id = ldpl.id
@@ -250,12 +243,10 @@ WHERE
         </where>
     </select>
     <select id="getPackDetail" resultType="com.logpm.distribution.vo.app.DistributionAppParcelListVO">
-        select ldsa.order_code orderCode,ldpl.material_name materialName,ldrp.packet_bar_code packetBarCode,
+        select ldpl.order_code orderCode,ldpl.material_name materialName,ldpl.order_package_code packetBarCode,
                (select COUNT(*) from logpm_distribution_loadscan ldl where ldl.package_id = ldrp.parce_list_id and ldl.scan_status != 1) scanStatus ,
             (select COUNT(*) from logpm_distribution_loadscan ldl where ldl.package_id = ldrp.parce_list_id and ldl.scan_status != 1 and ldl.signfor_state = 2) signforState
-
         from logpm_distribution_reservation_package ldrp
-            LEFT JOIN logpm_distribution_stock_article ldsa on ldrp.stock_article_id = ldsa.id
             LEFT JOIN logpm_distribution_parcel_list ldpl on ldrp.parce_list_id = ldpl.id
         where ldrp.packet_bar_status in (1,3) and ldrp.reservation_id = #{param.reservationId} and ldrp.stock_article_id = #{param.stockArticleId}
     </select>
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
index 7becd5259..4a78271a9 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
@@ -571,6 +571,7 @@
         SELECT
         DISTINCT lddl.id id,
         lddl.train_number trainNumber,
+        lddl.note_number noteNumber,
         <!--        lddl.warehouse_name warehouseName,
                 lddl.warehouse_id warehouseId,-->
         lddl.type type,
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java
index 8cc7b0449..8662b2176 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryInfoServiceImpl.java
@@ -113,7 +113,7 @@ public class DistributionDeliveryInfoServiceImpl extends BaseServiceImpl<Distrib
 		//数量转换字典
 		distributionAppStockArticleVOS.forEach(e -> {
 			// 需要根据当前的客户的ID查询对应的包件信息
-			List<DistributionAppParcelListVO> ks =distributionReservationPackageMapper.getOrderPackageListByOrderCode(e.getId());
+			List<DistributionAppParcelListVO> ks =distributionReservationPackageMapper.getOrderPackageListByOrderCode(e.getStockArticleId());
 			e.setDistributionAppParcelListVOS(ks);
 
 			if (e.getLoadingNub() == 0) {