自提详情零担BUG状态修复

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

@@ -87,4 +87,7 @@ public class DistrilbutionBillLadingVO extends DistrilbutionBillLadingEntity {
 	private String otherFee;
 
 
+
+
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistrilbutionBillLadingDTO.java

@@ -179,6 +179,8 @@ public class DistrilbutionBillLadingDTO extends DistrilbutionBillLadingEntity {
 	private String packageIds;
 	// 1 不是零担 2 是零担
 	private String zeroType;
+	private String pickUpTimeStart;
+	private String pickUpTimeEnd;
 
 	@Data
 	public static  class Print{

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

@@ -172,10 +172,10 @@
             <if test="param.pickupBatch != null and param.pickupBatch != ''">and dbl.pickup_batch like
                 concat('%',#{param.pickupBatch},'%')
             </if>
-            <if test="param.pickUpTime != null and param.pickUpTime != ''">and
+            <if test="param.pickUpTime != null ">and
                 DATE_FORMAT(pick_up_time,'%y%m%d') = DATE_FORMAT(#{param.pickUpTime},'%y%m%d')
             </if>
-            <if test="param.pickUpTimeStart != null and param.pickUpTimeStart != ''">and
+            <if test="param.pickUpTimeStart != null">and
                 AND DATE_FORMAT(pick_up_time,'%y%m%d') BETWEEN DATE_FORMAT(#{param.pickUpTimeStart},'%y%m%d') AND DATE_FORMAT(#{param.pickUpTimeEnd},'%y%m%d')
             </if>
             <if test="collect != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(collect)">
@@ -187,9 +187,6 @@
             <if test="param.warehouseEntryTime != null ">and date(t.warehouseEntryTime) =
                 #{param.warehouseEntryTime}
             </if>
-            <if test="param.pickUpTime != null ">and date(dbl.pick_up_time) =
-                #{param.pickUpTime}
-            </if>
             <if test="param.startDate != null ">and t.warehouseEntryTime between #{param.startDate} and
                 #{param.entDate}
             </if>

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

@@ -131,11 +131,11 @@
         END handQuantity,
         (select IFNULL(sum(quantity) ,0) from  logpm_distribution_bill_lading_scan
         where  stock_article_id = ldsa.id AND bill_lading_id =  #{param.billLadingId}  AND is_deleted = 0 ) pick_up_quantity,
-        CASE
-        WHEN (SELECT COUNT(id) FROM logpm_distribution_bill_lading_scan WHERE stock_article_id = ldsa.id AND is_deleted = 0) - (SELECT COUNT(id) FROM logpm_distrilbution_bill_package WHERE stock_article_id = ldsa.id AND packet_bar_status IN (1,3) AND is_deleted = 0) = 0 THEN '30'
-        WHEN (SELECT COUNT(id) FROM logpm_distribution_bill_lading_scan WHERE stock_article_id = ldsa.id AND is_deleted = 0) = 0 THEN '10'
-        WHEN (SELECT COUNT(id) FROM logpm_distribution_bill_lading_scan WHERE stock_article_id = ldsa.id AND is_deleted = 0) - (SELECT COUNT(id) FROM logpm_distrilbution_bill_package WHERE stock_article_id = ldsa.id AND packet_bar_status IN (1,3) AND is_deleted = 0) <  0 THEN '20'
-        END AS conditions,
+        CASE ldsa.is_zero
+        WHEN 1 THEN	 IF(( SELECT IFNULL(SUM(quantity),0) FROM logpm_distribution_bill_lading_scan WHERE stock_article_id = ldsa.id AND is_deleted = 0 ) - ( SELECT IFNULL(quantity,0) FROM logpm_distribution_reservation_zero_package WHERE stock_article_id = ldsa.id AND zero_package_status IN ( 1, 3 ) AND is_deleted = 0 ) = 0,'30',IF(( SELECT IFNULL(quantity,0) FROM logpm_distribution_bill_lading_scan WHERE stock_article_id = ldsa.id AND is_deleted = 0 ) = 0,'10','20'))
+        ELSE
+        IF(( SELECT count( id ) FROM logpm_distribution_bill_lading_scan WHERE stock_article_id = ldsa.id AND is_deleted = 0 ) - ( SELECT count( id ) FROM logpm_distrilbution_bill_package WHERE stock_article_id = ldsa.id AND packet_bar_status IN ( 1, 3 ) AND is_deleted = 0 ) = 0,'30',IF(( SELECT IFNULL(quantity,0) FROM logpm_distribution_bill_lading_scan WHERE stock_article_id = ldsa.id AND is_deleted = 0 ) = 0,'10','20'))
+        END 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,