Merge remote-tracking branch 'origin/fix_bug_2024-01-22' into dev

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataClientClient.java

@@ -86,5 +86,6 @@ public interface IBasicdataClientClient {
 	 * @param mallId
 	 * @return
 	 */
+	@GetMapping(API_PREFIX+"/getMallById")
     BasicdataClientEntity getMallById(Long mallId);
 }

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

@@ -60,6 +60,11 @@ public class DistributionAppDeliveryListVO extends DistributionDeliveryListEntit
 	 */
 	@ApiModelProperty(value = "完成装车客户数")
 	private Integer loadCusNub;
+	/**
+	 * 装车客户数
+	 */
+	@ApiModelProperty(value = "装车件数")
+	private Integer scannedNumber;
 
 	/**
 	 * 配车状态

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

@@ -265,7 +265,6 @@
         ldl.is_deleted = 0
         AND ldl.delivery_id = #{deliveryId}
         AND ldl.scan_status != '1'
-        AND ldl.is_abnormal_loading = 1
     </select>
     <select id="selectLoadingNumByReservationId" resultType="java.lang.Integer">
         SELECT (IF((SELECT sum(loaded_nub) FROM logpm_distribution_loadscan WHERE reservation_id = #{reservationId} AND scan_state != 1 AND is_abnormal_loading != 2) is null,0,(SELECT sum(loaded_nub) FROM logpm_distribution_loadscan WHERE reservation_id = #{reservationId} AND scan_state != 1 AND is_abnormal_loading != 2)))

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@@ -2257,7 +2257,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			}
 			//查询包件签收件数
 			Integer lad = distributionLoadscanMapper.selectCount(new QueryWrapper<DistributionLoadscanEntity>().lambda().eq(DistributionLoadscanEntity::getDeliveryId, distributionAppDeliveryListVO.getId()).eq(DistributionLoadscanEntity::getSignforState, 2)).intValue();
-
 			//查询库存品签收件数
 			Integer nad = distributionLoadscaninvnMapper.selectCount(new QueryWrapper<DistributionLoadscaninvnEntity>().lambda().eq(DistributionLoadscaninvnEntity::getDeliveryId, distributionAppDeliveryListVO.getId()).eq(DistributionLoadscaninvnEntity::getSignforState, 2)).intValue();
 			//维护计划数