From 34d482f66f4d374ea1c05cf3161789c3c76145be Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Wed, 16 Aug 2023 14:46:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AD=BE=E6=94=B6=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 |  15 ++
 .../vo/app/DistributionAppStockArticleVO.java |   6 +
 .../mapper/DistributionDeliveryListMapper.xml |  10 +-
 .../DistributionReservationPackageMapper.java |   2 +
 .../DistributionReservationPackageMapper.xml  |  10 +
 .../mapper/DistributionSignforMapper.xml      | 228 +++++++++---------
 ...DistributionReservationPackageService.java |   3 +
 ...ributionReservationPackageServiceImpl.java |  12 +
 .../impl/DistributionSignforServiceImpl.java  |  19 ++
 9 files changed, 195 insertions(+), 110 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 bce985be5..2d5eed827 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
@@ -92,6 +92,21 @@ public class DistributionAppDeliveryListVO extends DistributionDeliveryListEntit
 	 */
 	@ApiModelProperty(value = "是否备货(1-没有,2-备货)")
 	private String isstock;
+	/**
+	 * 电话
+	 */
+	@ApiModelProperty(value = "电话")
+	private String deliveryPhone;
+	/**
+	 * 名称
+	 */
+	@ApiModelProperty(value = "名称")
+	private String consignee;
+	/**
+	 * 地址
+	 */
+	@ApiModelProperty(value = "地址")
+	private String deliveryAddress;
 
 
 
diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppStockArticleVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppStockArticleVO.java
index c54b45636..4da860597 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppStockArticleVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppStockArticleVO.java
@@ -40,6 +40,12 @@ public class DistributionAppStockArticleVO extends DistributionStockArticleEntit
 	 */
 	@ApiModelProperty(value = "扫描数")
 	private Integer loadingNub;
+
+	/**
+	 * 订单ID
+	 */
+	@ApiModelProperty(value = "订单ID")
+	private Long stockArticleId;
 	/**
 	 * 签收数
 	 */
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 d8e7136ab..dd2d42403 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
@@ -628,7 +628,15 @@
         join logpm_distribution_reservation ldr on lds.reservation_id =ldr.id
         WHERE lds.delivery_id = lddl.id) inventoryNub,
         (SELECT COALESCE(sum(lds.loaded_number+lds.loadedin_number), 0) FROM logpm_distribution_signfor lds WHERE
-        lddl.id = lds.delivery_id) scannedNumber
+        lddl.id = lds.delivery_id) scannedNumber,
+       (
+        select GROUP_CONCAT(ldr.consignee)
+        from logpm_distribution_reservation ldr
+        where ldr.id in
+        (select lds.reservation_id
+        from logpm_distribution_signfor lds
+        where lds.delivery_id = lddl.id )
+        ) consignee
         FROM
         logpm_distribution_delivery_list lddl
         left join logpm_distribution_delivery_self ldds on lddl.id =ldds.delivery_id
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.java
index 11d168c99..5b48dc31d 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationPackageMapper.java
@@ -125,4 +125,6 @@ public interface DistributionReservationPackageMapper extends BaseMapper<Distrib
 	 * @return
 	 */
 	int selectPackageNum(@Param("stockArticleId") Long id);
+
+    List<DistributionAppParcelListVO> getPackDetail(@Param("param") DistributionReservationPackageDTO packageDTO);
 }
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 6bb0b1ada..7ed2fcc45 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
@@ -249,5 +249,15 @@ WHERE
             </if>
         </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 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>
 
 </mapper>
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 7f47e0ea6..7becd5259 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
@@ -510,6 +510,8 @@
             lds.driver_signing driverSigning,
             lds.Signing_status SigningStatus,
             lds.loaded_number loadingNub,
+            ldr.delivery_phone deliveryPhone,
+            ldr.delivery_address deliveryAddress,
             (SELECT COALESCE(COUNT(*), 0) from logpm_distribution_reservation_stockarticle ldrs WHERE ldrs.reservation_id =ldr.id )   ordNub,
             COALESCE(lds.received_quantity + lds.receivedin_quantity, 0)  signNub
         FROM
@@ -520,11 +522,12 @@
           AND lds.delivery_id = #{id}
     </select>
     <select id="selectord" resultType="com.logpm.distribution.vo.app.DistributionAppStockArticleVO">
-        SELECT
-        distinct
+        SELECT  distinct
         ldsa.order_code orderCode,
         ldrs.reservation_num reservationNum,
