PDA签收扫描详情增加一级品、二级品、三级品、物料信息

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppPackageDetailVO.java

@@ -62,6 +62,35 @@ public class DistributionAppPackageDetailVO implements Serializable {
 	@ApiModelProperty(value = "地址")
 	private String address;
 
+	/**
+	 * 地址
+	 */
+	@ApiModelProperty(value = "一级品")
+	private String firsts;
+
+	/**
+	 * 地址
+	 */
+	@ApiModelProperty(value = "二级品")
+	private String second;
+
+	/**
+	 * 地址
+	 */
+	@ApiModelProperty(value = "三级品")
+	private String thirdProduct;
+
+	/**
+	 * 地址
+	 */
+	@ApiModelProperty(value = "物料")
+	private String materialName;
+
+
+
+
+
+
 
 
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml

@@ -1447,16 +1447,22 @@
         1 AS type,
         IF(ldl.id is null,0,1) AS isLoading,
         IF(ldl.id is null or ldl.signfor_state = 1,0,1) AS isSignfor,
-        0 AS isAbnormal
+        0 AS isAbnormal,
+        ldpl.firsts AS firsts,
+        ldpl.`second` as `second`,
+        ldpl.third_product AS third_product,
+        ldpl.material_name AS materialName
         FROM
         logpm_distribution_reservation AS ldr
-        LEFT JOIN logpm_distribution_reservation_package AS ldrp ON ldr.id = ldrp.reservation_id
+        LEFT JOIN logpm_distribution_reservation_package AS ldrp ON ldr.id = ldrp.reservation_id AND ldrp.packet_bar_status != 2
         LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldrp.parce_list_id = ldpl.id
         LEFT JOIN logpm_distribution_loadscan AS ldl ON ldl.package_id = ldpl.id AND ldl.is_abnormal_loading = 1 AND
         ldl.scan_status != 1 AND ldl.reservation_id = ldr.id
         WHERE
         ldrp.packet_bar_status != 2
         AND ldr.id = #{reservationId}
+        AND ldr.is_deleted = 0
+        AND ldr.reservation_status != 40
         UNION
         SELECT
         ldpl.order_code AS orderCode,
@@ -1464,12 +1470,18 @@
         1 AS type,
         1 AS isLoading,
         IF(ldl.id is not null AND ldl.signfor_state = 2,1,0) AS isSignfor,
-        1 AS isAbnormal
+        1 AS isAbnormal,
+        ldpl.firsts AS firsts,
+        ldpl.`second` as `second`,
+        ldpl.third_product AS third_product,
+        ldpl.material_name AS materialName
         FROM
         logpm_distribution_loadscan AS ldl
         LEFT JOIN logpm_distribution_parcel_list AS ldpl ON ldl.package_id = ldpl.id
         WHERE
-        ldl.reservation_id = #{reservationId} AND ldl.is_abnormal_loading = 2 AND ldl.scan_status != 1
+        ldl.reservation_id = #{reservationId}
+        AND ldl.is_abnormal_loading = 2
+        AND ldl.scan_status != 1
         UNION
         SELECT
         ldsl.order_code AS orderCode,
@@ -1477,17 +1489,23 @@
         IF(ldrs.id is not null,2,null) AS type,
         IF(ldrs.id is not null,IF( ldll.id IS NULL, 0, 1 ),null) AS isLoading,
         IF(ldrs.id is not null,IF( ldll.id IS NULL OR ldll.signfor_state = 1, 0, 1 ),null) AS isSignfor,
-        IF(ldrs.id is not null, 0 ,null) AS isAbnormal
+        IF(ldrs.id is not null, 0 ,null) AS isAbnormal,
+        '' AS firsts,
+        '' as `second`,
+        '' AS third_product,
+        description_goods AS materialName
         FROM
         logpm_distribution_reservation AS ldr
-        LEFT JOIN logpm_distribution_reservation_stocklist AS ldrs ON ldr.id = ldrs.reservation_id
+        LEFT JOIN logpm_distribution_reservation_stocklist AS ldrs ON ldr.id = ldrs.reservation_id AND ldrs.stock_list_status != 2
         LEFT JOIN logpm_distribution_stock_list AS ldsl ON ldsl.id = ldrs.stocklist_id
         LEFT JOIN logpm_dis_stock_list_detail AS ldsld ON ldr.id = ldsld.reservation_id AND ldsld.stock_list_id =
-        ldrs.stocklist_id
+        ldrs.stocklist_id AND ldsld.stock_package_status != 2
         LEFT JOIN logpm_distribution_loadscaninvn As ldll ON ldll.inventory_package_id = ldsld.id AND ldll.scan_status
         != 1
         WHERE
         ldr.id = #{reservationId}
+        AND ldr.is_deleted = 0
+        AND ldr.reservation_status != 40
 
     </select>
     <select id="selectReservationByDeliveryId">