提货查看明细

订单列表增加订单总数，应提货件数，提货件数，提货状态字段
库存品增加：应提件数，备货状态，提货件数，提货状态字段

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

@@ -12,9 +12,26 @@ import lombok.Data;
 public class DistributionBillInventoryVO {
 	private String sku;
 	private String descriptionGoods;
+	/**
+	 * 应提件数
+	 */
 	private String quantity; //数量
 	private String cargoNumber;
 	private String cargoUnit; //单位
 	private String allocation; //货物名称
 	private String preparedQuantity; //以扫
+
+	/**
+	 * 备货状态
+	 */
+	private Integer stockStatus;
+	/**
+	 * 提货件数
+	 */
+	private Integer pickUpQuantity;
+	/**
+	 * 提货状态
+	 */
+	private  Integer pickupStatus;
+
 }

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

@@ -3,6 +3,7 @@ package com.logpm.distribution.vo;
 import lombok.Data;
 
 /**
+*    提货的订单列表
  * @program: LogisticsPlatform-Service
  * @description:
  * @author: cyz
@@ -14,8 +15,12 @@ public class DistributionBillOrderVO {
 	private String descriptionGoods;
 	private String stockupStatus;
 	private String stockupStatusName;
+	/**
+	 * 应提货件数
+	 */
 	private String handQuantity;
 	private String materialName;
+
 	private String preparedQuantity;
 	private String goodsAllocation;
 	private String pallet;
@@ -24,4 +29,18 @@ public class DistributionBillOrderVO {
 	private String trainNumber; //客户车次号
 	private String sendWarehouseName; //始发仓
 
+
+	/** 新加的字段
+	 *
+	 * 订单总数
+	 */
+	private String totalNumber;
+	/**
+	 * 提货件数
+	 */
+	private String pickUpQuantity;
+	/**
+	 * 提货状态
+	 */
+	private String conditions;
 }

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

@@ -85,7 +85,13 @@
     <select id="getBillOrderInventory" resultType="com.logpm.distribution.vo.DistributionBillInventoryVO">
         select DISTINCT ldsl.sku, ldsl.description_goods descriptionGoods, lddd.quantity, ldsl.cargo_number cargoNumber, ldsl.cargo_unit cargoUnit,
         ldsl.tray_name trayName, lds.allocation_title allocation,
-        lddd.reality_quantity preparedQuantity
+        lddd.reality_quantity preparedQuantity,
+        lddd.stock_status,
+        (SELECT count(id) FROM logpm_distribution_bill_lading_scan ldbls WHERE ldbls.stock_list_id = lddd.stock_list_id and ldbls.material_type = 1) AS pick_up_quantity,
+        CASE
+        WHEN (lddd.quantity - (SELECT count(id) FROM logpm_distribution_bill_lading_scan ldbls WHERE ldbls.stock_list_id = lddd.stock_list_id and ldbls.material_type = 1)) > 0 THEN 20
+        WHEN (lddd.quantity - (SELECT count(id) FROM logpm_distribution_bill_lading_scan ldbls WHERE ldbls.stock_list_id = lddd.stock_list_id and ldbls.material_type = 1)) = 0 THEN 10
+        END AS pickup_status
         from logpm_distribution_delivery_details lddd
         LEFT JOIN logpm_distribution_stock_list ldsl on lddd.stock_list_id = ldsl.id
         LEFT JOIN logpm_distribution_stock lds on lds.bill_lading_id = lddd.bill_lading_id and lddd.stock_list_id = lds.stock_list_id

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

@@ -115,9 +115,15 @@
     </select>
     <select id="getBillOrderDetail" resultType="com.logpm.distribution.vo.DistributionBillOrderVO">
 
-        select DISTINCT ldsa.order_code orderCode,ldsa.description_goods descriptionGoods,ldsa.stockup_status stockupStatus,
+        select DISTINCT ldsa.order_code orderCode,ldsa.total_number,ldsa.description_goods descriptionGoods,ldsa.stockup_status stockupStatus,
         (select COUNT(id) from  logpm_distrilbution_bill_package
-        where  stock_article_id = ldsa.id and packet_bar_status in (1,3)) handQuantity,
+        where  stock_article_id = ldsa.id and packet_bar_status in (1,3)) hand_quantity,
+        (select COUNT(id) from  logpm_distribution_bill_lading_scan
+        where  stock_article_id = ldsa.id ) pick_up_quantity,
+        CASE
+        WHEN (SELECT COUNT(id) FROM logpm_distribution_bill_lading_scan WHERE stock_article_id = ldsa.id) - (SELECT COUNT(id) FROM logpm_distrilbution_bill_package WHERE stock_article_id = ldsa.id AND packet_bar_status IN (1,3)) = 0 THEN 20
+        WHEN (SELECT COUNT(id) FROM logpm_distribution_bill_lading_scan WHERE stock_article_id = ldsa.id) - (SELECT COUNT(id) FROM logpm_distrilbution_bill_package WHERE stock_article_id = ldsa.id AND packet_bar_status IN (1,3)) > 0 THEN 10
+        END AS conditions,
         (select GROUP_CONCAT(DISTINCT ldpl.material_name )
         from logpm_distribution_parcel_list ldpl
         where  ldpl.material_name is not null and ldpl.stock_article_id = ldbs.stock_article_id)   materialName,
@@ -137,6 +143,7 @@
         from logpm_distrilbution_bill_stock ldbs
         LEFT JOIN logpm_distribution_stock_article ldsa on ldbs.stock_article_id = ldsa.id
         LEFT JOIN logpm_distribution_stock lds on lds.stock_article = ldbs.stock_article_id
+        LEFT JOIN logpm_distrilbution_bill_lading ldbl ON lds.stock_article = ldbl.stock_article_id
         <where>
             ldbs.is_deleted = 0 and  ldbs.bill_lading_id = #{param.billLadingId}  and ldbs.order_status in (1,2)
         </where>