-        (SELECT COALESCE(COUNT(*), 0) from logpm_distribution_loadscan ldl WHERE ldl.order_id =ldsa.id and ldl.scan_status !=1  and ldl.signfor_state =2) signforNub
+        ldrs.stock_article_id stockArticleId,
+        (SELECT COALESCE(COUNT(*), 0) from logpm_distribution_loadscan ldl WHERE ldl.order_id =ldsa.id and ldl.scan_status !=1  and ldl.signfor_state =2) signforNub,
+        (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
         join logpm_distribution_reservation_stockarticle ldrs on ldr.id = ldrs.reservation_id
@@ -568,8 +571,8 @@
         SELECT
         DISTINCT lddl.id id,
         lddl.train_number trainNumber,
-        --         lddl.warehouse_name warehouseName,
-        --         lddl.warehouse_id warehouseId,
+        <!--        lddl.warehouse_name warehouseName,
+                lddl.warehouse_id warehouseId,-->
         lddl.type type,
         lddl.kind kind,
         lddl.vehicle_name vehicleName,
@@ -580,19 +583,19 @@
         join logpm_distribution_reservation ldr on lds.reservation_id   =ldr.id
         WHERE lds.delivery_id =  lddl.id
         ) deliveryNumber,
---         lddl.vehicle_id vehicleId,
---         lddl.driver_id driverId,
+        <!-- lddl.vehicle_id vehicleId,
+        lddl.driver_id driverId, -->
         lddl.delivery_status deliveryStatus,
         lddl.preparation_time preparationTime,
-        --         lddl.distribution_company distributionCompany,
-        --         lddl.state state,
-        --         (SELECT GROUP_CONCAT(DISTINCT ldsu.forklift_name SEPARATOR ',')  FROM
-        --         logpm_distribution_signfor lds
-        --         join logpm_distribution_reservation ldr on lds.reservation_id   =ldr.id
-        --         join logpm_distribution_stockup_info ldsi on ldr.id =  ldsi.reservation_id
-        --         join logpm_distribution_stockup ldsu on ldsu.id = ldsi.stockup_id
-        --         WHERE  lds.delivery_id =  lddl.id
-        --         ) forkliftName,
+        <!--        lddl.distribution_company distributionCompany,
+                lddl.state state,
+                (SELECT GROUP_CONCAT(DISTINCT ldsu.forklift_name SEPARATOR ',')  FROM
+                logpm_distribution_signfor lds
+                join logpm_distribution_reservation ldr on lds.reservation_id   =ldr.id
+                join logpm_distribution_stockup_info ldsi on ldr.id =  ldsi.reservation_id
+                join logpm_distribution_stockup ldsu on ldsu.id = ldsi.stockup_id
+                WHERE  lds.delivery_id =  lddl.id
+                ) forkliftName, -->
         lddl.create_time createTime,
         (SELECT COALESCE(COUNT(*), 0)  FROM logpm_distribution_signfor lds WHERE lds.delivery_id =lddl.id) customersNumber,
         lddl.price price,
@@ -608,98 +611,103 @@
         lddl.id = lds.delivery_id) scannedNumber,
         (SELECT GROUP_CONCAT(DISTINCT ldsu.loader_name SEPARATOR ',') from  logpm_distribution_signfor lds INNER JOIN logpm_distribution_stockup_info AS ldsi ON lds.reservation_id = ldsi.reservation_id
         INNER JOIN logpm_distribution_stockup AS ldsu ON ldsu.id = ldsi.stockup_id WHERE  lds.delivery_id =  lddl.id) loadingTeamName,
