Merge branch 'dev' into pre-production

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

@@ -6496,6 +6496,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						p.setSigningNub(0);
 						DistributionLoadscanEntity distributionLoadscanEntity = distributionLoadscanMapper.selectOne(Wrappers.<DistributionLoadscanEntity>query().lambda()
 							.eq(DistributionLoadscanEntity::getPackageId, p.getId())
+							.ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue())
 						);
 						if (Func.isNotEmpty(distributionLoadscanEntity)) {
 							//该包件存在扫描记录

blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/QualityDispatchNumberServiceImpl.java

@@ -171,6 +171,10 @@ public class QualityDispatchNumberServiceImpl implements QualityDispatchNumberSe
 				List<BasicdataWarehouseEntity> warehouseEntities = warehouseClient.getMyWarehouseList();
 				query.setWarehouseName(warehouseEntities.stream().map(BasicdataWarehouseEntity::getName).collect(Collectors.joining(",")));
 			}
+		} else {
+			if ("全部".equals(query.getWarehouseName())) {
+				query.setWarehouseName("");
+			}
 		}
 		List<QualityDispatchTaskVO> list = numberMapper.task(page, query);
 		// 查询异常数