Merge branch 'fix_bug_2024-01-09' into dev

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

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/DistributionStockListMapper.xml

@@ -389,102 +389,105 @@
     </select>
     <select id="selectAllStockList" resultType="com.logpm.distribution.vo.DistributionStockListVO">
        SELECT
-            tenant_id,
-            id,
-            create_user,
-            create_time,
-            update_user,
-            update_time,
-            status,
-            is_deleted,
-            create_dept,
-            reserve1,
-            reserve2,
-            reserve3,
-            reserve4,
-            reserve5,
-            order_code,
-            incoming_batch,
-            service_number,
-            material_id,
-            description_goods,
-            cargo_number,
-            cargo_norms,
-            cargo_unit,
-            warehouse_id,
-            warehouse_name,
-            storage_location,
-            mall_id,
-            mall_code,
-            mall_name,
-            quantity_stock,
-            store_id,
-            store_code,
-            store_name,
-            quantity_occupied,
-            outbound_quantity,
-            despatch,
-            stock_article_id,
-            factory,
-            category,
-<!--            unpack,-->
-            parcel_list_id,
-            shopping_mall,
-            market_id,
-            market_name,
-            market_code,
-            stock_list_code,
-            service_type,
-            pid,
-            brand_name,
-            brand_id,
-            warehousing_time,
-            unpacking_quantity,
-            license_plate,
-            tray_id,
-            tray_name,
-            sku,
-            grounding_time,
-            unpack
+        ldsl.tenant_id,
+        ldsl.id,
+        ldsl.create_user,
+        ldsl.create_time,
+        ldsl.update_user,
+        ldsl.update_time,
+        ldsl.status,
+        ldsl.is_deleted,
+        ldsl.create_dept,
+        ldsl.reserve1,
+        ldsl.reserve2,
+        ldsl.reserve3,
+        ldsl.reserve4,
+        ldsl.reserve5,
+        ldsl.order_code,
+        ldsl.incoming_batch,
+        ldsl.service_number,
+        ldsl.material_id,
+        ldsl.description_goods,
+        ldsl.cargo_number,
+        ldsl.cargo_norms,
+        ldsl.cargo_unit,
+        ldsl.warehouse_id,
+        ldsl.warehouse_name,
+        ldsl.storage_location,
+        ldsl.mall_id,
+        ldsl.mall_code,
+        ldsl.mall_name,
+        ldsl.quantity_stock,
+        ldsl.store_id,
+        ldsl.store_code,
+        ldsl.store_name,
+        ldsl.quantity_occupied,
+        ldsl.outbound_quantity,
+        ldsl.despatch,
+        ldsl.stock_article_id,
+        ldsl.factory,
+        ldsl.category,
+        -- ldsl.unpack,
+        ldsl.parcel_list_id,
+        ldsl.shopping_mall,
+        ldsl.market_id,
+        ldsl.market_name,
+        ldsl.market_code,
+        ldsl.stock_list_code,
+        ldsl.service_type,
+        ldsl.pid,
+        ldsl.brand_name,
+        ldsl.brand_id,
+        ldsl.warehousing_time,
+        ldsl.unpacking_quantity,
+        ldsl.license_plate,
+        ldsl.tray_id,
+        ldsl.tray_name,
+        ldsl.sku,
+        ldsl.grounding_time,
+        ldsl.unpack,
+        lwug.position_code
             FROM
-            logpm_distribution_stock_list
+            logpm_distribution_stock_list ldsl
+            JOIN
+            logpm_warehouse_updown_goods lwug ON ldsl.material_id = lwug.association_id
         <where>
-            service_type = #{par.serviceType} and warehouse_id = #{par.warehouseId} and is_deleted = 0
+            ldsl.service_type = #{par.serviceType} and ldsl.warehouse_id = #{par.warehouseId} and ldsl.is_deleted = 0
             <if test="par.incomingBatch != null and par.incomingBatch != ''">
-              and  incoming_batch like concat('%',#{par.incomingBatch},'%')
+              and  ldsl.incoming_batch like concat('%',#{par.incomingBatch},'%')
             </if>
             <if test="par.orderCode != null and par.orderCode != ''">
-              and  order_code like concat('%',#{par.orderCode},'%')
+              and  ldsl.order_code like concat('%',#{par.orderCode},'%')
             </if>
             <if test="par.serviceNumber != null and par.serviceNumber != ''">
-              and  service_number like concat('%',#{par.serviceNumber},'%')
+              and  ldsl.service_number like concat('%',#{par.serviceNumber},'%')
             </if>
             <if test="par.marketCode != null and par.marketCode != ''">
-              and   market_code like concat('%',#{par.marketCode},'%')
+              and   ldsl.market_code like concat('%',#{par.marketCode},'%')
             </if>
             <if test="par.marketName != null and par.marketName != ''">
-              and   market_name like concat('%',#{par.marketName},'%')
+              and   ldsl.market_name like concat('%',#{par.marketName},'%')
             </if>
             <if test="par.storeName != null and par.storeName != ''">
-              and   store_name like concat('%',#{par.storeName},'%')
+              and   ldsl.store_name like concat('%',#{par.storeName},'%')
             </if>
             <if test="par.storeCode != null and par.storeCode != ''">
-              and   store_code like concat('%',#{par.storeCode},'%')
+              and   ldsl.store_code like concat('%',#{par.storeCode},'%')
             </if>
             <if test="par.storeCode != null and par.storeCode != ''">
-              and   store_code like concat('%',#{par.storeCode},'%')
+              and   ldsl.store_code like concat('%',#{par.storeCode},'%')
             </if>
             <if test="par.cargoNumber != null and par.cargoNumber != ''">
-              and   cargo_number like concat('%',#{par.cargoNumber},'%')
+              and   ldsl.cargo_number like concat('%',#{par.cargoNumber},'%')
             </if>
             <if test="par.descriptionGoods != null and par.descriptionGoods != ''">
-              and   description_goods like concat('%',#{par.descriptionGoods},'%')
+              and   ldsl.description_goods like concat('%',#{par.descriptionGoods},'%')
             </if>
             <if test="par.brandName != null and par.brandName != ''">
-              and   brand_name like concat('%',#{par.brandName},'%')
+              and   ldsl.brand_name like concat('%',#{par.brandName},'%')
             </if>
             <if test="par.sku != null and par.sku != ''">
-              and   sku like concat('%',#{par.sku},'%')
+              and   ldsl.sku like concat('%',#{par.sku},'%')
             </if>
         </where>
     </select>

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)  and  bill_lading_id =   #{param.billLadingId}  ) handQuantity,
+        (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>