---         (SELECT GROUP_CONCAT( lds.reservation_id SEPARATOR ',') from  logpm_distribution_signfor lds WHERE  lds.delivery_id =  lddl.id) reservationId,
-        lddl.lead_time leadTime,
---         lddl.order_id orderId,
---         lddl.fee fee,
-        lddl.loading_time loadingTime,
---         lddl.note_number noteNumber,
---         lddl.source source,
-        lddl.task_time taskTime,
---         (SELECT COALESCE (sum(ldr.reservation_stock_list_num) ,0)
---         FROM
---         logpm_distribution_signfor lds
---         join logpm_distribution_reservation ldr on lds.reservation_id   =ldr.id
---         WHERE lds.delivery_id =  lddl.id)  inventoryNub,
-        (SELECT COALESCE(sum(lds.receivedin_quantity+lds.received_quantity), 0) FROM logpm_distribution_signfor lds WHERE
-        lddl.id = lds.delivery_id) signNub,
-        ( (SELECT COALESCE(count(*), 0) FROM logpm_distribution_loadscan ldl WHERE
-        lddl.id = ldl.delivery_id and ldl.signfor_state =2) +
-        (SELECT COALESCE(count(*), 0) FROM logpm_distribution_loadscaninvn ldl WHERE
-        lddl.id = ldl.delivery_id and ldl.signfor_state =2) ) signNubSr
-        FROM
-        logpm_distribution_delivery_list lddl
-        left join logpm_distribution_delivery_self ldds on lddl.id =ldds.delivery_id
-        <where>
-            lddl.is_deleted =0
-            <if test="array != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(array)">
-                and lddl.id in
-                <foreach collection="array" item="item" open="(" close=")" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="param.createTime_query!=null and param.createTime_query!=''">
-                and date_format(lddl.create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%')
-            </if>
-            <if test="param.taskTime_start!=null and param.taskTime_start!=''">
-                and date_format(lddl.task_time,'%y%m%d%') >= date_format(#{param.taskTime_start},'%y%m%d%') and date_format(lddl.task_time,'%y%m%d%') &lt;= date_format(#{param.taskTime_end},'%y%m%d%')
-            </if>
+        <!--        (SELECT GROUP_CONCAT( lds.reservation_id SEPARATOR ',') from  logpm_distribution_signfor lds WHERE  lds.delivery_id =  lddl.id) reservationId, -->
+                lddl.lead_time leadTime,
+        <!--        lddl.order_id orderId,
+                lddl.fee fee,-->
+                lddl.loading_time loadingTime,
+        <!--        lddl.note_number noteNumber,
+                lddl.source source, -->
+                lddl.task_time taskTime,
+        <!--    (SELECT COALESCE (sum(ldr.reservation_stock_list_num) ,0)
+            FROM
+            logpm_distribution_signfor lds
+            join logpm_distribution_reservation ldr on lds.reservation_id   =ldr.id
+            WHERE lds.delivery_id =  lddl.id)  inventoryNub, -->
+                (SELECT COALESCE(sum(lds.receivedin_quantity+lds.received_quantity), 0) FROM logpm_distribution_signfor lds WHERE
+                lddl.id = lds.delivery_id) signNub,
+                ( (SELECT COALESCE(count(*), 0) FROM logpm_distribution_loadscan ldl WHERE
+                lddl.id = ldl.delivery_id and ldl.signfor_state =2) +
+                (SELECT COALESCE(count(*), 0) FROM logpm_distribution_loadscaninvn ldl WHERE
+                lddl.id = ldl.delivery_id and ldl.signfor_state =2) ) signNubSr,
+                ( select GROUP_CONCAT(ldr.consignee)  from logpm_distribution_reservation ldr
+                where ldr.id in  (select lds.reservation_id  from logpm_distribution_signfor lds where lds.delivery_id = lddl.id )
+                ) consignee
+                FROM
+                logpm_distribution_delivery_list lddl
+                left join logpm_distribution_delivery_self ldds on lddl.id =ldds.delivery_id
+                left join logpm_distribution_reservation ldr on ldr.id = lddl.reservation_id
+                <where>
+                    lddl.is_deleted =0
+                    <if test="array != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(array)">
+                        and lddl.id in
+                        <foreach collection="array" item="item" open="(" close=")" separator=",">
+                            #{item}
+                        </foreach>
+                    </if>
+                    <if test="param.createTime_query!=null and param.createTime_query!=''">
+                        and date_format(lddl.create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%')
+                    </if>
+                    <if test="param.taskTime_start!=null and param.taskTime_start!=''">
+                        and date_format(lddl.task_time,'%y%m%d%') >= date_format(#{param.taskTime_start},'%y%m%d%') and date_format(lddl.task_time,'%y%m%d%') &lt;= date_format(#{param.taskTime_end},'%y%m%d%')
+                    </if>
 
-        </where>
-    </select>
-    <select id="selectAppDeliveryInventoryPage" resultType="com.logpm.distribution.vo.app.DistributionAppStockArticleVO">
-        SELECT
-        distinct ldsl.id id,
-        ldsl.sku sku,
-        ldsl.cargo_number cargoNumber,
-        ldsl.description_goods descriptionGoods,
-        ldl.signfor_state signforState,
-        ldl.order_package_code coding,
-        lbm.specification specification,
-        lbm.logpm_unit logpmUnit
-        FROM
-        logpm_distribution_reservation ldr
-        join logpm_distribution_reservation_stocklist ldrs on ldr.id = ldrs.reservation_id
-        join logpm_distribution_stock_list ldsl on ldsl.id =  ldrs.stocklist_id
-        LEFT JOIN logpm_distribution_loadscaninvn ldl on ldsl.id = ldl.inventory_id
-        left join logpm_basicdata_material lbm on ldsl.material_id = lbm.id
-        <where>
-            ldr.is_deleted = 0
-            AND ldr.id = #{param.reservationId}
-        </where>
-    </select>
-    <select id="selectListbyink" resultType="com.logpm.distribution.vo.app.DistributionAppStockArticleVO">
-        SELECT
-            distinct ldsl.id id,
-                     ldsl.sku sku,
-                     ldsl.cargo_number cargoNumber,
-                     ldsl.description_goods descriptionGoods,
-                     ldl.signfor_state signforState,
-                     ldl.order_package_code coding,
-                     lbm.specification specification,
-                     lbm.logpm_unit logpmUnit
-        FROM
-            logpm_distribution_signfor lds join
-            logpm_distribution_reservation ldr on lds.reservation_id =ldr.id
-                                           join logpm_distribution_reservation_stocklist ldrs on ldr.id = ldrs.reservation_id
-                                           join logpm_distribution_stock_list ldsl on ldsl.id =  ldrs.stocklist_id
-                                           LEFT JOIN logpm_distribution_loadscaninvn ldl on ldsl.id = ldl.inventory_id
-                                           left join logpm_basicdata_material lbm on ldsl.material_id = lbm.id
-        where lds.delivery_id = #{id}
-    </select>
-    <select id="selectorda" resultType="com.logpm.distribution.vo.app.DistributionAppStockArticleVO">
-        SELECT distinct
-        ldsa.order_code AS orderCode,
-        ldrs.reservation_num AS reservationNum,
-        (SELECT COALESCE(COUNT(*), 0) FROM logpm_distribution_loadscan ldl  WHERE ldl.order_id = ldsa.id  AND ldl.scan_status != 1 AND ldl.signfor_state = 2) AS signforNub,
-        (SELECT COALESCE(COUNT(*), 0) FROM logpm_distribution_loadscan ldl  WHERE ldl.order_id = ldsa.id  AND ldl.scan_status != 1 AND ldl.signfor_state = 1) AS loadingNub
-        FROM
-        logpm_distribution_reservation ldr
-        JOIN logpm_distribution_reservation_stockarticle ldrs ON ldr.id = ldrs.reservation_id
-        JOIN logpm_distribution_stock_article ldsa ON ldsa.id = ldrs.stock_article_id
-        <where>
-            ldr.is_deleted = 0
-            <!--            <if test="param.state != null and param.state!=''">-->
+                </where>
+            </select>
+            <select id="selectAppDeliveryInventoryPage" resultType="com.logpm.distribution.vo.app.DistributionAppStockArticleVO">
+                SELECT
+                distinct ldsl.id id,
+                ldsl.sku sku,
+                ldsl.cargo_number cargoNumber,
+                ldsl.description_goods descriptionGoods,
+                ldl.signfor_state signforState,
+                ldl.order_package_code coding,
+                lbm.specification specification,
+                lbm.logpm_unit logpmUnit
+                FROM
+                logpm_distribution_reservation ldr
+                join logpm_distribution_reservation_stocklist ldrs on ldr.id = ldrs.reservation_id
+                join logpm_distribution_stock_list ldsl on ldsl.id =  ldrs.stocklist_id
+                LEFT JOIN logpm_distribution_loadscaninvn ldl on ldsl.id = ldl.inventory_id
+                left join logpm_basicdata_material lbm on ldsl.material_id = lbm.id
+                <where>
+                    ldr.is_deleted = 0
+                    AND ldr.id = #{param.reservationId}
+                </where>
+            </select>
+            <select id="selectListbyink" resultType="com.logpm.distribution.vo.app.DistributionAppStockArticleVO">
+                SELECT
+                    distinct ldsl.id id,
+                             ldsl.sku sku,
+                             ldsl.cargo_number cargoNumber,
+                             ldsl.description_goods descriptionGoods,
+                             ldl.signfor_state signforState,
+                             ldl.order_package_code coding,
+                             lbm.specification specification,
+                             lbm.logpm_unit logpmUnit
+                FROM
+                    logpm_distribution_signfor lds join
+                    logpm_distribution_reservation ldr on lds.reservation_id =ldr.id
+                                                   join logpm_distribution_reservation_stocklist ldrs on ldr.id = ldrs.reservation_id
+                                                   join logpm_distribution_stock_list ldsl on ldsl.id =  ldrs.stocklist_id
+                                                   LEFT JOIN logpm_distribution_loadscaninvn ldl on ldsl.id = ldl.inventory_id
+                                                   left join logpm_basicdata_material lbm on ldsl.material_id = lbm.id
+                where lds.delivery_id = #{id}
+            </select>
+            <select id="selectorda" resultType="com.logpm.distribution.vo.app.DistributionAppStockArticleVO">
+                SELECT distinct
+                ldsa.order_code AS orderCode,
+                ldrs.reservation_num AS reservationNum,
+                ldrs.stock_article_id stockArticleId,
+                (SELECT COALESCE(COUNT(*), 0) FROM logpm_distribution_loadscan ldl  WHERE ldl.order_id = ldsa.id  AND ldl.scan_status != 1 AND ldl.signfor_state = 2) AS signforNub,
+                (SELECT COALESCE(COUNT(*), 0) FROM logpm_distribution_loadscan ldl  WHERE ldl.order_id = ldsa.id  AND ldl.scan_status != 1 ) AS loadingNub
+                FROM
+                logpm_distribution_reservation ldr
+                JOIN logpm_distribution_reservation_stockarticle ldrs ON ldr.id = ldrs.reservation_id
+                JOIN logpm_distribution_stock_article ldsa ON ldsa.id = ldrs.stock_article_id
+                <where>
+                    ldr.is_deleted = 0
+                    <!--            <if test="param.state != null and param.state!=''">-->
             <!--                and ldsa.state = #{param.state}-->
             <!--            </if>-->
             <if test="param.orderCode != null and param.orderCode!=''">
@@ -724,12 +732,13 @@
         SELECT distinct
         ldsa.order_code AS orderCode,
         ldrs.reservation_num AS reservationNum,
+        ldrs.stock_article_id stockArticleId,
         (SELECT COALESCE(COUNT(*), 0)
         FROM logpm_distribution_loadscan ldl
         WHERE ldl.order_id = ldsa.id
         AND ldl.scan_status != 1
         AND ldl.signfor_state = 2) AS signforNub,
-        (SELECT COALESCE(COUNT(*), 0) FROM logpm_distribution_loadscan ldl  WHERE ldl.order_id = ldsa.id  AND ldl.scan_status != 1 AND ldl.signfor_state = 1) AS loadingNub
+        (SELECT COALESCE(COUNT(*), 0) FROM logpm_distribution_loadscan ldl  WHERE ldl.order_id = ldsa.id  AND ldl.scan_status != 1 ) AS loadingNub
         FROM
         logpm_distribution_reservation ldr
         JOIN logpm_distribution_reservation_stockarticle ldrs ON ldr.id = ldrs.reservation_id
@@ -755,12 +764,13 @@
         SELECT distinct
         ldsa.order_code AS orderCode,
         ldrs.reservation_num AS reservationNum,
+        ldrs.stock_article_id stockArticleId,
         (SELECT COALESCE(COUNT(*), 0)
         FROM logpm_distribution_loadscan ldl
         WHERE ldl.order_id = ldsa.id
         AND ldl.scan_status != 1
         AND ldl.signfor_state = 2) AS signforNub,
-        (SELECT COALESCE(COUNT(*), 0) FROM logpm_distribution_loadscan ldl  WHERE ldl.order_id = ldsa.id  AND ldl.scan_status != 1 AND ldl.signfor_state = 1) AS loadingNub
+        (SELECT COALESCE(COUNT(*), 0) FROM logpm_distribution_loadscan ldl  WHERE ldl.order_id = ldsa.id  AND ldl.scan_status != 1 ) AS loadingNub
         FROM
         logpm_distribution_reservation ldr
         JOIN logpm_distribution_reservation_stockarticle ldrs ON ldr.id = ldrs.reservation_id
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationPackageService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationPackageService.java
index aeab03dea..6c23ee0b7 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationPackageService.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationPackageService.java
@@ -17,11 +17,13 @@
 package com.logpm.distribution.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.logpm.distribution.dto.DistributionReservationPackageDTO;
 import com.logpm.distribution.dto.DistributionStockArticleDTO;
 import com.logpm.distribution.entity.DistributionReservationPackageEntity;
 import com.logpm.distribution.vo.DistributionReservationPackageVO;
 import com.logpm.distribution.excel.DistributionReservationPackageExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.distribution.vo.app.DistributionAppParcelListVO;
 import org.springblade.core.mp.base.BaseService;
 import java.util.List;
 
@@ -58,4 +60,5 @@ public interface IDistributionReservationPackageService extends BaseService<Dist
 	 */
 	String judgmentStatus(DistributionStockArticleDTO distributionStockArticleDTO);
 
+    List<DistributionAppParcelListVO> getPackDetail(DistributionReservationPackageDTO packageDTO);
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationPackageServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationPackageServiceImpl.java
index f11d58719..4b2909d67 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationPackageServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationPackageServiceImpl.java
@@ -16,12 +16,14 @@
  */
 package com.logpm.distribution.service.impl;
 
+import com.logpm.distribution.dto.DistributionReservationPackageDTO;
 import com.logpm.distribution.dto.DistributionStockArticleDTO;
 import com.logpm.distribution.entity.DistributionReservationPackageEntity;
 import com.logpm.distribution.vo.DistributionReservationPackageVO;
 import com.logpm.distribution.excel.DistributionReservationPackageExcel;
 import com.logpm.distribution.mapper.DistributionReservationPackageMapper;
 import com.logpm.distribution.service.IDistributionReservationPackageService;
+import com.logpm.distribution.vo.app.DistributionAppParcelListVO;
 import org.springblade.common.constant.order.OrderReservationStatusConstant;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
@@ -67,5 +69,15 @@ public class DistributionReservationPackageServiceImpl extends BaseServiceImpl<D
 
 	}
 
+	/**
+	 * 查询包件信息
+	 * @param packageDTO
+	 * @return
+	 */
+	@Override
+	public List<DistributionAppParcelListVO> getPackDetail(DistributionReservationPackageDTO packageDTO) {
+		return baseMapper.getPackDetail(packageDTO);
+	}
+
 
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
index 86c9fff80..70f9b843d 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
@@ -20,14 +20,17 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.basicdata.entity.BasicdataDriverArteryEntity;
 import com.logpm.basicdata.feign.IBasicdataDriverArteryClient;
+import com.logpm.distribution.dto.DistributionReservationPackageDTO;
 import com.logpm.distribution.dto.DistributionSignforDTO;
 import com.logpm.distribution.dto.DistrilbutionAppsignforDTO;
 import com.logpm.distribution.dto.app.DistributionAppDeliveryListDTO;
 import com.logpm.distribution.entity.*;
 import com.logpm.distribution.excel.DistributionSignforExcel;
 import com.logpm.distribution.mapper.*;
+import com.logpm.distribution.service.IDistributionReservationPackageService;
 import com.logpm.distribution.service.IDistributionSignforService;
 import com.logpm.distribution.vo.DistributionSignforVO;
 import com.logpm.distribution.vo.DistributionSignforsnmbVO;
@@ -68,6 +71,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 	private final DistributionStockMapper distributionStockMapper;
 	private final IDictBizClient dictBizClient;
 	private final IBasicdataDriverArteryClient iBasicdataDriverArteryClient;
+	private final IDistributionReservationPackageService reservationPackageService;
 
 	@Override
 	public IPage<DistributionSignforVO> selectDistributionSignforPage(IPage<DistributionSignforVO> page, DistributionSignforVO distributionSignfor) {
@@ -352,6 +356,21 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				selectord	= baseMapper.selectordc(page, distributionDeliveryList);
 			}
 		}
+
+		selectord.forEach( i ->{
+			DistributionReservationPackageDTO packageDTO = new DistributionReservationPackageDTO();
+			packageDTO.setReservationId(Long.parseLong(distributionDeliveryList.getReservationId()));
+			packageDTO.setStockArticleId(i.getStockArticleId());
+			List<DistributionAppParcelListVO> list = reservationPackageService.getPackDetail(packageDTO);
+			list.forEach( a ->{
+				if(a.getScanStatus() > 0){
+					a.setIsScan("是");
+				}else{
+					a.setIsScan("否");
+				}
+			});
+			i.setDistributionAppParcelListVOS(list);
+		});
 		return page.setRecords(selectord);
 
 	}